Merge branch 'master' into conditional-type-simpliciations

Author: weswigham

.travis.yml

@@ -3,7 +3,7 @@ language: node_js
 node_js:
   - 'node'
   - '10'
-  - '6'
+  - '8'
 
 sudo: false
 

CONTRIBUTING.md

@@ -55,7 +55,7 @@ The TypeScript repository is relatively large. To save some time, you might want
 
 ### 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`.
+Run `gulp` 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
 

Gulpfile.js

@@ -618,6 +618,10 @@ const configureNightly = () => exec(process.execPath, ["scripts/configurePrerele
 task("configure-nightly", series(buildScripts, configureNightly));
 task("configure-nightly").description = "Runs scripts/configurePrerelease.ts to prepare a build for nightly publishing";
 
+const configureInsiders = () => exec(process.execPath, ["scripts/configurePrerelease.js", "insiders", "package.json", "src/compiler/core.ts"])
+task("configure-insiders", series(buildScripts, configureInsiders));
+task("configure-insiders").description = "Runs scripts/configurePrerelease.ts to prepare a build for insiders publishing";
+
 const publishNightly = () => exec("npm", ["publish", "--tag", "next"]);
 task("publish-nightly", series(task("clean"), task("LKG"), task("clean"), task("runtests-parallel"), publishNightly));
 task("publish-nightly").description = "Runs `npm publish --tag next` to create a new nightly build on npm";

Jakefile.js

@@ -23,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" || process.env.CI === "true") ? true :
+    process.env.LKG === "true" ? false :
+    false;
 
 let useDebugMode = true;
 
@@ -296,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");
@@ -368,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);
 
@@ -427,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);
 

lib/lib.es5.d.ts

@@ -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.

package.json

@@ -46,6 +46,7 @@
         "@types/minimist": "latest",
         "@types/mkdirp": "latest",
         "@types/mocha": "latest",
+        "@types/ms": "latest",
         "@types/node": "8.5.5",
         "@types/q": "latest",
         "@types/source-map-support": "latest",
@@ -68,12 +69,13 @@
         "gulp-sourcemaps": "latest",
         "istanbul": "latest",
         "jake": "latest",
-        "lodash": "4.17.10",
+        "lodash": "^4.17.11",
         "merge2": "latest",
         "minimist": "latest",
         "mkdirp": "latest",
         "mocha": "latest",
         "mocha-fivemat-progress-reporter": "latest",
+        "ms": "latest",
         "plugin-error": "latest",
         "pretty-hrtime": "^1.0.3",
         "prex": "^0.4.3",

scripts/authors.ts

@@ -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/bisect-test.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/createBenchmark.ts

@@ -30,15 +30,15 @@ var rawCompilerSources = "";
 sourceFiles.forEach(f=> {
     rawCompilerSources += "\r\n" + fs.readFileSync(path.join(tsSourceDir, f)).toString();
 });
-var compilerSoruces = `var compilerSources = ${JSON.stringify(rawCompilerSources) };`;
+var compilerSources = `var compilerSources = ${JSON.stringify(rawCompilerSources) };`;
 
 // .js code for the compiler, what we are actually testing
 var rawCompilerJavaScript = fs.readFileSync(path.join(tsBuildDir, "tsc.js")).toString();
 rawCompilerJavaScript = rawCompilerJavaScript.replace("ts.executeCommandLine(ts.sys.args);", "");
 
 // lib.d.ts sources
 var rawLibSources = fs.readFileSync(path.join(tsBuildDir, "lib.d.ts")).toString();
-var libSoruces = `var libSources = ${JSON.stringify(rawLibSources) };`;
+var libSources = `var libSources = ${JSON.stringify(rawLibSources) };`;
 
 // write test output
 if (!fs.existsSync(testOutputDir)) {
@@ -48,7 +48,7 @@ if (!fs.existsSync(testOutputDir)) {
 // 1. compiler ts sources, used to test
 fs.writeFileSync(
     path.join(testOutputDir, "compilerSources.js"),
-    `${ compilerSoruces } \r\n ${ libSoruces }`);
+    `${ compilerSources } \r\n ${ libSources }`);
 
 // 2. the compiler js sources + a call the compiler
 fs.writeFileSync(