Merge branch 'master' into intersect-return-types

Author: RyanCavanaugh

Gulpfile.js

@@ -545,6 +545,10 @@ const configureInsiders = () => exec(process.execPath, ["scripts/configurePrerel
 task("configure-insiders", series(buildScripts, configureInsiders));
 task("configure-insiders").description = "Runs scripts/configurePrerelease.ts to prepare a build for insiders publishing";
 
+const configureExperimental = () => exec(process.execPath, ["scripts/configurePrerelease.js", "experimental", "package.json", "src/compiler/core.ts"])
+task("configure-experimental", series(buildScripts, configureExperimental));
+task("configure-experimental").description = "Runs scripts/configurePrerelease.ts to prepare a build for experimental 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";

README.md

@@ -79,8 +79,6 @@ gulp tests            # Build the test infrastructure using the built compiler.
 gulp runtests         # Run tests using the built compiler and test infrastructure. 
                       # You can override the host or specify a test for this command. 
                       # Use --host=<hostName> or --tests=<testPath>. 
-gulp runtests-browser # Runs the tests using the built run.js file. Syntax is gulp runtests. Optional
-                        parameters '--host=', '--tests=[regex], --reporter=[list|spec|json|<more>]'.
 gulp baseline-accept  # This replaces the baseline test results with the results obtained from gulp runtests.
 gulp lint             # Runs tslint on the TypeScript source.
 gulp help             # List the above commands. 

lib/tsserver.js

@@ -33624,7 +33624,7 @@ var ts;
             return type;
         }
         // A reserved member name starts with two underscores, but the third character cannot be an underscore
-        // or the @ symbol. A third underscore indicates an escaped form of an identifer that started
+        // or the @ symbol. A third underscore indicates an escaped form of an identifier that started
         // with at least two underscores. The @ character indicates that the name is denoted by a well known ES
         // Symbol instance.
         function isReservedMemberName(name) {
@@ -99911,9 +99911,9 @@ var ts;
                 || ts.isKnownSymbol(symbol)) {
                 return undefined;
             }
-            var validIdentiferResult = { name: name, needsConvertPropertyAccess: false };
+            var validIdentifierResult = { name: name, needsConvertPropertyAccess: false };
             if (ts.isIdentifierText(name, target))
-                return validIdentiferResult;
+                return validIdentifierResult;
             switch (kind) {
                 case 3 /* MemberLike */:
                     return undefined;
@@ -99926,7 +99926,7 @@ var ts;
                     return name.charCodeAt(0) === 32 /* space */ ? undefined : { name: name, needsConvertPropertyAccess: true };
                 case 5 /* None */:
                 case 4 /* String */:
-                    return validIdentiferResult;
+                    return validIdentifierResult;
                 default:
                     ts.Debug.assertNever(kind);
             }

lib/tsserverlibrary.js

@@ -33623,7 +33623,7 @@ var ts;
             return type;
         }
         // A reserved member name starts with two underscores, but the third character cannot be an underscore
-        // or the @ symbol. A third underscore indicates an escaped form of an identifer that started
+        // or the @ symbol. A third underscore indicates an escaped form of an identifier that started
         // with at least two underscores. The @ character indicates that the name is denoted by a well known ES
         // Symbol instance.
         function isReservedMemberName(name) {
@@ -100250,9 +100250,9 @@ var ts;
                 || ts.isKnownSymbol(symbol)) {
                 return undefined;
             }
-            var validIdentiferResult = { name: name, needsConvertPropertyAccess: false };
+            var validIdentifierResult = { name: name, needsConvertPropertyAccess: false };
             if (ts.isIdentifierText(name, target))
