Merge branch 'master' into returnValueSurmise

Author: Kingwl

.gitignore

@@ -53,6 +53,7 @@ scripts/processDiagnosticMessages.js
 scripts/produceLKG.js
 scripts/importDefinitelyTypedTests/importDefinitelyTypedTests.js
 scripts/generateLocalizedDiagnosticMessages.js
+scripts/request-pr-review.js
 scripts/*.js.map
 scripts/typings/
 coverage/

Gulpfile.js

@@ -22,6 +22,9 @@ const copyright = "CopyrightNotice.txt";
 const cleanTasks = [];
 
 const buildScripts = () => buildProject("scripts");
+task("scripts", buildScripts);
+task("scripts").description = "Builds files in the 'scripts' folder.";
+
 const cleanScripts = () => cleanProject("scripts");
 cleanTasks.push(cleanScripts);
 

scripts/buildProtocol.ts

@@ -21,9 +21,8 @@ class DeclarationsWalker {
 
     static getExtraDeclarations(typeChecker: ts.TypeChecker, protocolFile: ts.SourceFile): string {
         const walker = new DeclarationsWalker(typeChecker, protocolFile);
-        let text = "declare namespace ts.server.protocol {\n";
         walker.visitTypeNodes(protocolFile);
-        text = walker.text
+        let text = walker.text
             ? `declare namespace ts.server.protocol {\n${walker.text}}`
             : "";
         if (walker.removedTypes) {

scripts/open-user-pr.ts

@@ -4,36 +4,39 @@
 import { Octokit } from "@octokit/rest";
 import {runSequence} from "./run-sequence";
 
-function padNum(num: number) {
-    const str = "" + num;
-    return str.length >= 2 ? str : "0" + str;
-}
-
 const userName = process.env.GH_USERNAME;
 const reviewers = process.env.REQUESTING_USER ? [process.env.REQUESTING_USER] : ["weswigham", "sandersn", "RyanCavanaugh"];
 const now = new Date();
-const branchName = `user-update-${process.env.TARGET_FORK}-${now.getFullYear()}${padNum(now.getMonth() + 1)}${padNum(now.getDate())}${process.env.TARGET_BRANCH ? "-" + process.env.TARGET_BRANCH : ""}`;
+const masterBranchname = `user-baseline-updates`;
+const targetBranch = process.env.TARGET_BRANCH || "master";
+const branchName = process.env.TARGET_FORK.toLowerCase() === "microsoft" && (targetBranch === "master" || targetBranch === "refs/heads/master")
+    ? masterBranchname
+    : `user-update-${process.env.TARGET_FORK}-${process.env.TARGET_BRANCH ? "-" + process.env.TARGET_BRANCH : ""}`;
 const remoteUrl = `https://${process.argv[2]}@github.com/${userName}/TypeScript.git`;
+const baseRef = branchName === masterBranchname ? "master" : masterBranchname;
 runSequence([
+    ["git", ["remote", "add", "fork", remoteUrl]], // Add the remote fork
     ["git", ["checkout", "."]], // reset any changes
+    ["git", ["fetch", baseRef === "master" ? "origin" : "fork", baseRef]], // fetch target ref in case it's not present locally
+    ["git", ["checkout", baseRef]], // move head to target
     ["node", ["./node_modules/gulp/bin/gulp.js", "baseline-accept"]], // accept baselines
     ["git", ["checkout", "-b", branchName]], // create a branch
     ["git", ["add", "."]], // Add all changes
     ["git", ["commit", "-m", `"Update user baselines"`]], // Commit all changes
-    ["git", ["remote", "add", "fork", remoteUrl]], // Add the remote fork
     ["git", ["push", "--set-upstream", "fork", branchName, "-f"]] // push the branch
 ]);
 
 const gh = new Octokit({
     auth: process.argv[2]
 });
+const prOwner = branchName === masterBranchname ? "microsoft" : userName;
 gh.pulls.create({
-    owner: process.env.TARGET_FORK!,
+    owner: prOwner,
     repo: "TypeScript",
     maintainer_can_modify: true,
     title: `🤖 User test baselines have changed` + (process.env.TARGET_BRANCH ? ` for ${process.env.TARGET_BRANCH}` : ""),
     head: `${userName}:${branchName}`,
-    base: process.env.TARGET_BRANCH || "master",
+    base: branchName === masterBranchname ? "master" : masterBranchname,
     body:
 `${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).
@@ -44,7 +47,7 @@ cc ${reviewers.map(r => "@" + r).join(" ")}`,
     console.log(`Pull request ${num} created.`);
     if (!process.env.SOURCE_ISSUE) {
         await gh.pulls.createReviewRequest({
-            owner: process.env.TARGET_FORK!,
+            owner: prOwner,
             repo: "TypeScript",
             pull_number: num,
             reviewers,
@@ -53,7 +56,7 @@ cc ${reviewers.map(r => "@" + r).join(" ")}`,
     else {
         await gh.issues.createComment({
             issue_number: +process.env.SOURCE_ISSUE,
-            owner: "Microsoft",
+            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}).`
         });

scripts/request-pr-review.ts

@@ -0,0 +1,73 @@
+/// <reference lib="esnext.asynciterable" />
+/// <reference lib="es2015.promise" />
+import octokit = require("@octokit/rest");
+import Octokit = octokit.Octokit;
+import minimist = require("minimist");
+
+const options = minimist(process.argv.slice(2), {
+    boolean: ["help"],
+    string: ["token", "pull", "reviewer", "owner", "repo"],
+    alias: {
+        pr: "pull",
+        h: "help",
+        ["?"]: "help"
+    },
+    default: {
+        token: process.env.GH_TOKEN,
+        pull: process.env.GH_PULL_NUMBER,
+        reviewer: process.env.REQUESTED_REVIEWER,
+        owner: "microsoft",
+        repo: "TypeScript"
+    }
+});
+
+if (options.help) {
+    printHelpAndExit(0);
+}
+
+if (!options.token || !options.pull || !options.reviewer || !options.owner || !options.repo) {
+    console.error("Invalid arguments");
+    printHelpAndExit(-1);
+}
+
+const pull_number = +options.pull;
+if (!isFinite(pull_number)) {
+    console.error("Invalid arguments");
+    printHelpAndExit(-2);
+}
+
+const reviewers = Array.isArray(options.reviewer) ? options.reviewer : [options.reviewer];
+
+main().catch(console.error);
+
+async function main() {
+    const gh = new Octokit({ auth: options.token });
+    const response = await gh.pulls.createReviewRequest({
+        owner: options.owner,
+        repo: options.repo,
+        pull_number,
+        reviewers,
+    });
+    if (response.status === 201) {
+        console.log(`Added ${reviewers.join(", ")} to ${response.data.url}`);
+    }
+    else {
+        console.log(`Failed to add ${reviewers.join(", ")} to the pull request.`);
+    }
+}
+
+function printHelpAndExit(exitCode: number) {
+    console.log(`
+usage: request-pr-review.js [options]
+
+options:
+    --token    <token>     Your GitHub auth token. Uses %GH_TOKEN% if present.
+    --owner    <owner>     The GH user or organization for the repo (default: 'microsoft').
+    --repo     <repo>      The GH repo for the pull request (default: 'TypeScript').
+    --pull     <pr_number> The pull request number. Uses %GH_PULL_NUMBER% if present.
+    --reviewer <reviewer>  The GH username of reviewer to add. May be specified multiple times.
+                           Uses %REQUESTED_REVIEWER% if present.
+ -h --help                 Prints this help message.
+`);
+    return process.exit(exitCode);
+}

scripts/tsconfig.json

@@ -17,6 +17,7 @@
         "configurePrerelease.ts",
         "buildProtocol.ts",
         "produceLKG.ts",
-        "word2md.ts"
+        "word2md.ts",
+        "request-pr-review.ts"
     ]
 }

src/compiler/builder.ts

@@ -201,6 +201,7 @@ namespace ts {
                 state.affectedFilesPendingEmit = oldState!.affectedFilesPendingEmit.slice();
                 state.affectedFilesPendingEmitKind = cloneMapOrUndefined(oldState!.affectedFilesPendingEmitKind);
                 state.affectedFilesPendingEmitIndex = oldState!.affectedFilesPendingEmitIndex;
+                state.seenAffectedFiles = createMap();
             }
         }
 
@@ -247,8 +248,8 @@ namespace ts {
         if (oldCompilerOptions && compilerOptionsAffectEmit(compilerOptions, oldCompilerOptions)) {
             // Add all files to affectedFilesPendingEmit since emit changed
             newProgram.getSourceFiles().forEach(f => addToAffectedFilesPendingEmit(state, f.resolvedPath, BuilderFileEmit.Full));
-            Debug.assert(state.seenAffectedFiles === undefined);
-            state.seenAffectedFiles = createMap<true>();
+            Debug.assert(!state.seenAffectedFiles || !state.seenAffectedFiles.size);
+            state.seenAffectedFiles = state.seenAffectedFiles || createMap<true>();
         }
 
         state.emittedBuildInfo = !state.changedFilesSet.size && !state.affectedFilesPendingEmit;