-                return validIdentiferResult;
+                return validIdentifierResult;
             switch (kind) {
                 case 3 /* MemberLike */:
                     return undefined;
@@ -100265,7 +100265,7 @@ var ts;
                     return name.charCodeAt(0) === 32 /* space */ ? undefined : { name: name, needsConvertPropertyAccess: true };
                 case 5 /* None */:
                 case 4 /* String */:
-                    return validIdentiferResult;
+                    return validIdentifierResult;
                 default:
                     ts.Debug.assertNever(kind);
             }

lib/typescript.js

@@ -33614,7 +33614,7 @@ var ts;
             return type;
         }
         // A reserved member name starts with two underscores, but the third character cannot be an underscore
-        // or the @ symbol. A third underscore indicates an escaped form of an identifer that started
+        // or the @ symbol. A third underscore indicates an escaped form of an identifier that started
         // with at least two underscores. The @ character indicates that the name is denoted by a well known ES
         // Symbol instance.
         function isReservedMemberName(name) {
@@ -100241,9 +100241,9 @@ var ts;
                 || ts.isKnownSymbol(symbol)) {
                 return undefined;
             }
-            var validIdentiferResult = { name: name, needsConvertPropertyAccess: false };
+            var validIdentifierResult = { name: name, needsConvertPropertyAccess: false };
             if (ts.isIdentifierText(name, target))
-                return validIdentiferResult;
+                return validIdentifierResult;
             switch (kind) {
                 case 3 /* MemberLike */:
                     return undefined;
@@ -100256,7 +100256,7 @@ var ts;
                     return name.charCodeAt(0) === 32 /* space */ ? undefined : { name: name, needsConvertPropertyAccess: true };
                 case 5 /* None */:
                 case 4 /* String */:
-                    return validIdentiferResult;
+                    return validIdentifierResult;
                 default:
                     ts.Debug.assertNever(kind);
             }

lib/typescriptServices.js

@@ -33614,7 +33614,7 @@ var ts;
             return type;
         }
         // A reserved member name starts with two underscores, but the third character cannot be an underscore
-        // or the @ symbol. A third underscore indicates an escaped form of an identifer that started
+        // or the @ symbol. A third underscore indicates an escaped form of an identifier that started
         // with at least two underscores. The @ character indicates that the name is denoted by a well known ES
         // Symbol instance.
         function isReservedMemberName(name) {
@@ -100241,9 +100241,9 @@ var ts;
                 || ts.isKnownSymbol(symbol)) {
                 return undefined;
             }
-            var validIdentiferResult = { name: name, needsConvertPropertyAccess: false };
+            var validIdentifierResult = { name: name, needsConvertPropertyAccess: false };
             if (ts.isIdentifierText(name, target))
-                return validIdentiferResult;
+                return validIdentifierResult;
             switch (kind) {
                 case 3 /* MemberLike */:
                     return undefined;
@@ -100256,7 +100256,7 @@ var ts;
                     return name.charCodeAt(0) === 32 /* space */ ? undefined : { name: name, needsConvertPropertyAccess: true };
                 case 5 /* None */:
                 case 4 /* String */:
-                    return validIdentiferResult;
+                    return validIdentifierResult;
                 default:
                     ts.Debug.assertNever(kind);
             }

lib/typingsInstaller.js

@@ -33615,7 +33615,7 @@ var ts;
             return type;
         }
         // A reserved member name starts with two underscores, but the third character cannot be an underscore
-        // or the @ symbol. A third underscore indicates an escaped form of an identifer that started
+        // or the @ symbol. A third underscore indicates an escaped form of an identifier that started
         // with at least two underscores. The @ character indicates that the name is denoted by a well known ES
         // Symbol instance.
         function isReservedMemberName(name) {

package.json

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

scripts/configurePrerelease.ts

@@ -22,7 +22,7 @@ function main(): void {
     }
 
     const tag = args[0];
-    if (tag !== "dev" && tag !== "insiders") {
+    if (tag !== "dev" && tag !== "insiders" && tag !== "experimental") {
         throw new Error(`Unexpected tag name '${tag}'.`);
     }
 

scripts/open-user-pr.ts

@@ -18,9 +18,9 @@ function padNum(number: number) {
 }
 
 const userName = process.env.GH_USERNAME;
-const reviewers = ["weswigham", "sandersn", "RyanCavanaugh"]
+const reviewers = process.env.requesting_user ? [process.env.requesting_user] : ["weswigham", "sandersn", "RyanCavanaugh"];
 const now = new Date();
-const branchName = `user-update-${now.getFullYear()}${padNum(now.getMonth())}${padNum(now.getDay())}`;
+const branchName = `user-update-${process.env.TARGET_FORK}-${now.getFullYear()}${padNum(now.getMonth())}${padNum(now.getDay())}${process.env.TARGET_BRANCH ? "-" + process.env.TARGET_BRANCH : ""}`;
 const remoteUrl = `https://${process.argv[2]}@github.com/${userName}/TypeScript.git`;
 runSequence([
     ["git", ["checkout", "."]], // reset any changes
@@ -41,23 +41,33 @@ gh.pulls.create({
     owner: process.env.TARGET_FORK,
     repo: "TypeScript",
     maintainer_can_modify: true,
-    title: `🤖 User test baselines have changed`,
+    title: `🤖 User test baselines have changed` + (process.env.TARGET_BRANCH ? ` for ${process.env.TARGET_BRANCH}` : ""),
     head: `${userName}:${branchName}`,
-    base: "master",
+    base: process.env.TARGET_BRANCH || "master",
     body:
-`Please review the diff and merge if no changes are unexpected.
+`${process.env.source_issue ? `This test run was triggerd by a request on https://github.com/Microsoft/TypeScript/pull/${process.env.source_issue} `+"\n" : ""}Please review the diff and merge if no changes are unexpected.
 You can view the build log [here](https://typescript.visualstudio.com/TypeScript/_build/index?buildId=${process.env.BUILD_BUILDID}&_a=summary).
 
 cc ${reviewers.map(r => "@" + r).join(" ")}`,
-}).then(r => {
+}).then(async r => {
     const num = r.data.number;
     console.log(`Pull request ${num} created.`);
-    return gh.pulls.createReviewRequest({
-        owner: process.env.TARGET_FORK,
-        repo: "TypeScript",
-        number: num,
-        reviewers,
-    });
+    if (!process.env.source_issue) {
+        await gh.pulls.createReviewRequest({
+            owner: process.env.TARGET_FORK,
+            repo: "TypeScript",
+            number: num,
+            reviewers,
+        });
+    }
+    else {
+        await gh.issues.createComment({
+            number: +process.env.source_issue,
+            owner: "Microsoft",
+            repo: "TypeScript",
+            body: `The user suite test run you requested has finished and _failed_. I've opened a [PR with the baseline diff from master](${r.data.html_url}).`
+        });
+    }
 }).then(() => {
     console.log(`Reviewers requested, done.`);
 }).catch(e => {

scripts/perf-result-post.js

@@ -0,0 +1,49 @@
+// @ts-check
+/// <reference lib="esnext.asynciterable" />
+// Must reference esnext.asynciterable lib, since octokit uses AsyncIterable internally
+const Octokit = require("@octokit/rest");
+const fs = require("fs");
+
+const requester = process.env.requesting_user;
+const source = process.env.source_issue;
+const postedComment = process.env.status_comment;
+console.log(`Loading fragment from ${process.argv[3]}...`);
+const outputTableText = fs.readFileSync(process.argv[3], { encoding: "utf8" });
+console.log(`Fragment contents:
+${outputTableText}`);
+
+const gh = new Octokit();
+gh.authenticate({
+    type: "token",
+    token: process.argv[2]
+});
+gh.issues.createComment({
+    number: +source,
+    owner: "Microsoft",
+    repo: "TypeScript",
+    body: `@${requester}
+The results of the perf run you requested are in!
+<details><summary> Here they are:</summary><p>
+${outputTableText}
+</p></details>`
+}).then(async data => {
+    console.log(`Results posted!`);
+    const newCommentUrl = data.data.html_url;
+    const comment = await gh.issues.getComment({
+        owner: "Microsoft",
+        repo: "TypeScript",
+        comment_id: +postedComment
+    });
+    const newBody = `${comment.data.body}
+
+Update: [The results are in!](${newCommentUrl})`;
+    return await gh.issues.updateComment({
+        owner: "Microsoft",
+        repo: "TypeScript",
+        comment_id: +postedComment,
+        body: newBody
+    });
+}).catch(e => {
+    console.error(e);
+    process.exit(1);
+});

src/compiler/binder.ts

@@ -2710,8 +2710,7 @@ namespace ts {
             }
             else {
                 const s = forEachIdentifierInEntityName(e.expression, parent, action);
-                if (!s || !s.exports) return Debug.fail();
-                return action(e.name, s.exports.get(e.name.escapedText), s);
+                return action(e.name, s && s.exports && s.exports.get(e.name.escapedText), s);
             }
         }
 

src/compiler/builder.ts

@@ -236,10 +236,7 @@ namespace ts {
             }
         });
 
-        if (oldCompilerOptions &&
-            (oldCompilerOptions.outDir !== compilerOptions.outDir ||
-                oldCompilerOptions.declarationDir !== compilerOptions.declarationDir ||
-                (oldCompilerOptions.outFile || oldCompilerOptions.out) !== (compilerOptions.outFile || compilerOptions.out))) {
+        if (oldCompilerOptions && compilerOptionsAffectEmit(compilerOptions, oldCompilerOptions)) {
             // Add all files to affectedFilesPendingEmit since emit changed
             state.affectedFilesPendingEmit = concatenate(state.affectedFilesPendingEmit, newProgram.getSourceFiles().map(f => f.path));
             if (state.affectedFilesPendingEmitIndex === undefined) {
@@ -792,7 +789,7 @@ namespace ts {
                             state,
                             // When whole program is affected, do emit only once (eg when --out or --outFile is specified)
                             // Otherwise just affected file
-                            affected.emitBuildInfo(writeFile || host.writeFile, cancellationToken),
+                            affected.emitBuildInfo(writeFile || maybeBind(host, host.writeFile), cancellationToken),
                             affected,
                             /*isPendingEmitFile*/ false,
                             /*isBuildInfoEmit*/ true
@@ -820,7 +817,7 @@ namespace ts {
                 state,
                 // When whole program is affected, do emit only once (eg when --out or --outFile is specified)
                 // Otherwise just affected file
-                Debug.assertDefined(state.program).emit(affected === state.program ? undefined : affected as SourceFile, writeFile || host.writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers),
+                Debug.assertDefined(state.program).emit(affected === state.program ? undefined : affected as SourceFile, writeFile || maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers),
                 affected,
                 isPendingEmitFile
             );
@@ -862,7 +859,7 @@ namespace ts {
                     };
                 }
             }
-            return Debug.assertDefined(state.program).emit(targetSourceFile, writeFile || host.writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers);
+            return Debug.assertDefined(state.program).emit(targetSourceFile, writeFile || maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
         }
 
         /**

src/compiler/builderState.ts

@@ -230,7 +230,7 @@ namespace ts.BuilderState {
 
         // Create the reference map, and set the file infos
         for (const sourceFile of newProgram.getSourceFiles()) {
-            const version = sourceFile.version;
+            const version = Debug.assertDefined(sourceFile.version, "Program intended to be used with Builder should have source files with versions set");
             const oldInfo = useOldState ? oldState!.fileInfos.get(sourceFile.path) : undefined;
             if (referencedMap) {
                 const newReferences = getReferencedFiles(newProgram, sourceFile, getCanonicalFileName);