diff --git a/.gitmodules b/.gitmodules
index bd4620625cf..fdf474a693d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,3 +18,19 @@
 	path = tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter
 	url = https://github.com/Microsoft/TypeScript-WeChat-Starter.git
 	ignore = all
+[submodule "tests/cases/user/create-react-app/create-react-app"]
+	path = tests/cases/user/create-react-app/create-react-app
+	url = https://github.com/facebook/create-react-app.git
+	ignore = all
+[submodule "tests/cases/user/webpack/webpack"]
+	path = tests/cases/user/webpack/webpack 
+        url = https://github.com/webpack/webpack.git
+	ignore = all
+[submodule "tests/cases/user/puppeteer/puppeteer"]
+	path = tests/cases/user/puppeteer/puppeteer
+	url = https://github.com/GoogleChrome/puppeteer.git
+	ignore = all
+[submodule "tests/cases/user/axios-src/axios-src"]
+	path = tests/cases/user/axios-src/axios-src
+	url = https://github.com/axios/axios.git
+        ignore = all
diff --git a/Gulpfile.ts b/Gulpfile.js
similarity index 85%
rename from Gulpfile.ts
rename to Gulpfile.js
index 1c6cfdd7ed1..afa7e775dcd 100644
--- a/Gulpfile.ts
+++ b/Gulpfile.js
@@ -1,35 +1,27 @@
 /// <reference path="scripts/types/ambient.d.ts" />
-import * as cp from "child_process";
-import * as path from "path";
-import * as fs from "fs";
-import child_process = require("child_process");
-import originalGulp = require("gulp");
-import helpMaker = require("gulp-help");
-import runSequence = require("run-sequence");
-import concat = require("gulp-concat");
-import clone = require("gulp-clone");
-import newer = require("gulp-newer");
-import tsc = require("gulp-typescript");
-declare module "gulp-typescript" {
-    interface Settings {
-        pretty?: boolean;
-        newLine?: string;
-        noImplicitThis?: boolean;
-        stripInternal?: boolean;
-        types?: string[];
-    }
-}
-import * as insert from "gulp-insert";
-import * as sourcemaps from "gulp-sourcemaps";
-import Q = require("q");
-import del = require("del");
-import mkdirP = require("mkdirp");
-import minimist = require("minimist");
-import browserify = require("browserify");
-import through2 = require("through2");
-import merge2 = require("merge2");
-import * as os from "os";
-import fold = require("travis-fold");
+// @ts-check
+const cp = require("child_process");
+const path = require("path");
+const fs = require("fs");
+const child_process = require("child_process");
+const originalGulp = require("gulp");
+const helpMaker = require("gulp-help");
+const runSequence = require("run-sequence");
+const concat = require("gulp-concat");
+const clone = require("gulp-clone");
+const newer = require("gulp-newer");
+const tsc = require("gulp-typescript");
+const insert = require("gulp-insert");
+const sourcemaps = require("gulp-sourcemaps");
+const Q = require("q");
+const del = require("del");
+const mkdirP = require("mkdirp");
+const minimist = require("minimist");
+const browserify = require("browserify");
+const through2 = require("through2");
+const merge2 = require("merge2");
+const os = require("os");
+const fold = require("travis-fold");
 const gulp = helpMaker(originalGulp);
 
 Error.stackTraceLimit = 1000;
@@ -73,17 +65,26 @@ const cmdLineOptions = minimist(process.argv.slice(2), {
 });
 
 const noop = () => {}; // tslint:disable-line no-empty
-function exec(cmd: string, args: string[], complete: () => void = noop, error: (e: any, status: number) => void = noop) {
+/**
+ * @param {string} cmd 
+ * @param {string[]} args 
+ * @param {() => void} complete 
+ * @param {(e: *, status: number) => void} error 
+ */
+function exec(cmd, args, complete = noop, error = noop) {
     console.log(`${cmd} ${args.join(" ")}`);
     // TODO (weswig): Update child_process types to add windowsVerbatimArguments to the type definition
     const subshellFlag = isWin ? "/c" : "-c";
     const command = isWin ? [possiblyQuote(cmd), ...args] : [`${cmd} ${args.join(" ")}`];
-    const ex = cp.spawn(isWin ? "cmd" : "/bin/sh", [subshellFlag, ...command], { stdio: "inherit", windowsVerbatimArguments: true } as any);
+    const ex = cp.spawn(isWin ? "cmd" : "/bin/sh", [subshellFlag, ...command], { stdio: "inherit", windowsVerbatimArguments: true });
     ex.on("exit", (code) => code === 0 ? complete() : error(/*e*/ undefined, code));
     ex.on("error", error);
 }
 
-function possiblyQuote(cmd: string) {
+/**
+ * @param {string} cmd 
+ */
+function possiblyQuote(cmd) {
     return cmd.indexOf(" ") >= 0 ? `"${cmd}"` : cmd;
 }
 
@@ -215,12 +216,17 @@ for (const i in libraryTargets) {
             .pipe(gulp.dest(".")));
 }
 
-const configureNightlyJs = path.join(scriptsDirectory, "configureNightly.js");
-const configureNightlyTs = path.join(scriptsDirectory, "configureNightly.ts");
+const configurePreleleaseJs = path.join(scriptsDirectory, "configurePrerelease.js");
+const configurePreleleaseTs = path.join(scriptsDirectory, "configurePrerelease.ts");
 const packageJson = "package.json";
 const versionFile = path.join(compilerDirectory, "core.ts");
 
-function needsUpdate(source: string | string[], dest: string | string[]): boolean {
+/**
+ * @param {string | string[]} source 
+ * @param {string | string[]} dest 
+ * @returns {boolean}
+ */
+function needsUpdate(source, dest) {
     if (typeof source === "string" && typeof dest === "string") {
         if (fs.existsSync(dest)) {
             const {mtime: outTime} = fs.statSync(dest);
@@ -283,8 +289,13 @@ function needsUpdate(source: string | string[], dest: string | string[]): boolea
     return true;
 }
 
-function getCompilerSettings(base: tsc.Settings, useBuiltCompiler?: boolean): tsc.Settings {
-    const copy: tsc.Settings = {};
+/**
+ * @param {tsc.Settings} base 
+ * @param {boolean=} useBuiltCompiler
+ * @returns {tsc.Settings}
+ */
+function getCompilerSettings(base, useBuiltCompiler) {
+    const copy = /** @type {tsc.Settings} */ ({});
     for (const key in base) {
         copy[key] = base[key];
     }
@@ -293,32 +304,34 @@ function getCompilerSettings(base: tsc.Settings, useBuiltCompiler?: boolean): ts
     }
     copy.newLine = "lf";
     if (useBuiltCompiler === true) {
-        copy.typescript = require("./built/local/typescript.js");
+        copy.typescript = /** @type {*} */ (require("./built/local/typescript.js"));
     }
     else if (useBuiltCompiler === false) {
-        copy.typescript = require("./lib/typescript.js");
+        copy.typescript = /** @type {*} */ (require("./lib/typescript.js"));
     }
     return copy;
 }
 
-gulp.task(configureNightlyJs, /*help*/ false, [], () => {
-    const settings: tsc.Settings = {
+gulp.task(configurePreleleaseJs, /*help*/ false, [], () => {
+    /** @type {tsc.Settings} */
+    const settings = {
         declaration: false,
         removeComments: true,
         noResolve: false,
         stripInternal: false,
+        module: "commonjs"
     };
-    return gulp.src(configureNightlyTs)
+    return gulp.src(configurePreleleaseTs)
         .pipe(sourcemaps.init())
         .pipe(tsc(settings))
-        .pipe(sourcemaps.write(path.dirname(configureNightlyJs)))
-        .pipe(gulp.dest(path.dirname(configureNightlyJs)));
+        .pipe(sourcemaps.write("."))
+        .pipe(gulp.dest("./scripts"));
 });
 
 
 // Nightly management tasks
-gulp.task("configure-nightly", "Runs scripts/configureNightly.ts to prepare a build for nightly publishing", [configureNightlyJs], (done) => {
-    exec(host, [configureNightlyJs, packageJson, versionFile], done, done);
+gulp.task("configure-nightly", "Runs scripts/configurePrerelease.ts to prepare a build for nightly publishing", [configurePreleleaseJs], (done) => {
+    exec(host, [configurePreleleaseJs, "dev", packageJson, versionFile], done, done);
 });
 gulp.task("publish-nightly", "Runs `npm publish --tag next` to create a new nightly build on npm", ["LKG"], () => {
     return runSequence("clean", "useDebugMode", "runtests-parallel", (done) => {
@@ -331,7 +344,8 @@ const importDefinitelyTypedTestsJs = path.join(importDefinitelyTypedTestsDirecto
 const importDefinitelyTypedTestsTs = path.join(importDefinitelyTypedTestsDirectory, "importDefinitelyTypedTests.ts");
 
 gulp.task(importDefinitelyTypedTestsJs, /*help*/ false, [], () => {
-    const settings: tsc.Settings = getCompilerSettings({
+    /** @type {tsc.Settings} */
+    const settings = getCompilerSettings({
         declaration: false,
         removeComments: true,
         noResolve: false,
@@ -362,20 +376,11 @@ const builtGeneratedDiagnosticMessagesJSON = path.join(builtLocalDirectory, "dia
 
 // processDiagnosticMessages script
 gulp.task(processDiagnosticMessagesJs, /*help*/ false, [], () => {
-    const settings: tsc.Settings = getCompilerSettings({
-        target: "es5",
-        declaration: false,
-        removeComments: true,
-        noResolve: false,
-        stripInternal: false,
-        outFile: processDiagnosticMessagesJs
-    }, /*useBuiltCompiler*/ false);
-    return gulp.src(processDiagnosticMessagesTs)
+    const diagsProject = tsc.createProject('./scripts/processDiagnosticMessages.tsconfig.json');
+    return diagsProject.src()
         .pipe(newer(processDiagnosticMessagesJs))
-        .pipe(sourcemaps.init())
-        .pipe(tsc(settings))
-        .pipe(sourcemaps.write("."))
-        .pipe(gulp.dest("."));
+        .pipe(diagsProject())
+        .pipe(gulp.dest(scriptsDirectory));
 });
 
 // The generated diagnostics map; built for the compiler and for the "generate-diagnostics" task
@@ -402,7 +407,8 @@ const generateLocalizedDiagnosticMessagesJs = path.join(scriptsDirectory, "gener
 const generateLocalizedDiagnosticMessagesTs = path.join(scriptsDirectory, "generateLocalizedDiagnosticMessages.ts");
 
 gulp.task(generateLocalizedDiagnosticMessagesJs, /*help*/ false, [], () => {
-    const settings: tsc.Settings = getCompilerSettings({
+    /** @type {tsc.Settings} */
+    const settings = getCompilerSettings({
         target: "es5",
         declaration: false,
         removeComments: true,
@@ -433,8 +439,12 @@ const nodePackageFile = path.join(builtLocalDirectory, "typescript.js");
 const nodeDefinitionsFile = path.join(builtLocalDirectory, "typescript.d.ts");
 const nodeStandaloneDefinitionsFile = path.join(builtLocalDirectory, "typescript_standalone.d.ts");
 
-let copyrightContent: string;
-function prependCopyright(outputCopyright: boolean = !useDebugMode) {
+/** @type {string} */
+let copyrightContent;
+/**
+ * @param {boolean} outputCopyright 
+ */
+function prependCopyright(outputCopyright = !useDebugMode) {
     return insert.prepend(outputCopyright ? (copyrightContent || (copyrightContent = fs.readFileSync(copyright).toString())) : "");
 }
 
@@ -526,9 +536,10 @@ const tsserverLibraryDefinitionFile = path.join(builtLocalDirectory, "tsserverli
 
 gulp.task(tsserverLibraryFile, /*help*/ false, [servicesFile, typesMapJson], (done) => {
     const serverLibraryProject = tsc.createProject("src/server/tsconfig.library.json", getCompilerSettings({ removeComments: false }, /*useBuiltCompiler*/ true));
-    const {js, dts}: { js: NodeJS.ReadableStream, dts: NodeJS.ReadableStream } = serverLibraryProject.src()
+    /** @type {{ js: NodeJS.ReadableStream, dts: NodeJS.ReadableStream }} */
+    const {js, dts} = serverLibraryProject.src()
         .pipe(sourcemaps.init())
-        .pipe(newer(<any>{ dest: tsserverLibraryFile, extra: ["src/compiler/**/*.ts", "src/services/**/*.ts"] }))
+        .pipe(newer(/** @type {*} */({ dest: tsserverLibraryFile, extra: ["src/compiler/**/*.ts", "src/services/**/*.ts"] })))
         .pipe(serverLibraryProject());
 
     return merge2([
@@ -563,7 +574,8 @@ const specWord = path.join(docDirectory, "TypeScript Language Specification.docx
 const specMd = path.join(docDirectory, "spec.md");
 
 gulp.task(word2mdJs, /*help*/ false, [], () => {
-    const settings: tsc.Settings = getCompilerSettings({
+    /** @type {tsc.Settings} */
+    const settings = getCompilerSettings({
         outFile: word2mdJs
     }, /*useBuiltCompiler*/ false);
     return gulp.src(word2mdTs)
@@ -642,7 +654,8 @@ function deleteTemporaryProjectOutput() {
     return del(path.join(localBaseline, "projectOutput/"));
 }
 
-let savedNodeEnv: string;
+/** @type {string} */
+let savedNodeEnv;
 function setNodeEnvToDevelopment() {
     savedNodeEnv = process.env.NODE_ENV;
     process.env.NODE_ENV = "development";
@@ -652,7 +665,12 @@ function restoreSavedNodeEnv() {
     process.env.NODE_ENV = savedNodeEnv;
 }
 
-function runConsoleTests(defaultReporter: string, runInParallel: boolean, done: (e?: any) => void) {
+/**
+ * @param {string} defaultReporter 
+ * @param {boolean} runInParallel 
+ * @param {(e?: any) => void} done 
+ */
+function runConsoleTests(defaultReporter, runInParallel, done) {
     const lintFlag = cmdLineOptions.lint;
     cleanTestDirs((err) => {
         if (err) { console.error(err); failWithStatus(err, 1); }
@@ -727,7 +745,11 @@ function runConsoleTests(defaultReporter: string, runInParallel: boolean, done:
         }
     });
 
-    function failWithStatus(err?: any, status?: number) {
+    /**
+     * @param {any=} err 
+     * @param {number=} status 
+     */
+    function failWithStatus(err, status) {
         if (err || status) {
             process.exit(typeof status === "number" ? status : 2);
         }
@@ -743,7 +765,11 @@ function runConsoleTests(defaultReporter: string, runInParallel: boolean, done:
         }
     }
 
-    function finish(error?: any, errorStatus?: number) {
+    /**
+     * @param {any=} error 
+     * @param {number=} errorStatus 
+     */
+    function finish(error, errorStatus) {
         restoreSavedNodeEnv();
         deleteTestConfig().then(deleteTemporaryProjectOutput).then(() => {
             if (error !== undefined || errorStatus !== undefined) {
@@ -773,7 +799,8 @@ gulp.task("runtests",
 const nodeServerOutFile = "tests/webTestServer.js";
 const nodeServerInFile = "tests/webTestServer.ts";
 gulp.task(nodeServerOutFile, /*help*/ false, [servicesFile], () => {
-    const settings: tsc.Settings = getCompilerSettings({ module: "commonjs" }, /*useBuiltCompiler*/ true);
+    /** @type {tsc.Settings} */
+    const settings = getCompilerSettings({ module: "commonjs" }, /*useBuiltCompiler*/ true);
     return gulp.src(nodeServerInFile)
         .pipe(newer(nodeServerOutFile))
         .pipe(sourcemaps.init())
@@ -782,16 +809,18 @@ gulp.task(nodeServerOutFile, /*help*/ false, [servicesFile], () => {
         .pipe(gulp.dest(path.dirname(nodeServerOutFile)));
 });
 
-import convertMap = require("convert-source-map");
-import sorcery = require("sorcery");
-import Vinyl = require("vinyl");
+const convertMap = require("convert-source-map");
+const sorcery = require("sorcery");
+const Vinyl = require("vinyl");
 
 const bundlePath = path.resolve("built/local/bundle.js");
 
 gulp.task("browserify", "Runs browserify on run.js to produce a file suitable for running tests in the browser", [servicesFile], (done) => {
     const testProject = tsc.createProject("src/harness/tsconfig.json", getCompilerSettings({ outFile: bundlePath, inlineSourceMap: true }, /*useBuiltCompiler*/ true));
-    let originalMap: any;
-    let prebundledContent: string;
+    /** @type {*} */
+    let originalMap;
+    /** @type {string} */
+    let prebundledContent;
     browserify(testProject.src()
         .pipe(newer(bundlePath))
         .pipe(sourcemaps.init())
@@ -855,8 +884,10 @@ gulp.task("browserify", "Runs browserify on run.js to produce a file suitable fo
         });
 });
 
-
-function cleanTestDirs(done: (e?: any) => void) {
+/**
+ * @param {(e?: any) => void} done 
+ */
+function cleanTestDirs(done) {
     // Clean the local baselines & Rwc baselines directories
     del([
         localBaseline,
@@ -872,8 +903,17 @@ function cleanTestDirs(done: (e?: any) => void) {
     });
 }
 
-// used to pass data from jake command line directly to run.js
-function writeTestConfigFile(tests: string, runners: string, light: boolean, taskConfigsFolder?: string, workerCount?: number, stackTraceLimit?: string, timeout?: number) {
+/**
+ * used to pass data from jake command line directly to run.js
+ * @param {string} tests 
+ * @param {string} runners 
+ * @param {boolean} light 
+ * @param {string=} taskConfigsFolder 
+ * @param {number=} workerCount 
+ * @param {string=} stackTraceLimit 
+ * @param {number=} timeout 
+ */
+function writeTestConfigFile(tests, runners, light, taskConfigsFolder, workerCount, stackTraceLimit, timeout) {
     const testConfigContents = JSON.stringify({
         test: tests ? [tests] : undefined,
         runner: runners ? runners.split(",") : undefined,
@@ -974,7 +1014,7 @@ gulp.task("baseline-accept-test262", "Makes the most recent test262 test results
 const webhostPath = "tests/webhost/webtsc.ts";
 const webhostJsPath = "tests/webhost/webtsc.js";
 gulp.task(webhostJsPath, /*help*/ false, [servicesFile], () => {
-    const settings: tsc.Settings = getCompilerSettings({
+    const settings = getCompilerSettings({
         outFile: webhostJsPath
     }, /*useBuiltCompiler*/ true);
     return gulp.src(webhostPath)
@@ -994,7 +1034,7 @@ gulp.task("webhost", "Builds the tsc web host", [webhostJsPath], () => {
 const perftscPath = "tests/perftsc.ts";
 const perftscJsPath = "built/local/perftsc.js";
 gulp.task(perftscJsPath, /*help*/ false, [servicesFile], () => {
-    const settings: tsc.Settings = getCompilerSettings({
+    const settings = getCompilerSettings({
         outFile: perftscJsPath
     }, /*useBuiltCompiler*/ true);
     return gulp.src(perftscPath)
@@ -1025,7 +1065,7 @@ gulp.task(loggedIOJsPath, /*help*/ false, [], (done) => {
 const instrumenterPath = path.join(harnessDirectory, "instrumenter.ts");
 const instrumenterJsPath = path.join(builtLocalDirectory, "instrumenter.js");
 gulp.task(instrumenterJsPath, /*help*/ false, [servicesFile], () => {
-    const settings: tsc.Settings = getCompilerSettings({
+    const settings = getCompilerSettings({
         module: "commonjs",
         target: "es5",
         lib: [
@@ -1052,7 +1092,7 @@ gulp.task("update-sublime", "Updates the sublime plugin's tsserver", ["local", s
 });
 
 gulp.task("build-rules", "Compiles tslint rules to js", () => {
-    const settings: tsc.Settings = getCompilerSettings({ module: "commonjs", lib: ["es6"] }, /*useBuiltCompiler*/ false);
+    const settings = getCompilerSettings({ module: "commonjs", lib: ["es6"] }, /*useBuiltCompiler*/ false);
     const dest = path.join(builtLocalDirectory, "tslint");
     return gulp.src("scripts/tslint/**/*.ts")
         .pipe(newer({
@@ -1065,51 +1105,6 @@ gulp.task("build-rules", "Compiles tslint rules to js", () => {
         .pipe(gulp.dest(dest));
 });
 
-const lintTargets = [
-    "Gulpfile.ts",
-    "src/compiler/**/*.ts",
-    "src/harness/**/*.ts",
-    "!src/harness/unittests/services/formatting/**/*.ts",
-    "src/server/**/*.ts",
-    "scripts/tslint/**/*.ts",
-    "src/services/**/*.ts",
-    "tests/*.ts", "tests/webhost/*.ts" // Note: does *not* descend recursively
-];
-
-function sendNextFile(files: {path: string}[], child: cp.ChildProcess, callback: (failures: number) => void, failures: number) {
-    const file = files.pop();
-    if (file) {
-        console.log(`Linting '${file.path}'.`);
-        child.send({ kind: "file", name: file.path });
-    }
-    else {
-        child.send({ kind: "close" });
-        callback(failures);
-    }
-}
-
-function spawnLintWorker(files: {path: string}[], callback: (failures: number) => void) {
-    const child = cp.fork("./scripts/parallel-lint");
-    let failures = 0;
-    child.on("message", data => {
-        switch (data.kind) {
-            case "result":
-                if (data.failures > 0) {
-                    failures += data.failures;
-                    console.log(data.output);
-                }
-                sendNextFile(files, child, callback, failures);
-                break;
-            case "error":
-                console.error(data.error);
-                failures++;
-                sendNextFile(files, child, callback, failures);
-                break;
-        }
-    });
-    sendNextFile(files, child, callback, failures);
-}
-
 gulp.task("lint", "Runs tslint on the compiler sources. Optional arguments are: --f[iles]=regex", ["build-rules"], () => {
     if (fold.isTravis()) console.log(fold.start("lint"));
     for (const project of ["scripts/tslint/tsconfig.json", "src/tsconfig-base.json"]) {
diff --git a/Jakefile.js b/Jakefile.js
index d570a7cfc3d..3eb8736445b 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -87,93 +87,10 @@ var typingsInstallerSources = filesFromConfig(path.join(serverDirectory, "typing
 var watchGuardSources = filesFromConfig(path.join(serverDirectory, "watchGuard/tsconfig.json"));
 var serverSources = filesFromConfig(path.join(serverDirectory, "tsconfig.json"));
 var languageServiceLibrarySources = filesFromConfig(path.join(serverDirectory, "tsconfig.library.json"));
+var harnessSources = filesFromConfig("./src/harness/tsconfig.json");
 
 var typesMapOutputPath = path.join(builtLocalDirectory, 'typesMap.json');
 
-var harnessCoreSources = [
-    "harness.ts",
-    "virtualFileSystem.ts",
-    "virtualFileSystemWithWatch.ts",
-    "sourceMapRecorder.ts",
-    "harnessLanguageService.ts",
-    "fourslash.ts",
-    "runnerbase.ts",
-    "compilerRunner.ts",
-    "typeWriter.ts",
-    "fourslashRunner.ts",
-    "projectsRunner.ts",
-    "loggedIO.ts",
-    "rwcRunner.ts",
-    "externalCompileRunner.ts",
-    "test262Runner.ts",
-    "./parallel/shared.ts",
-    "./parallel/host.ts",
-    "./parallel/worker.ts",
-    "runner.ts"
-].map(function (f) {
-    return path.join(harnessDirectory, f);
-});
-
-var harnessSources = harnessCoreSources.concat([
-    "base64.ts",
-    "incrementalParser.ts",
-    "jsDocParsing.ts",
-    "services/colorization.ts",
-    "services/documentRegistry.ts",
-    "services/preProcessFile.ts",
-    "services/patternMatcher.ts",
-    "session.ts",
-    "versionCache.ts",
-    "convertToBase64.ts",
-    "transpile.ts",
-    "reuseProgramStructure.ts",
-    "textStorage.ts",
-    "moduleResolution.ts",
-    "tsconfigParsing.ts",
-    "asserts.ts",
-    "builder.ts",
-    "commandLineParsing.ts",
-    "configurationExtension.ts",
-    "convertCompilerOptionsFromJson.ts",
-    "convertTypeAcquisitionFromJson.ts",
-    "tsserverProjectSystem.ts",
-    "tscWatchMode.ts",
-    "compileOnSave.ts",
-    "typingsInstaller.ts",
-    "projectErrors.ts",
-    "matchFiles.ts",
-    "organizeImports.ts",
-    "initializeTSConfig.ts",
-    "extractConstants.ts",
-    "extractFunctions.ts",
-    "extractRanges.ts",
-    "extractTestHelpers.ts",
-    "printer.ts",
-    "textChanges.ts",
-    "telemetry.ts",
-    "transform.ts",
-    "customTransforms.ts",
-    "programMissingFiles.ts",
-    "programNoParseFalsyFileNames.ts",
-    "symbolWalker.ts",
-    "languageService.ts",
-    "publicApi.ts",
-    "hostNewLineSupport.ts",
-].map(function (f) {
-    return path.join(unittestsDirectory, f);
-})).concat([
-    "protocol.ts",
-    "utilities.ts",
-    "scriptVersionCache.ts",
-    "scriptInfo.ts",
-    "project.ts",
-    "typingsCache.ts",
-    "editorServices.ts",
-    "session.ts",
-].map(function (f) {
-    return path.join(serverDirectory, f);
-}));
-
 var es2015LibrarySources = [
     "es2015.core.d.ts",
     "es2015.collection.d.ts",
@@ -451,6 +368,8 @@ task("lib", libraryTargets);
 // Generate diagnostics
 var processDiagnosticMessagesJs = path.join(scriptsDirectory, "processDiagnosticMessages.js");
 var processDiagnosticMessagesTs = path.join(scriptsDirectory, "processDiagnosticMessages.ts");
+var processDiagnosticMessagesSources = filesFromConfig("./scripts/processDiagnosticMessages.tsconfig.json");
+
 var diagnosticMessagesJson = path.join(compilerDirectory, "diagnosticMessages.json");
 var diagnosticInfoMapTs = path.join(compilerDirectory, "diagnosticInformationMap.generated.ts");
 var generatedDiagnosticMessagesJSON = path.join(compilerDirectory, "diagnosticMessages.generated.json");
@@ -460,8 +379,8 @@ file(processDiagnosticMessagesTs);
 
 // processDiagnosticMessages script
 compileFile(processDiagnosticMessagesJs,
-    [processDiagnosticMessagesTs],
-    [processDiagnosticMessagesTs],
+    processDiagnosticMessagesSources,
+    processDiagnosticMessagesSources,
     [],
     /*useBuiltCompiler*/ false);
 
@@ -572,7 +491,7 @@ compileFile(/*outfile*/configurePrereleaseJs,
             /*prereqs*/[configurePrereleaseTs],
             /*prefixes*/[],
             /*useBuiltCompiler*/ false,
-    { noOutFile: false, generateDeclarations: false, keepComments: false, noResolve: false, stripInternal: false });
+    { noOutFile: true, generateDeclarations: false, keepComments: false, noResolve: false, stripInternal: false });
 
 task("setDebugMode", function () {
     useDebugMode = true;
diff --git a/package-lock.json b/package-lock.json
index 990d3fbcb5a..265d4233ad8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,33 +1,16 @@
 {
     "name": "typescript",
-    "version": "2.8.0",
+    "version": "2.9.0",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
-        "@browserify/acorn5-object-spread": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/@browserify/acorn5-object-spread/-/acorn5-object-spread-5.0.1.tgz",
-            "integrity": "sha512-sFCUPzgeEjdq3rinwy4TFXtak2YZdhqpj6MdNusxkdTFr9TXAUEYK4YQSamR8Joqt/yii1drgl5hk8q/AtJDKA==",
-            "dev": true,
-            "requires": {
-                "acorn": "5.3.0"
-            },
-            "dependencies": {
-                "acorn": {
-                    "version": "5.3.0",
-                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz",
-                    "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug==",
-                    "dev": true
-                }
-            }
-        },
         "@gulp-sourcemaps/identity-map": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.1.tgz",
             "integrity": "sha1-z6I7xYQPkQTOMqZedNt+epdLvuE=",
             "dev": true,
             "requires": {
-                "acorn": "5.3.0",
+                "acorn": "5.5.3",
                 "css": "2.2.1",
                 "normalize-path": "2.1.1",
                 "source-map": "0.5.7",
@@ -35,9 +18,9 @@
             },
             "dependencies": {
                 "acorn": {
-                    "version": "5.3.0",
-                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz",
-                    "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug==",
+                    "version": "5.5.3",
+                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz",
+                    "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==",
                     "dev": true
                 }
             }
@@ -63,9 +46,9 @@
             }
         },
         "@types/chai": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.1.2.tgz",
-            "integrity": "sha512-D8uQwKYUw2KESkorZ27ykzXgvkDJYXVEihGklgfp5I4HUP8D6IxtcdLTMB1emjQiWzV7WZ5ihm1cxIzVwjoleQ==",
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.1.3.tgz",
+            "integrity": "sha512-f5dXGzOJycyzSMdaXVhiBhauL4dYydXwVpavfQ1mVCaGjR56a9QfklXObUxlIY9bGTmCPHEEZ04I16BZ/8w5ww==",
             "dev": true
         },
         "@types/convert-source-map": {
@@ -75,18 +58,18 @@
             "dev": true
         },
         "@types/del": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/@types/del/-/del-3.0.0.tgz",
-            "integrity": "sha512-18mSs54BvzV8+TTQxt0ancig6tsuPZySnhp3cQkWFFDmDMavU4pmWwR+bHHqRBWODYqpzIzVkqKLuk/fP6yypQ==",
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/@types/del/-/del-3.0.1.tgz",
+            "integrity": "sha512-y6qRq6raBuu965clKgx6FHuiPu3oHdtmzMPXi8Uahsjdq1L6DL5fS/aY5/s71YwM7k6K1QIWvem5vNwlnNGIkQ==",
             "dev": true,
             "requires": {
                 "@types/glob": "5.0.35"
             }
         },
         "@types/events": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@types/events/-/events-1.1.0.tgz",
-            "integrity": "sha512-y3bR98mzYOo0pAZuiLari+cQyiKk3UXRuT45h1RjhfeCzqkjaVsfZJNaxdgtk7/3tzOm1ozLTqEqMP3VbI48jw==",
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz",
+            "integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==",
             "dev": true
         },
         "@types/glob": {
@@ -95,7 +78,7 @@
             "integrity": "sha512-wc+VveszMLyMWFvXLkloixT4n0harUIVZjnpzztaZ0nKLuul7Z32iMt2fUFGAaZ4y1XWjFRMtCI5ewvyh4aIeg==",
             "dev": true,
             "requires": {
-                "@types/events": "1.1.0",
+                "@types/events": "1.2.0",
                 "@types/minimatch": "3.0.3",
                 "@types/node": "8.5.5"
             }
@@ -189,9 +172,9 @@
             }
         },
         "@types/mocha": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.0.0.tgz",
-            "integrity": "sha512-ZS0vBV7Jn5Z/Q4T3VXauEKMDCV8nWOtJJg90OsDylkYJiQwcWtKuLzohWzrthBkerUF7DLMmJcwOPEP0i/AOXw==",
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.0.tgz",
+            "integrity": "sha512-YeDiSEzznwZwwp766SJ6QlrTyBYUGPSIwmREHVTmktUYiT/WADdWtpt9iH0KuUSf8lZLdI4lP0X6PBzPo5//JQ==",
             "dev": true
         },
         "@types/node": {
@@ -207,13 +190,13 @@
             "dev": true,
             "requires": {
                 "@types/node": "8.5.5",
-                "@types/q": "1.0.7"
+                "@types/q": "1.5.0"
             }
         },
         "@types/q": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/@types/q/-/q-1.0.7.tgz",
-            "integrity": "sha512-0WS7XU7sXzQ7J1nbnMKKYdjrrFoO3YtZYgUzeV8JFXffPnHfvSJQleR70I8BOAsOm14i4dyaAZ3YzqIl1YhkXQ==",
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.0.tgz",
+            "integrity": "sha512-sWj7AMiG0fYmta6ug1ublLjtj/tqn+CnCZeo7yswR1ykxel0FOWFGdWviTcGSNAMmtLbycDqbg6w98VPFKJmbw==",
             "dev": true
         },
         "@types/run-sequence": {
@@ -235,6 +218,12 @@
                 "@types/node": "8.5.5"
             }
         },
+        "@types/travis-fold": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/@types/travis-fold/-/travis-fold-0.1.0.tgz",
+            "integrity": "sha512-qrXB0Div8vIzA8P809JRlh9lD4mSOYwRBJbU1zcj0BWhULP15Zx0oQyJtjaOnkNR5RZcYQDbgimj40M1GDmhcQ==",
+            "dev": true
+        },
         "@types/vinyl": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.2.tgz",
@@ -275,6 +264,24 @@
             "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
             "dev": true
         },
+        "acorn-node": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.3.0.tgz",
+            "integrity": "sha512-efP54n3d1aLfjL2UMdaXa6DsswwzJeI5rqhbFvXMrKiJ6eJFpf+7R0zN7t8IC+XKn2YOAFAv6xbBNgHUkoHWLw==",
+            "dev": true,
+            "requires": {
+                "acorn": "5.5.3",
+                "xtend": "4.0.1"
+            },
+            "dependencies": {
+                "acorn": {
+                    "version": "5.5.3",
+                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz",
+                    "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==",
+                    "dev": true
+                }
+            }
+        },
         "align-text": {
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
@@ -345,6 +352,15 @@
             "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
             "dev": true
         },
+        "ansi-styles": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+            "dev": true,
+            "requires": {
+                "color-convert": "1.9.1"
+            }
+        },
         "ansi-wrap": {
             "version": "0.1.0",
             "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
@@ -367,9 +383,9 @@
             "dev": true
         },
         "argparse": {
-            "version": "1.0.9",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
-            "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
+            "version": "1.0.10",
+            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
             "dev": true,
             "requires": {
                 "sprintf-js": "1.0.3"
@@ -450,21 +466,15 @@
             "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
             "dev": true
         },
-        "arrify": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-            "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-            "dev": true
-        },
         "asn1.js": {
-            "version": "4.9.2",
-            "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.2.tgz",
-            "integrity": "sha512-b/OsSjvWEo8Pi8H0zsDd2P6Uqo2TK2pH8gNLSJtNLM2Db0v2QaAZ0pBQJXVjAn4gBuugeVDr7s63ZogpUIwWDg==",
+            "version": "4.10.1",
+            "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+            "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
             "dev": true,
             "requires": {
                 "bn.js": "4.11.8",
                 "inherits": "2.0.3",
-                "minimalistic-assert": "1.0.0"
+                "minimalistic-assert": "1.0.1"
             }
         },
         "assert": {
@@ -504,9 +514,9 @@
             "dev": true
         },
         "atob": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz",
-            "integrity": "sha1-GcenYEc3dEaPILLS0DNyrX1Mv10=",
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.0.tgz",
+            "integrity": "sha512-SuiKH8vbsOyCALjA/+EINmt/Kdl+TQPrtFgW7XZZcwtryFu9e5kQoX3bjCW6mIvGH1fbeAZZuvwGR5IlBRznGw==",
             "dev": true
         },
         "babel-code-frame": {
@@ -560,18 +570,58 @@
             "dev": true,
             "requires": {
                 "cache-base": "1.0.1",
-                "class-utils": "0.3.5",
+                "class-utils": "0.3.6",
                 "component-emitter": "1.2.1",
                 "define-property": "1.0.0",
                 "isobject": "3.0.1",
-                "mixin-deep": "1.3.0",
+                "mixin-deep": "1.3.1",
                 "pascalcase": "0.1.1"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+                    "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+                    "dev": true,
+                    "requires": {
+                        "is-descriptor": "1.0.2"
+                    }
+                },
+                "is-accessor-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "6.0.2"
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "6.0.2"
+                    }
+                },
+                "is-descriptor": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+                    "dev": true,
+                    "requires": {
+                        "is-accessor-descriptor": "1.0.0",
+                        "is-data-descriptor": "1.0.0",
+                        "kind-of": "6.0.2"
+                    }
+                }
             }
         },
         "base64-js": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
-            "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==",
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+            "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
             "dev": true
         },
         "beeper": {
@@ -587,9 +637,9 @@
             "dev": true
         },
         "brace-expansion": {
-            "version": "1.1.8",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-            "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
             "dev": true,
             "requires": {
                 "balanced-match": "1.0.0",
@@ -597,22 +647,32 @@
             }
         },
         "braces": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.0.tgz",
-            "integrity": "sha512-P4O8UQRdGiMLWSizsApmXVQDBS6KCt7dSexgLKBmH5Hr1CZq7vsnscFh8oR1sP1ab1Zj0uCHCEzZeV6SfUf3rA==",
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+            "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
             "dev": true,
             "requires": {
                 "arr-flatten": "1.1.0",
                 "array-unique": "0.3.2",
-                "define-property": "1.0.0",
                 "extend-shallow": "2.0.1",
                 "fill-range": "4.0.0",
                 "isobject": "3.0.1",
                 "repeat-element": "1.1.2",
-                "snapdragon": "0.8.1",
+                "snapdragon": "0.8.2",
                 "snapdragon-node": "2.1.1",
                 "split-string": "3.1.0",
-                "to-regex": "3.0.1"
+                "to-regex": "3.0.2"
+            },
+            "dependencies": {
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "requires": {
+                        "is-extendable": "0.1.1"
+                    }
+                }
             }
         },
         "brorand": {
@@ -622,16 +682,17 @@
             "dev": true
         },
         "browser-pack": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.2.tgz",
-            "integrity": "sha1-+GzWzvT1MAyOY+B6TVEvZfv/RTE=",
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz",
+            "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==",
             "dev": true,
             "requires": {
                 "JSONStream": "1.3.2",
-                "combine-source-map": "0.7.2",
+                "combine-source-map": "0.8.0",
                 "defined": "1.0.0",
+                "safe-buffer": "5.1.2",
                 "through2": "2.0.3",
-                "umd": "3.0.1"
+                "umd": "3.0.3"
             }
         },
         "browser-resolve": {
@@ -643,18 +704,24 @@
                 "resolve": "1.1.7"
             }
         },
+        "browser-stdout": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+            "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+            "dev": true
+        },
         "browserify": {
-            "version": "16.1.1",
-            "resolved": "https://registry.npmjs.org/browserify/-/browserify-16.1.1.tgz",
-            "integrity": "sha512-iSH21jK0+IApV8YHOfmGt1qsGd74oflQ1Ko/28JOkWLFNBngAQfKb6WYIJ9CufH8vycqKX1sYU3y7ZrVhwevAg==",
+            "version": "16.2.0",
+            "resolved": "https://registry.npmjs.org/browserify/-/browserify-16.2.0.tgz",
+            "integrity": "sha512-yotdAkp/ZbgDesHQBYU37zjc29JDH4iXT8hjzM1fdUVWogjARX0S1cKeX24Ci6zZ+jG+ADmCTRt6xvtmJnI+BQ==",
             "dev": true,
             "requires": {
                 "JSONStream": "1.3.2",
                 "assert": "1.4.1",
-                "browser-pack": "6.0.2",
+                "browser-pack": "6.1.0",
                 "browser-resolve": "1.11.2",
                 "browserify-zlib": "0.2.0",
-                "buffer": "5.0.8",
+                "buffer": "5.1.0",
                 "cached-path-relative": "1.0.1",
                 "concat-stream": "1.6.2",
                 "console-browserify": "1.1.0",
@@ -670,10 +737,10 @@
                 "htmlescape": "1.1.1",
                 "https-browserify": "1.0.0",
                 "inherits": "2.0.3",
-                "insert-module-globals": "7.0.1",
-                "labeled-stream-splicer": "2.0.0",
+                "insert-module-globals": "7.0.6",
+                "labeled-stream-splicer": "2.0.1",
                 "mkdirp": "0.5.1",
-                "module-deps": "6.0.0",
+                "module-deps": "6.0.2",
                 "os-browserify": "0.3.0",
                 "parents": "1.0.1",
                 "path-browserify": "0.0.0",
@@ -681,119 +748,53 @@
                 "punycode": "1.4.1",
                 "querystring-es3": "0.2.1",
                 "read-only-stream": "2.0.0",
-                "readable-stream": "2.3.3",
+                "readable-stream": "2.3.6",
                 "resolve": "1.1.7",
                 "shasum": "1.0.2",
                 "shell-quote": "1.6.1",
                 "stream-browserify": "2.0.1",
-                "stream-http": "2.7.2",
-                "string_decoder": "1.0.3",
+                "stream-http": "2.8.1",
+                "string_decoder": "1.1.1",
                 "subarg": "1.0.0",
-                "syntax-error": "1.3.0",
+                "syntax-error": "1.4.0",
                 "through2": "2.0.3",
                 "timers-browserify": "1.4.2",
                 "tty-browserify": "0.0.1",
                 "url": "0.11.0",
                 "util": "0.10.3",
-                "vm-browserify": "0.0.4",
+                "vm-browserify": "1.0.1",
                 "xtend": "4.0.1"
-            },
-            "dependencies": {
-                "concat-stream": {
-                    "version": "1.6.2",
-                    "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-                    "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-                    "dev": true,
-                    "requires": {
-                        "buffer-from": "1.0.0",
-                        "inherits": "2.0.3",
-                        "readable-stream": "2.3.3",
-                        "typedarray": "0.0.6"
-                    }
-                },
-                "domain-browser": {
-                    "version": "1.2.0",
-                    "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-                    "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-                    "dev": true
-                },
-                "events": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/events/-/events-2.0.0.tgz",
-                    "integrity": "sha512-r/M5YkNg9zwI8QbSf7tsDWWJvO3PGwZXyG7GpFAxtMASnHL2eblFd7iHiGPtyGKKFPZ59S63NeX10Ws6WqGDcg==",
-                    "dev": true
-                },
-                "module-deps": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.0.0.tgz",
-                    "integrity": "sha512-BKsMhJJENEM4dTgqq2MDTTHXRHcNUFegoAwlG4HO4VMdUyMcJDKgfgI+MOv6tR5Iv8G3MKZFgsSiyP3ZoosRMw==",
-                    "dev": true,
-                    "requires": {
-                        "JSONStream": "1.3.2",
-                        "browser-resolve": "1.11.2",
-                        "cached-path-relative": "1.0.1",
-                        "concat-stream": "1.6.2",
-                        "defined": "1.0.0",
-                        "detective": "5.0.2",
-                        "duplexer2": "0.1.4",
-                        "inherits": "2.0.3",
-                        "parents": "1.0.1",
-                        "readable-stream": "2.3.3",
-                        "resolve": "1.6.0",
-                        "stream-combiner2": "1.1.1",
-                        "subarg": "1.0.0",
-                        "through2": "2.0.3",
-                        "xtend": "4.0.1"
-                    },
-                    "dependencies": {
-                        "resolve": {
-                            "version": "1.6.0",
-                            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.6.0.tgz",
-                            "integrity": "sha512-mw7JQNu5ExIkcw4LPih0owX/TZXjD/ZUF/ZQ/pDnkw3ZKhDcZZw5klmBlj6gVMwjQ3Pz5Jgu7F3d0jcDVuEWdw==",
-                            "dev": true,
-                            "requires": {
-                                "path-parse": "1.0.5"
-                            }
-                        }
-                    }
-                },
-                "tty-browserify": {
-                    "version": "0.0.1",
-                    "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
-                    "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==",
-                    "dev": true
-                }
             }
         },
         "browserify-aes": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz",
-            "integrity": "sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==",
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+            "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
             "dev": true,
             "requires": {
                 "buffer-xor": "1.0.3",
                 "cipher-base": "1.0.4",
-                "create-hash": "1.1.3",
+                "create-hash": "1.2.0",
                 "evp_bytestokey": "1.0.3",
                 "inherits": "2.0.3",
-                "safe-buffer": "5.1.1"
+                "safe-buffer": "5.1.2"
             }
         },
         "browserify-cipher": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
-            "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+            "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
             "dev": true,
             "requires": {
-                "browserify-aes": "1.1.1",
-                "browserify-des": "1.0.0",
+                "browserify-aes": "1.2.0",
+                "browserify-des": "1.0.1",
                 "evp_bytestokey": "1.0.3"
             }
         },
         "browserify-des": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
-            "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=",
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz",
+            "integrity": "sha512-zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw==",
             "dev": true,
             "requires": {
                 "cipher-base": "1.0.4",
@@ -808,7 +809,7 @@
             "dev": true,
             "requires": {
                 "bn.js": "4.11.8",
-                "randombytes": "2.0.5"
+                "randombytes": "2.0.6"
             }
         },
         "browserify-sign": {
@@ -819,11 +820,11 @@
             "requires": {
                 "bn.js": "4.11.8",
                 "browserify-rsa": "4.0.1",
-                "create-hash": "1.1.3",
-                "create-hmac": "1.1.6",
+                "create-hash": "1.2.0",
+                "create-hmac": "1.1.7",
                 "elliptic": "6.4.0",
                 "inherits": "2.0.3",
-                "parse-asn1": "5.1.0"
+                "parse-asn1": "5.1.1"
             }
         },
         "browserify-zlib": {
@@ -836,13 +837,13 @@
             }
         },
         "buffer": {
-            "version": "5.0.8",
-            "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.0.8.tgz",
-            "integrity": "sha512-xXvjQhVNz50v2nPeoOsNqWCLGfiv4ji/gXZM28jnVwdLJxH4mFyqgqCKfaK9zf1KUbG6zTkjLOy7ou+jSMarGA==",
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.1.0.tgz",
+            "integrity": "sha512-YkIRgwsZwJWTnyQrsBTWefizHh+8GYj3kbL1BTiAQ/9pwpino0G7B2gp5tx/FUBqUlvtxV85KNR3mwfAtv15Yw==",
             "dev": true,
             "requires": {
-                "base64-js": "1.2.1",
-                "ieee754": "1.1.8"
+                "base64-js": "1.3.0",
+                "ieee754": "1.1.11"
             }
         },
         "buffer-crc32": {
@@ -920,15 +921,6 @@
             "requires": {
                 "align-text": "0.1.4",
                 "lazy-cache": "1.0.4"
-            },
-            "dependencies": {
-                "lazy-cache": {
-                    "version": "1.0.4",
-                    "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-                    "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-                    "dev": true,
-                    "optional": true
-                }
             }
         },
         "chai": {
@@ -942,44 +934,18 @@
                 "deep-eql": "3.0.1",
                 "get-func-name": "2.0.0",
                 "pathval": "1.1.0",
-                "type-detect": "4.0.5"
+                "type-detect": "4.0.8"
             }
         },
         "chalk": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
-            "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+            "version": "2.4.0",
+            "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
+            "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
             "dev": true,
             "requires": {
                 "ansi-styles": "3.2.1",
                 "escape-string-regexp": "1.0.5",
-                "supports-color": "5.3.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "3.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "1.9.1"
-                    }
-                },
-                "has-flag": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-                    "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "5.3.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
-                    "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "3.0.0"
-                    }
-                }
+                "supports-color": "5.4.0"
             }
         },
         "check-error": {
@@ -995,19 +961,18 @@
             "dev": true,
             "requires": {
                 "inherits": "2.0.3",
-                "safe-buffer": "5.1.1"
+                "safe-buffer": "5.1.2"
             }
         },
         "class-utils": {
-            "version": "0.3.5",
-            "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.5.tgz",
-            "integrity": "sha1-F+eTEDdQ+WJ7IXbqNM/RtWWQPIA=",
+            "version": "0.3.6",
+            "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+            "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
             "dev": true,
             "requires": {
                 "arr-union": "3.1.0",
                 "define-property": "0.2.5",
                 "isobject": "3.0.1",
-                "lazy-cache": "2.0.2",
                 "static-extend": "0.1.2"
             },
             "dependencies": {
@@ -1019,63 +984,6 @@
                     "requires": {
                         "is-descriptor": "0.1.6"
                     }
-                },
-                "is-accessor-descriptor": {
-                    "version": "0.1.6",
-                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-                    "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "3.2.2"
-                    },
-                    "dependencies": {
-                        "kind-of": {
-                            "version": "3.2.2",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                            "dev": true,
-                            "requires": {
-                                "is-buffer": "1.1.6"
-                            }
-                        }
-                    }
-                },
-                "is-data-descriptor": {
-                    "version": "0.1.4",
-                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-                    "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "3.2.2"
-                    },
-                    "dependencies": {
-                        "kind-of": {
-                            "version": "3.2.2",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                            "dev": true,
-                            "requires": {
-                                "is-buffer": "1.1.6"
-                            }
-                        }
-                    }
-                },
-                "is-descriptor": {
-                    "version": "0.1.6",
-                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-                    "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-                    "dev": true,
-                    "requires": {
-                        "is-accessor-descriptor": "0.1.6",
-                        "is-data-descriptor": "0.1.4",
-                        "kind-of": "5.1.0"
-                    }
-                },
-                "kind-of": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-                    "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-                    "dev": true
                 }
             }
         },
@@ -1101,9 +1009,9 @@
             }
         },
         "clone": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz",
-            "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=",
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+            "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
             "dev": true
         },
         "clone-buffer": {
@@ -1119,14 +1027,14 @@
             "dev": true
         },
         "cloneable-readable": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz",
-            "integrity": "sha1-pikNQT8hemEjL5XkWP84QYz7ARc=",
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.2.tgz",
+            "integrity": "sha512-Bq6+4t+lbM8vhTs/Bef5c5AdEMtapp/iFb6+s4/Hh9MVTt8OLKH7ZOOZSCT+Ys7hsHvqv0GuMPJ1lnQJVHvxpg==",
             "dev": true,
             "requires": {
                 "inherits": "2.0.3",
-                "process-nextick-args": "1.0.7",
-                "through2": "2.0.3"
+                "process-nextick-args": "2.0.0",
+                "readable-stream": "2.3.6"
             }
         },
         "collection-visit": {
@@ -1161,9 +1069,9 @@
             "dev": true
         },
         "combine-source-map": {
-            "version": "0.7.2",
-            "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.2.tgz",
-            "integrity": "sha1-CHAxKFazB6h8xKxIbzqaYq7MwJ4=",
+            "version": "0.8.0",
+            "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz",
+            "integrity": "sha1-pY0N8ELBhvz4IqjoAV9UUNLXmos=",
             "dev": true,
             "requires": {
                 "convert-source-map": "1.1.3",
@@ -1199,45 +1107,32 @@
             "dev": true
         },
         "concat-stream": {
-            "version": "1.5.2",
-            "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz",
-            "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=",
+            "version": "1.6.2",
+            "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+            "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
             "dev": true,
             "requires": {
+                "buffer-from": "1.0.0",
                 "inherits": "2.0.3",
-                "readable-stream": "2.0.6",
+                "readable-stream": "2.3.6",
                 "typedarray": "0.0.6"
-            },
-            "dependencies": {
-                "readable-stream": {
-                    "version": "2.0.6",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-                    "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-                    "dev": true,
-                    "requires": {
-                        "core-util-is": "1.0.2",
-                        "inherits": "2.0.3",
-                        "isarray": "1.0.0",
-                        "process-nextick-args": "1.0.7",
-                        "string_decoder": "0.10.31",
-                        "util-deprecate": "1.0.2"
-                    }
-                },
-                "string_decoder": {
-                    "version": "0.10.31",
-                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-                    "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-                    "dev": true
-                }
             }
         },
         "concat-with-sourcemaps": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz",
-            "integrity": "sha1-9Vs74q60dgGxCi1SWcz7cP0vHdY=",
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.5.tgz",
+            "integrity": "sha512-YtnS0VEY+e2Khzsey/6mra9EoM6h/5gxaC0e3mcHpA5yfDxafhygytNmcJWodvUgyXzSiL5MSkPO6bQGgfliHw==",
             "dev": true,
             "requires": {
-                "source-map": "0.5.7"
+                "source-map": "0.6.1"
+            },
+            "dependencies": {
+                "source-map": {
+                    "version": "0.6.1",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+                    "dev": true
+                }
             }
         },
         "console-browserify": {
@@ -1274,9 +1169,9 @@
             "dev": true
         },
         "create-ecdh": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
-            "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=",
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.1.tgz",
+            "integrity": "sha512-iZvCCg8XqHQZ1ioNBTzXS/cQSkqkqcPs8xSX4upNB+DAk9Ht3uzQf2J32uAHNCne8LDmKr29AgZrEs4oIrwLuQ==",
             "dev": true,
             "requires": {
                 "bn.js": "4.11.8",
@@ -1284,29 +1179,30 @@
             }
         },
         "create-hash": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
-            "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=",
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+            "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
             "dev": true,
             "requires": {
                 "cipher-base": "1.0.4",
                 "inherits": "2.0.3",
-                "ripemd160": "2.0.1",
-                "sha.js": "2.4.9"
+                "md5.js": "1.3.4",
+                "ripemd160": "2.0.2",
+                "sha.js": "2.4.11"
             }
         },
         "create-hmac": {
-            "version": "1.1.6",
-            "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz",
-            "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=",
+            "version": "1.1.7",
+            "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+            "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
             "dev": true,
             "requires": {
                 "cipher-base": "1.0.4",
-                "create-hash": "1.1.3",
+                "create-hash": "1.2.0",
                 "inherits": "2.0.3",
-                "ripemd160": "2.0.1",
-                "safe-buffer": "5.1.1",
-                "sha.js": "2.4.9"
+                "ripemd160": "2.0.2",
+                "safe-buffer": "5.1.2",
+                "sha.js": "2.4.11"
             }
         },
         "crypto-browserify": {
@@ -1315,17 +1211,17 @@
             "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
             "dev": true,
             "requires": {
-                "browserify-cipher": "1.0.0",
+                "browserify-cipher": "1.0.1",
                 "browserify-sign": "4.0.4",
-                "create-ecdh": "4.0.0",
-                "create-hash": "1.1.3",
-                "create-hmac": "1.1.6",
-                "diffie-hellman": "5.0.2",
+                "create-ecdh": "4.0.1",
+                "create-hash": "1.2.0",
+                "create-hmac": "1.1.7",
+                "diffie-hellman": "5.0.3",
                 "inherits": "2.0.3",
-                "pbkdf2": "3.0.14",
-                "public-encrypt": "4.0.0",
-                "randombytes": "2.0.5",
-                "randomfill": "1.0.3"
+                "pbkdf2": "3.0.16",
+                "public-encrypt": "4.0.2",
+                "randombytes": "2.0.6",
+                "randomfill": "1.0.4"
             }
         },
         "css": {
@@ -1381,7 +1277,7 @@
             "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
             "dev": true,
             "requires": {
-                "es5-ext": "0.10.37"
+                "es5-ext": "0.10.42"
             }
         },
         "date-now": {
@@ -1406,13 +1302,13 @@
             }
         },
         "debug-fabulous": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.0.0.tgz",
-            "integrity": "sha512-dsd50qQ1atDeurcxL7XOjPp4nZCGZzWIONDujDXzl1atSyC3hMbZD+v6440etw+Vt0Pr8ce4TQzHfX3KZM05Mw==",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz",
+            "integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==",
             "dev": true,
             "requires": {
                 "debug": "3.1.0",
-                "memoizee": "0.4.11",
+                "memoizee": "0.4.12",
                 "object-assign": "4.1.1"
             },
             "dependencies": {
@@ -1446,7 +1342,7 @@
             "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
             "dev": true,
             "requires": {
-                "type-detect": "4.0.5"
+                "type-detect": "4.0.8"
             }
         },
         "deep-is": {
@@ -1461,7 +1357,7 @@
             "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
             "dev": true,
             "requires": {
-                "clone": "1.0.3"
+                "clone": "1.0.4"
             }
         },
         "define-properties": {
@@ -1475,12 +1371,44 @@
             }
         },
         "define-property": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-            "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+            "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
             "dev": true,
             "requires": {
-                "is-descriptor": "1.0.2"
+                "is-descriptor": "1.0.2",
+                "isobject": "3.0.1"
+            },
+            "dependencies": {
+                "is-accessor-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "6.0.2"
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "6.0.2"
+                    }
+                },
+                "is-descriptor": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+                    "dev": true,
+                    "requires": {
+                        "is-accessor-descriptor": "1.0.0",
+                        "is-data-descriptor": "1.0.0",
+                        "kind-of": "6.0.2"
+                    }
+                }
             }
         },
         "defined": {
@@ -1497,7 +1425,7 @@
             "requires": {
                 "globby": "6.1.0",
                 "is-path-cwd": "1.0.0",
-                "is-path-in-cwd": "1.0.0",
+                "is-path-in-cwd": "1.0.1",
                 "p-map": "1.2.0",
                 "pify": "3.0.0",
                 "rimraf": "2.6.2"
@@ -1528,7 +1456,7 @@
             "dev": true,
             "requires": {
                 "inherits": "2.0.3",
-                "minimalistic-assert": "1.0.0"
+                "minimalistic-assert": "1.0.1"
             }
         },
         "detect-file": {
@@ -1544,48 +1472,69 @@
             "dev": true
         },
         "detective": {
-            "version": "5.0.2",
-            "resolved": "https://registry.npmjs.org/detective/-/detective-5.0.2.tgz",
-            "integrity": "sha512-NUsLoezj4wb9o7vpxS9F3L5vcO87ceyRBcl48op06YFNwkyIEY997JpSCA5lDlDuDc6JxOtaL5qfK3muoWxpMA==",
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/detective/-/detective-5.1.0.tgz",
+            "integrity": "sha512-TFHMqfOvxlgrfVzTEkNBSh9SvSNX/HfF4OFI2QFGCyPm02EsyILqnUeb5P6q7JZ3SFNTBL5t2sePRgrN4epUWQ==",
             "dev": true,
             "requires": {
-                "@browserify/acorn5-object-spread": "5.0.1",
-                "acorn": "5.3.0",
-                "defined": "1.0.0"
-            },
-            "dependencies": {
-                "acorn": {
-                    "version": "5.3.0",
-                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz",
-                    "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug==",
-                    "dev": true
-                }
+                "acorn-node": "1.3.0",
+                "defined": "1.0.0",
+                "minimist": "1.2.0"
             }
         },
         "diff": {
-            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz",
-            "integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==",
+            "version": "3.5.0",
+            "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+            "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
             "dev": true
         },
         "diffie-hellman": {
-            "version": "5.0.2",
-            "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz",
-            "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=",
+            "version": "5.0.3",
+            "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+            "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
             "dev": true,
             "requires": {
                 "bn.js": "4.11.8",
                 "miller-rabin": "4.0.1",
-                "randombytes": "2.0.5"
+                "randombytes": "2.0.6"
             }
         },
+        "domain-browser": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+            "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+            "dev": true
+        },
         "duplexer2": {
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
             "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
             "dev": true,
             "requires": {
-                "readable-stream": "2.3.3"
+                "readable-stream": "2.3.6"
+            }
+        },
+        "duplexify": {
+            "version": "3.5.4",
+            "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz",
+            "integrity": "sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==",
+            "dev": true,
+            "requires": {
+                "end-of-stream": "1.4.1",
+                "inherits": "2.0.3",
+                "readable-stream": "2.3.6",
+                "stream-shift": "1.0.0"
+            },
+            "dependencies": {
+                "end-of-stream": {
+                    "version": "1.4.1",
+                    "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
+                    "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+                    "dev": true,
+                    "requires": {
+                        "once": "1.4.0"
+                    }
+                }
             }
         },
         "elliptic": {
@@ -1599,7 +1548,7 @@
                 "hash.js": "1.1.3",
                 "hmac-drbg": "1.0.1",
                 "inherits": "2.0.3",
-                "minimalistic-assert": "1.0.0",
+                "minimalistic-assert": "1.0.1",
                 "minimalistic-crypto-utils": "1.0.1"
             }
         },
@@ -1624,13 +1573,14 @@
             }
         },
         "es5-ext": {
-            "version": "0.10.37",
-            "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.37.tgz",
-            "integrity": "sha1-DudB0Ui4AGm6J9AgOTdWryV978M=",
+            "version": "0.10.42",
+            "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz",
+            "integrity": "sha512-AJxO1rmPe1bDEfSR6TJ/FgMFYuTBhR5R57KW58iCkYACMyFbrkqVyzXSurYoScDGvgyMpk7uRF/lPUPPTmsRSA==",
             "dev": true,
             "requires": {
                 "es6-iterator": "2.0.3",
-                "es6-symbol": "3.1.1"
+                "es6-symbol": "3.1.1",
+                "next-tick": "1.0.0"
             }
         },
         "es6-iterator": {
@@ -1640,7 +1590,7 @@
             "dev": true,
             "requires": {
                 "d": "1.0.0",
-                "es5-ext": "0.10.37",
+                "es5-ext": "0.10.42",
                 "es6-symbol": "3.1.1"
             }
         },
@@ -1657,7 +1607,7 @@
             "dev": true,
             "requires": {
                 "d": "1.0.0",
-                "es5-ext": "0.10.37"
+                "es5-ext": "0.10.42"
             }
         },
         "es6-weak-map": {
@@ -1667,7 +1617,7 @@
             "dev": true,
             "requires": {
                 "d": "1.0.0",
-                "es5-ext": "0.10.37",
+                "es5-ext": "0.10.42",
                 "es6-iterator": "2.0.3",
                 "es6-symbol": "3.1.1"
             }
@@ -1728,9 +1678,15 @@
             "dev": true,
             "requires": {
                 "d": "1.0.0",
-                "es5-ext": "0.10.37"
+                "es5-ext": "0.10.42"
             }
         },
+        "events": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/events/-/events-2.0.0.tgz",
+            "integrity": "sha512-r/M5YkNg9zwI8QbSf7tsDWWJvO3PGwZXyG7GpFAxtMASnHL2eblFd7iHiGPtyGKKFPZ59S63NeX10Ws6WqGDcg==",
+            "dev": true
+        },
         "evp_bytestokey": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
@@ -1738,7 +1694,7 @@
             "dev": true,
             "requires": {
                 "md5.js": "1.3.4",
-                "safe-buffer": "5.1.1"
+                "safe-buffer": "5.1.2"
             }
         },
         "expand-brackets": {
@@ -1751,9 +1707,9 @@
                 "define-property": "0.2.5",
                 "extend-shallow": "2.0.1",
                 "posix-character-classes": "0.1.1",
-                "regex-not": "1.0.0",
-                "snapdragon": "0.8.1",
-                "to-regex": "3.0.1"
+                "regex-not": "1.0.2",
+                "snapdragon": "0.8.2",
+                "to-regex": "3.0.2"
             },
             "dependencies": {
                 "define-property": {
@@ -1765,62 +1721,14 @@
                         "is-descriptor": "0.1.6"
                     }
                 },
-                "is-accessor-descriptor": {
-                    "version": "0.1.6",
-                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-                    "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
                     "dev": true,
                     "requires": {
-                        "kind-of": "3.2.2"
-                    },
-                    "dependencies": {
-                        "kind-of": {
-                            "version": "3.2.2",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                            "dev": true,
-                            "requires": {
-                                "is-buffer": "1.1.6"
-                            }
-                        }
+                        "is-extendable": "0.1.1"
                     }
-                },
-                "is-data-descriptor": {
-                    "version": "0.1.4",
-                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-                    "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "3.2.2"
-                    },
-                    "dependencies": {
-                        "kind-of": {
-                            "version": "3.2.2",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                            "dev": true,
-                            "requires": {
-                                "is-buffer": "1.1.6"
-                            }
-                        }
-                    }
-                },
-                "is-descriptor": {
-                    "version": "0.1.6",
-                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-                    "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-                    "dev": true,
-                    "requires": {
-                        "is-accessor-descriptor": "0.1.6",
-                        "is-data-descriptor": "0.1.4",
-                        "kind-of": "5.1.0"
-                    }
-                },
-                "kind-of": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-                    "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-                    "dev": true
                 }
             }
         },
@@ -1840,18 +1748,30 @@
             "dev": true
         },
         "extend-shallow": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+            "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
             "dev": true,
             "requires": {
-                "is-extendable": "0.1.1"
+                "assign-symbols": "1.0.0",
+                "is-extendable": "1.0.1"
+            },
+            "dependencies": {
+                "is-extendable": {
+                    "version": "1.0.1",
+                    "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+                    "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+                    "dev": true,
+                    "requires": {
+                        "is-plain-object": "2.0.4"
+                    }
+                }
             }
         },
         "extglob": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.3.tgz",
-            "integrity": "sha512-AyptZexgu7qppEPq59DtN/XJGZDrLcVxSHai+4hdgMMS9EpF4GBvygcWWApno8lL9qSjVpYt7Raao28qzJX1ww==",
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+            "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
             "dev": true,
             "requires": {
                 "array-unique": "0.3.2",
@@ -1859,9 +1779,58 @@
                 "expand-brackets": "2.1.4",
                 "extend-shallow": "2.0.1",
                 "fragment-cache": "0.2.1",
-                "regex-not": "1.0.0",
-                "snapdragon": "0.8.1",
-                "to-regex": "3.0.1"
+                "regex-not": "1.0.2",
+                "snapdragon": "0.8.2",
+                "to-regex": "3.0.2"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+                    "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+                    "dev": true,
+                    "requires": {
+                        "is-descriptor": "1.0.2"
+                    }
+                },
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "requires": {
+                        "is-extendable": "0.1.1"
+                    }
+                },
+                "is-accessor-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "6.0.2"
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "6.0.2"
+                    }
+                },
+                "is-descriptor": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+                    "dev": true,
+                    "requires": {
+                        "is-accessor-descriptor": "1.0.0",
+                        "is-data-descriptor": "1.0.0",
+                        "kind-of": "6.0.2"
+                    }
+                }
             }
         },
         "fancy-log": {
@@ -1909,6 +1878,17 @@
                 "is-number": "3.0.0",
                 "repeat-string": "1.6.1",
                 "to-regex-range": "2.1.1"
+            },
+            "dependencies": {
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "requires": {
+                        "is-extendable": "0.1.1"
+                    }
+                }
             }
         },
         "find-index": {
@@ -1925,7 +1905,7 @@
             "requires": {
                 "detect-file": "1.0.0",
                 "is-glob": "3.1.0",
-                "micromatch": "3.1.5",
+                "micromatch": "3.1.10",
                 "resolve-dir": "1.0.1"
             }
         },
@@ -1961,7 +1941,7 @@
             "dev": true,
             "requires": {
                 "inherits": "2.0.3",
-                "readable-stream": "2.3.3"
+                "readable-stream": "2.3.6"
             }
         },
         "for-in": {
@@ -2107,7 +2087,7 @@
                     "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
                     "dev": true,
                     "requires": {
-                        "brace-expansion": "1.1.8"
+                        "brace-expansion": "1.1.11"
                     }
                 },
                 "readable-stream": {
@@ -2165,7 +2145,7 @@
             "dev": true,
             "requires": {
                 "global-prefix": "1.0.2",
-                "is-windows": "1.0.1",
+                "is-windows": "1.0.2",
                 "resolve-dir": "1.0.1"
             }
         },
@@ -2178,7 +2158,7 @@
                 "expand-tilde": "2.0.2",
                 "homedir-polyfill": "1.0.1",
                 "ini": "1.3.5",
-                "is-windows": "1.0.1",
+                "is-windows": "1.0.2",
                 "which": "1.3.0"
             }
         },
@@ -2250,9 +2230,9 @@
             }
         },
         "glogg": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz",
-            "integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=",
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz",
+            "integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==",
             "dev": true,
             "requires": {
                 "sparkles": "1.0.0"
@@ -2264,7 +2244,7 @@
             "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
             "dev": true,
             "requires": {
-                "natives": "1.1.1"
+                "natives": "1.1.3"
             }
         },
         "growl": {
@@ -2337,7 +2317,7 @@
             "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=",
             "dev": true,
             "requires": {
-                "concat-with-sourcemaps": "1.0.4",
+                "concat-with-sourcemaps": "1.0.5",
                 "through2": "2.0.3",
                 "vinyl": "2.1.0"
             }
@@ -2443,7 +2423,7 @@
                 "acorn": "5.5.3",
                 "convert-source-map": "1.5.1",
                 "css": "2.2.1",
-                "debug-fabulous": "1.0.0",
+                "debug-fabulous": "1.1.0",
                 "detect-newline": "2.1.0",
                 "graceful-fs": "4.1.11",
                 "source-map": "0.6.1",
@@ -2472,9 +2452,9 @@
             }
         },
         "gulp-typescript": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-4.0.1.tgz",
-            "integrity": "sha512-BGdaBC1R4SJosXEkkEieeZ21qCZHnfSV78k7zzDljqAxvzDeGRTUqF4geckVclKEeiS3EYOBwNlxoHjJtn20vg==",
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-4.0.2.tgz",
+            "integrity": "sha512-Hhbn5Aa2l3T+tnn0KqsG6RRJmcYEsr3byTL2nBpNBeAK8pqug9Od4AwddU4JEI+hRw7mzZyjRbB8DDWR6paGVA==",
             "dev": true,
             "requires": {
                 "ansi-colors": "1.1.0",
@@ -2497,7 +2477,7 @@
                         "is-negated-glob": "1.0.0",
                         "ordered-read-streams": "1.0.1",
                         "pumpify": "1.4.0",
-                        "readable-stream": "2.3.3",
+                        "readable-stream": "2.3.6",
                         "remove-trailing-separator": "1.1.0",
                         "to-absolute-glob": "2.0.2",
                         "unique-stream": "2.2.1"
@@ -2509,12 +2489,6 @@
                     "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
                     "dev": true
                 },
-                "is-valid-glob": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
-                    "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
-                    "dev": true
-                },
                 "json-stable-stringify": {
                     "version": "1.0.1",
                     "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
@@ -2530,7 +2504,7 @@
                     "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
                     "dev": true,
                     "requires": {
-                        "readable-stream": "2.3.3"
+                        "readable-stream": "2.3.6"
                     }
                 },
                 "source-map": {
@@ -2539,16 +2513,6 @@
                     "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 },
-                "to-absolute-glob": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-                    "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
-                    "dev": true,
-                    "requires": {
-                        "is-absolute": "1.0.0",
-                        "is-negated-glob": "1.0.0"
-                    }
-                },
                 "unique-stream": {
                     "version": "2.2.1",
                     "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz",
@@ -2573,7 +2537,7 @@
                         "lead": "1.0.0",
                         "object.assign": "4.1.0",
                         "pumpify": "1.4.0",
-                        "readable-stream": "2.3.3",
+                        "readable-stream": "2.3.6",
                         "remove-bom-buffer": "3.0.0",
                         "remove-bom-stream": "1.2.0",
                         "resolve-options": "1.1.0",
@@ -2649,7 +2613,7 @@
                     "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
                     "dev": true,
                     "requires": {
-                        "clone": "1.0.3",
+                        "clone": "1.0.4",
                         "clone-stats": "0.0.1",
                         "replace-ext": "0.0.1"
                     }
@@ -2662,7 +2626,7 @@
             "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
             "dev": true,
             "requires": {
-                "glogg": "1.0.0"
+                "glogg": "1.0.1"
             }
         },
         "handlebars": {
@@ -2713,9 +2677,9 @@
             "dev": true
         },
         "has-flag": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-            "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+            "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
             "dev": true
         },
         "has-gulplog": {
@@ -2766,12 +2730,13 @@
             }
         },
         "hash-base": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
-            "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=",
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+            "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
             "dev": true,
             "requires": {
-                "inherits": "2.0.3"
+                "inherits": "2.0.3",
+                "safe-buffer": "5.1.2"
             }
         },
         "hash.js": {
@@ -2781,7 +2746,7 @@
             "dev": true,
             "requires": {
                 "inherits": "2.0.3",
-                "minimalistic-assert": "1.0.0"
+                "minimalistic-assert": "1.0.1"
             }
         },
         "he": {
@@ -2797,7 +2762,7 @@
             "dev": true,
             "requires": {
                 "hash.js": "1.1.3",
-                "minimalistic-assert": "1.0.0",
+                "minimalistic-assert": "1.0.1",
                 "minimalistic-crypto-utils": "1.0.1"
             }
         },
@@ -2823,15 +2788,9 @@
             "dev": true
         },
         "ieee754": {
-            "version": "1.1.8",
-            "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
-            "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
-            "dev": true
-        },
-        "indexof": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-            "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.11.tgz",
+            "integrity": "sha512-VhDzCKN7K8ufStx/CLj5/PDTMgph+qwN5Pkd5i0sGnVwk56zJ0lkT8Qzi1xqWLS0Wp29DgDtNeS7v8/wMoZeHg==",
             "dev": true
         },
         "inflight": {
@@ -2866,16 +2825,17 @@
             }
         },
         "insert-module-globals": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.1.tgz",
-            "integrity": "sha1-wDv04BywhtW15azorQr+eInWOMM=",
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.6.tgz",
+            "integrity": "sha512-R3sidKJr3SsggqQQ5cEwQb3pWG8RNx0UnpyeiOSR6jorRIeAOzH2gkTWnNdMnyRiVbjrG047K7UCtlMkQ1Mo9w==",
             "dev": true,
             "requires": {
                 "JSONStream": "1.3.2",
-                "combine-source-map": "0.7.2",
-                "concat-stream": "1.5.2",
+                "combine-source-map": "0.8.0",
+                "concat-stream": "1.6.2",
                 "is-buffer": "1.1.6",
                 "lexical-scope": "1.2.0",
+                "path-is-absolute": "1.0.1",
                 "process": "0.11.10",
                 "through2": "2.0.3",
                 "xtend": "4.0.1"
@@ -2894,16 +2854,27 @@
             "dev": true,
             "requires": {
                 "is-relative": "1.0.0",
-                "is-windows": "1.0.1"
+                "is-windows": "1.0.2"
             }
         },
         "is-accessor-descriptor": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-            "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+            "version": "0.1.6",
+            "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+            "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
             "dev": true,
             "requires": {
-                "kind-of": "6.0.2"
+                "kind-of": "3.2.2"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "3.2.2",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                    "dev": true,
+                    "requires": {
+                        "is-buffer": "1.1.6"
+                    }
+                }
             }
         },
         "is-buffer": {
@@ -2913,23 +2884,42 @@
             "dev": true
         },
         "is-data-descriptor": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-            "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+            "version": "0.1.4",
+            "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+            "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
             "dev": true,
             "requires": {
-                "kind-of": "6.0.2"
+                "kind-of": "3.2.2"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "3.2.2",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                    "dev": true,
+                    "requires": {
+                        "is-buffer": "1.1.6"
+                    }
+                }
             }
         },
         "is-descriptor": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-            "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+            "version": "0.1.6",
+            "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+            "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
             "dev": true,
             "requires": {
-                "is-accessor-descriptor": "1.0.0",
-                "is-data-descriptor": "1.0.0",
-                "kind-of": "6.0.2"
+                "is-accessor-descriptor": "0.1.6",
+                "is-data-descriptor": "0.1.4",
+                "kind-of": "5.1.0"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "5.1.0",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+                    "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+                    "dev": true
+                }
             }
         },
         "is-extendable": {
@@ -2980,12 +2970,20 @@
             }
         },
         "is-odd": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-1.0.0.tgz",
-            "integrity": "sha1-O4qTLrAos3dcObsJ6RdnrM22kIg=",
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz",
+            "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
             "dev": true,
             "requires": {
-                "is-number": "3.0.0"
+                "is-number": "4.0.0"
+            },
+            "dependencies": {
+                "is-number": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+                    "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+                    "dev": true
+                }
             }
         },
         "is-path-cwd": {
@@ -2995,9 +2993,9 @@
             "dev": true
         },
         "is-path-in-cwd": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
-            "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+            "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
             "dev": true,
             "requires": {
                 "is-path-inside": "1.0.1"
@@ -3051,10 +3049,16 @@
             "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
             "dev": true
         },
+        "is-valid-glob": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
+            "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
+            "dev": true
+        },
         "is-windows": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz",
-            "integrity": "sha1-MQ23D3QtJZoWo2kgK1GvhCMzENk=",
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+            "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
             "dev": true
         },
         "isarray": {
@@ -3087,7 +3091,7 @@
                 "esprima": "2.7.3",
                 "glob": "5.0.15",
                 "handlebars": "4.0.11",
-                "js-yaml": "3.10.0",
+                "js-yaml": "3.11.0",
                 "mkdirp": "0.5.1",
                 "nopt": "3.0.6",
                 "once": "1.4.0",
@@ -3128,9 +3132,9 @@
             }
         },
         "jake": {
-            "version": "8.0.15",
-            "resolved": "https://registry.npmjs.org/jake/-/jake-8.0.15.tgz",
-            "integrity": "sha1-8Np9WOeQrBqPhubuDxk+XZIw6rs=",
+            "version": "8.0.16",
+            "resolved": "https://registry.npmjs.org/jake/-/jake-8.0.16.tgz",
+            "integrity": "sha512-qUTOVCKFkiz3tHgV1WMy7HTxDZgo+sO4X9GxFLAU+Mks4WsDGe9+ONHK6tPsSp8I3x6sPl0TwGbXHwTOhTyzog==",
             "dev": true,
             "requires": {
                 "async": "0.9.2",
@@ -3178,12 +3182,12 @@
             "dev": true
         },
         "js-yaml": {
-            "version": "3.10.0",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
-            "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
+            "version": "3.11.0",
+            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz",
+            "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
             "dev": true,
             "requires": {
-                "argparse": "1.0.9",
+                "argparse": "1.0.10",
                 "esprima": "4.0.0"
             },
             "dependencies": {
@@ -3229,32 +3233,30 @@
             "dev": true
         },
         "labeled-stream-splicer": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz",
-            "integrity": "sha1-pS4dE4AkwAuGscDJH2d5GLiuClk=",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz",
+            "integrity": "sha512-MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg==",
             "dev": true,
             "requires": {
                 "inherits": "2.0.3",
-                "isarray": "0.0.1",
+                "isarray": "2.0.4",
                 "stream-splicer": "2.0.0"
             },
             "dependencies": {
                 "isarray": {
-                    "version": "0.0.1",
-                    "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-                    "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+                    "version": "2.0.4",
+                    "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.4.tgz",
+                    "integrity": "sha512-GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA==",
                     "dev": true
                 }
             }
         },
         "lazy-cache": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz",
-            "integrity": "sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=",
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+            "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
             "dev": true,
-            "requires": {
-                "set-getter": "0.1.0"
-            }
+            "optional": true
         },
         "lazystream": {
             "version": "1.0.0",
@@ -3262,7 +3264,7 @@
             "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
             "dev": true,
             "requires": {
-                "readable-stream": "2.3.3"
+                "readable-stream": "2.3.6"
             }
         },
         "lead": {
@@ -3458,33 +3460,16 @@
             "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
             "dev": true,
             "requires": {
-                "es5-ext": "0.10.37"
+                "es5-ext": "0.10.42"
             }
         },
-        "make-error": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.2.tgz",
-            "integrity": "sha512-l9ra35l5VWLF24y75Tg8XgfGLX0ueRhph118WKM6H5denx4bB5QF59+4UAm9oJ2qsPQZas/CQUDdtDdfvYHBdQ==",
-            "dev": true
-        },
         "make-iterator": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.0.tgz",
-            "integrity": "sha1-V7713IXSOSO6I3ZzJNjo+PPZaUs=",
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
+            "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
             "dev": true,
             "requires": {
-                "kind-of": "3.2.2"
-            },
-            "dependencies": {
-                "kind-of": {
-                    "version": "3.2.2",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                    "dev": true,
-                    "requires": {
-                        "is-buffer": "1.1.6"
-                    }
-                }
+                "kind-of": "6.0.2"
             }
         },
         "map-cache": {
@@ -3510,34 +3495,22 @@
             "requires": {
                 "hash-base": "3.0.4",
                 "inherits": "2.0.3"
-            },
-            "dependencies": {
-                "hash-base": {
-                    "version": "3.0.4",
-                    "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-                    "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-                    "dev": true,
-                    "requires": {
-                        "inherits": "2.0.3",
-                        "safe-buffer": "5.1.1"
-                    }
-                }
             }
         },
         "memoizee": {
-            "version": "0.4.11",
-            "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.11.tgz",
-            "integrity": "sha1-vemBdmPJ5A/bKk6hw2cpYIeujI8=",
+            "version": "0.4.12",
+            "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.12.tgz",
+            "integrity": "sha512-sprBu6nwxBWBvBOh5v2jcsGqiGLlL2xr2dLub3vR8dnE8YB17omwtm/0NSHl8jjNbcsJd5GMWJAnTSVe/O0Wfg==",
             "dev": true,
             "requires": {
                 "d": "1.0.0",
-                "es5-ext": "0.10.37",
+                "es5-ext": "0.10.42",
                 "es6-weak-map": "2.0.2",
                 "event-emitter": "0.3.5",
                 "is-promise": "2.1.0",
                 "lru-queue": "0.1.0",
                 "next-tick": "1.0.0",
-                "timers-ext": "0.1.2"
+                "timers-ext": "0.1.5"
             }
         },
         "merge2": {
@@ -3547,24 +3520,24 @@
             "dev": true
         },
         "micromatch": {
-            "version": "3.1.5",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.5.tgz",
-            "integrity": "sha512-ykttrLPQrz1PUJcXjwsTUjGoPJ64StIGNE2lGVD1c9CuguJ+L7/navsE8IcDNndOoCMvYV0qc/exfVbMHkUhvA==",
+            "version": "3.1.10",
+            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+            "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
             "dev": true,
             "requires": {
                 "arr-diff": "4.0.0",
                 "array-unique": "0.3.2",
-                "braces": "2.3.0",
-                "define-property": "1.0.0",
-                "extend-shallow": "2.0.1",
-                "extglob": "2.0.3",
+                "braces": "2.3.2",
+                "define-property": "2.0.2",
+                "extend-shallow": "3.0.2",
+                "extglob": "2.0.4",
                 "fragment-cache": "0.2.1",
                 "kind-of": "6.0.2",
-                "nanomatch": "1.2.7",
+                "nanomatch": "1.2.9",
                 "object.pick": "1.3.0",
-                "regex-not": "1.0.0",
-                "snapdragon": "0.8.1",
-                "to-regex": "3.0.1"
+                "regex-not": "1.0.2",
+                "snapdragon": "0.8.2",
+                "to-regex": "3.0.2"
             }
         },
         "miller-rabin": {
@@ -3578,9 +3551,9 @@
             }
         },
         "minimalistic-assert": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
-            "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M=",
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+            "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
             "dev": true
         },
         "minimalistic-crypto-utils": {
@@ -3595,7 +3568,7 @@
             "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
             "dev": true,
             "requires": {
-                "brace-expansion": "1.1.8"
+                "brace-expansion": "1.1.11"
             }
         },
         "minimist": {
@@ -3605,9 +3578,9 @@
             "dev": true
         },
         "mixin-deep": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.0.tgz",
-            "integrity": "sha512-dgaCvoh6i1nosAUBKb0l0pfJ78K8+S9fluyIR2YvAeUD/QuMahnFnF3xYty5eYXMjhGSsB0DsW6A0uAZyetoAg==",
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
+            "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
             "dev": true,
             "requires": {
                 "for-in": "1.0.2",
@@ -3643,9 +3616,9 @@
             }
         },
         "mocha": {
-            "version": "5.0.4",
-            "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.0.4.tgz",
-            "integrity": "sha512-nMOpAPFosU1B4Ix1jdhx5e3q7XO55ic5a8cgYvW27CequcEY+BabS0kUVL1Cw1V5PuVHZWeNRWFLmEPexo79VA==",
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.1.1.tgz",
+            "integrity": "sha512-kKKs/H1KrMMQIEsWNxGmb4/BGsmj0dkeyotEvbrAuQ01FcWRLssUNXCEUZk6SZtyJBi6EE7SL0zDDtItw1rGhw==",
             "dev": true,
             "requires": {
                 "browser-stdout": "1.3.1",
@@ -3656,16 +3629,11 @@
                 "glob": "7.1.2",
                 "growl": "1.10.3",
                 "he": "1.1.1",
+                "minimatch": "3.0.4",
                 "mkdirp": "0.5.1",
                 "supports-color": "4.4.0"
             },
             "dependencies": {
-                "browser-stdout": {
-                    "version": "1.3.1",
-                    "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-                    "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-                    "dev": true
-                },
                 "debug": {
                     "version": "3.1.0",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
@@ -3675,10 +3643,10 @@
                         "ms": "2.0.0"
                     }
                 },
-                "diff": {
-                    "version": "3.5.0",
-                    "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-                    "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+                "has-flag": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+                    "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
                     "dev": true
                 },
                 "supports-color": {
@@ -3698,6 +3666,40 @@
             "integrity": "sha1-zK/w4ckc9Vf+d+B535lUuRt0d1Y=",
             "dev": true
         },
+        "module-deps": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.0.2.tgz",
+            "integrity": "sha512-KWBI3009iRnHjRlxRhe8nJ6kdeBTg4sMi5N6AZgg5f1/v5S7EBCRBOY854I4P5Anl4kx6AJH+4bBBC2Gi3nkvg==",
+            "dev": true,
+            "requires": {
+                "JSONStream": "1.3.2",
+                "browser-resolve": "1.11.2",
+                "cached-path-relative": "1.0.1",
+                "concat-stream": "1.6.2",
+                "defined": "1.0.0",
+                "detective": "5.1.0",
+                "duplexer2": "0.1.4",
+                "inherits": "2.0.3",
+                "parents": "1.0.1",
+                "readable-stream": "2.3.6",
+                "resolve": "1.7.1",
+                "stream-combiner2": "1.1.1",
+                "subarg": "1.0.0",
+                "through2": "2.0.3",
+                "xtend": "4.0.1"
+            },
+            "dependencies": {
+                "resolve": {
+                    "version": "1.7.1",
+                    "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz",
+                    "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==",
+                    "dev": true,
+                    "requires": {
+                        "path-parse": "1.0.5"
+                    }
+                }
+            }
+        },
         "ms": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -3749,36 +3751,29 @@
             }
         },
         "nanomatch": {
-            "version": "1.2.7",
-            "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.7.tgz",
-            "integrity": "sha512-/5ldsnyurvEw7wNpxLFgjVvBLMta43niEYOy0CJ4ntcYSbx6bugRUTQeFb4BR/WanEL1o3aQgHuVLHQaB6tOqg==",
+            "version": "1.2.9",
+            "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz",
+            "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==",
             "dev": true,
             "requires": {
                 "arr-diff": "4.0.0",
                 "array-unique": "0.3.2",
-                "define-property": "1.0.0",
-                "extend-shallow": "2.0.1",
+                "define-property": "2.0.2",
+                "extend-shallow": "3.0.2",
                 "fragment-cache": "0.2.1",
-                "is-odd": "1.0.0",
-                "kind-of": "5.1.0",
+                "is-odd": "2.0.0",
+                "is-windows": "1.0.2",
+                "kind-of": "6.0.2",
                 "object.pick": "1.3.0",
-                "regex-not": "1.0.0",
-                "snapdragon": "0.8.1",
-                "to-regex": "3.0.1"
-            },
-            "dependencies": {
-                "kind-of": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-                    "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-                    "dev": true
-                }
+                "regex-not": "1.0.2",
+                "snapdragon": "0.8.2",
+                "to-regex": "3.0.2"
             }
         },
         "natives": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.1.tgz",
-            "integrity": "sha512-8eRaxn8u/4wN8tGkhlc2cgwwvOLMLUMUn4IYTexMgWd+LyUDfeXVkk2ygQR0hvIHbJQXgHujia3ieUUDwNGkEA==",
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.3.tgz",
+            "integrity": "sha512-BZGSYV4YOLxzoTK73l0/s/0sH9l8SHs2ocReMH1f8JYSh5FUWu4ZrKCpJdRkWXV6HFR/pZDz7bwWOVAY07q77g==",
             "dev": true
         },
         "next-tick": {
@@ -3840,43 +3835,6 @@
                         "is-descriptor": "0.1.6"
                     }
                 },
-                "is-accessor-descriptor": {
-                    "version": "0.1.6",
-                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-                    "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "3.2.2"
-                    }
-                },
-                "is-data-descriptor": {
-                    "version": "0.1.4",
-                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-                    "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "3.2.2"
-                    }
-                },
-                "is-descriptor": {
-                    "version": "0.1.6",
-                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-                    "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-                    "dev": true,
-                    "requires": {
-                        "is-accessor-descriptor": "0.1.6",
-                        "is-data-descriptor": "0.1.4",
-                        "kind-of": "5.1.0"
-                    },
-                    "dependencies": {
-                        "kind-of": {
-                            "version": "5.1.0",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-                            "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-                            "dev": true
-                        }
-                    }
-                },
                 "kind-of": {
                     "version": "3.2.2",
                     "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -3934,7 +3892,7 @@
             "dev": true,
             "requires": {
                 "for-own": "1.0.0",
-                "make-iterator": "1.0.0"
+                "make-iterator": "1.0.1"
             }
         },
         "object.pick": {
@@ -4001,7 +3959,7 @@
             "requires": {
                 "end-of-stream": "0.1.5",
                 "sequencify": "0.0.7",
-                "stream-consume": "0.1.0"
+                "stream-consume": "0.1.1"
             }
         },
         "ordered-read-streams": {
@@ -4044,16 +4002,16 @@
             }
         },
         "parse-asn1": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz",
-            "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=",
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
+            "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
             "dev": true,
             "requires": {
-                "asn1.js": "4.9.2",
-                "browserify-aes": "1.1.1",
-                "create-hash": "1.1.3",
+                "asn1.js": "4.10.1",
+                "browserify-aes": "1.2.0",
+                "create-hash": "1.2.0",
                 "evp_bytestokey": "1.0.3",
-                "pbkdf2": "3.0.14"
+                "pbkdf2": "3.0.16"
             }
         },
         "parse-filepath": {
@@ -4137,16 +4095,16 @@
             "dev": true
         },
         "pbkdf2": {
-            "version": "3.0.14",
-            "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz",
-            "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==",
+            "version": "3.0.16",
+            "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz",
+            "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
             "dev": true,
             "requires": {
-                "create-hash": "1.1.3",
-                "create-hmac": "1.1.6",
-                "ripemd160": "2.0.1",
-                "safe-buffer": "5.1.1",
-                "sha.js": "2.4.9"
+                "create-hash": "1.2.0",
+                "create-hmac": "1.1.7",
+                "ripemd160": "2.0.2",
+                "safe-buffer": "5.1.2",
+                "sha.js": "2.4.11"
             }
         },
         "pify": {
@@ -4247,22 +4205,22 @@
             "dev": true
         },
         "process-nextick-args": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-            "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+            "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
             "dev": true
         },
         "public-encrypt": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
-            "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=",
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz",
+            "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
             "dev": true,
             "requires": {
                 "bn.js": "4.11.8",
                 "browserify-rsa": "4.0.1",
-                "create-hash": "1.1.3",
-                "parse-asn1": "5.1.0",
-                "randombytes": "2.0.5"
+                "create-hash": "1.2.0",
+                "parse-asn1": "5.1.1",
+                "randombytes": "2.0.6"
             }
         },
         "pump": {
@@ -4295,29 +4253,6 @@
                 "duplexify": "3.5.4",
                 "inherits": "2.0.3",
                 "pump": "2.0.1"
-            },
-            "dependencies": {
-                "duplexify": {
-                    "version": "3.5.4",
-                    "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz",
-                    "integrity": "sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==",
-                    "dev": true,
-                    "requires": {
-                        "end-of-stream": "1.4.1",
-                        "inherits": "2.0.3",
-                        "readable-stream": "2.3.3",
-                        "stream-shift": "1.0.0"
-                    }
-                },
-                "end-of-stream": {
-                    "version": "1.4.1",
-                    "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-                    "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-                    "dev": true,
-                    "requires": {
-                        "once": "1.4.0"
-                    }
-                }
             }
         },
         "punycode": {
@@ -4345,22 +4280,22 @@
             "dev": true
         },
         "randombytes": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz",
-            "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==",
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
+            "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
             "dev": true,
             "requires": {
-                "safe-buffer": "5.1.1"
+                "safe-buffer": "5.1.2"
             }
         },
         "randomfill": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.3.tgz",
-            "integrity": "sha512-YL6GrhrWoic0Eq8rXVbMptH7dAxCs0J+mh5Y0euNekPPYaxEmdVGim6GdoxoRzKW2yJoU8tueifS7mYxvcFDEQ==",
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+            "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
             "dev": true,
             "requires": {
-                "randombytes": "2.0.5",
-                "safe-buffer": "5.1.1"
+                "randombytes": "2.0.6",
+                "safe-buffer": "5.1.2"
             }
         },
         "read-only-stream": {
@@ -4369,21 +4304,21 @@
             "integrity": "sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=",
             "dev": true,
             "requires": {
-                "readable-stream": "2.3.3"
+                "readable-stream": "2.3.6"
             }
         },
         "readable-stream": {
-            "version": "2.3.3",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-            "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+            "version": "2.3.6",
+            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+            "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
             "dev": true,
             "requires": {
                 "core-util-is": "1.0.2",
                 "inherits": "2.0.3",
                 "isarray": "1.0.0",
-                "process-nextick-args": "1.0.7",
-                "safe-buffer": "5.1.1",
-                "string_decoder": "1.0.3",
+                "process-nextick-args": "2.0.0",
+                "safe-buffer": "5.1.2",
+                "string_decoder": "1.1.1",
                 "util-deprecate": "1.0.2"
             }
         },
@@ -4397,12 +4332,13 @@
             }
         },
         "regex-not": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.0.tgz",
-            "integrity": "sha1-Qvg+OXcWIt+CawKvF2Ul1qXxV/k=",
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+            "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
             "dev": true,
             "requires": {
-                "extend-shallow": "2.0.1"
+                "extend-shallow": "3.0.2",
+                "safe-regex": "1.1.0"
             }
         },
         "remove-bom-buffer": {
@@ -4422,7 +4358,7 @@
             "dev": true,
             "requires": {
                 "remove-bom-buffer": "3.0.0",
-                "safe-buffer": "5.1.1",
+                "safe-buffer": "5.1.2",
                 "through2": "2.0.3"
             }
         },
@@ -4481,6 +4417,12 @@
             "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
             "dev": true
         },
+        "ret": {
+            "version": "0.1.15",
+            "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+            "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+            "dev": true
+        },
         "right-align": {
             "version": "0.1.3",
             "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
@@ -4501,12 +4443,12 @@
             }
         },
         "ripemd160": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz",
-            "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=",
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+            "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
             "dev": true,
             "requires": {
-                "hash-base": "2.0.2",
+                "hash-base": "3.0.4",
                 "inherits": "2.0.3"
             }
         },
@@ -4549,11 +4491,20 @@
             }
         },
         "safe-buffer": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-            "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
             "dev": true
         },
+        "safe-regex": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+            "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+            "dev": true,
+            "requires": {
+                "ret": "0.1.15"
+            }
+        },
         "sander": {
             "version": "0.5.1",
             "resolved": "https://registry.npmjs.org/sander/-/sander-0.5.1.tgz",
@@ -4592,15 +4543,6 @@
             "integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=",
             "dev": true
         },
-        "set-getter": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz",
-            "integrity": "sha1-12nBgsnVpR9AkUXy+6guXoboA3Y=",
-            "dev": true,
-            "requires": {
-                "to-object-path": "0.3.0"
-            }
-        },
         "set-value": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
@@ -4611,16 +4553,27 @@
                 "is-extendable": "0.1.1",
                 "is-plain-object": "2.0.4",
                 "split-string": "3.1.0"
+            },
+            "dependencies": {
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "requires": {
+                        "is-extendable": "0.1.1"
+                    }
+                }
             }
         },
         "sha.js": {
-            "version": "2.4.9",
-            "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.9.tgz",
-            "integrity": "sha512-G8zektVqbiPHrylgew9Zg1VRB1L/DtXNUVAM6q4QLy8NE3qtHlFXTf8VLL4k1Yl6c7NMjtZUTdXV+X44nFaT6A==",
+            "version": "2.4.11",
+            "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+            "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
             "dev": true,
             "requires": {
                 "inherits": "2.0.3",
-                "safe-buffer": "5.1.1"
+                "safe-buffer": "5.1.2"
             }
         },
         "shasum": {
@@ -4630,7 +4583,7 @@
             "dev": true,
             "requires": {
                 "json-stable-stringify": "0.0.1",
-                "sha.js": "2.4.9"
+                "sha.js": "2.4.11"
             }
         },
         "shell-quote": {
@@ -4652,9 +4605,9 @@
             "dev": true
         },
         "snapdragon": {
-            "version": "0.8.1",
-            "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.1.tgz",
-            "integrity": "sha1-4StUh/re0+PeoKyR6UAL91tAE3A=",
+            "version": "0.8.2",
+            "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+            "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
             "dev": true,
             "requires": {
                 "base": "0.11.2",
@@ -4664,7 +4617,7 @@
                 "map-cache": "0.2.2",
                 "source-map": "0.5.7",
                 "source-map-resolve": "0.5.1",
-                "use": "2.0.2"
+                "use": "3.1.0"
             },
             "dependencies": {
                 "define-property": {
@@ -4676,62 +4629,14 @@
                         "is-descriptor": "0.1.6"
                     }
                 },
-                "is-accessor-descriptor": {
-                    "version": "0.1.6",
-                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-                    "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
                     "dev": true,
                     "requires": {
-                        "kind-of": "3.2.2"
-                    },
-                    "dependencies": {
-                        "kind-of": {
-                            "version": "3.2.2",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                            "dev": true,
-                            "requires": {
-                                "is-buffer": "1.1.6"
-                            }
-                        }
+                        "is-extendable": "0.1.1"
                     }
-                },
-                "is-data-descriptor": {
-                    "version": "0.1.4",
-                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-                    "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "3.2.2"
-                    },
-                    "dependencies": {
-                        "kind-of": {
-                            "version": "3.2.2",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                            "dev": true,
-                            "requires": {
-                                "is-buffer": "1.1.6"
-                            }
-                        }
-                    }
-                },
-                "is-descriptor": {
-                    "version": "0.1.6",
-                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-                    "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-                    "dev": true,
-                    "requires": {
-                        "is-accessor-descriptor": "0.1.6",
-                        "is-data-descriptor": "0.1.4",
-                        "kind-of": "5.1.0"
-                    }
-                },
-                "kind-of": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-                    "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-                    "dev": true
                 }
             }
         },
@@ -4744,6 +4649,46 @@
                 "define-property": "1.0.0",
                 "isobject": "3.0.1",
                 "snapdragon-util": "3.0.1"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+                    "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+                    "dev": true,
+                    "requires": {
+                        "is-descriptor": "1.0.2"
+                    }
+                },
+                "is-accessor-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "6.0.2"
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "6.0.2"
+                    }
+                },
+                "is-descriptor": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+                    "dev": true,
+                    "requires": {
+                        "is-accessor-descriptor": "1.0.0",
+                        "is-data-descriptor": "1.0.0",
+                        "kind-of": "6.0.2"
+                    }
+                }
             }
         },
         "snapdragon-util": {
@@ -4775,7 +4720,7 @@
                 "buffer-crc32": "0.2.13",
                 "minimist": "1.2.0",
                 "sander": "0.5.1",
-                "sourcemap-codec": "1.3.1"
+                "sourcemap-codec": "1.4.1"
             }
         },
         "source-map": {
@@ -4790,7 +4735,7 @@
             "integrity": "sha512-0KW2wvzfxm8NCTb30z0LMNyPqWCdDGE2viwzUaucqJdkTRXtZiSY3I+2A6nVAjmdOy0I4gU8DwnVVGsk9jvP2A==",
             "dev": true,
             "requires": {
-                "atob": "2.0.3",
+                "atob": "2.1.0",
                 "decode-uri-component": "0.2.0",
                 "resolve-url": "0.2.1",
                 "source-map-url": "0.4.0",
@@ -4798,11 +4743,12 @@
             }
         },
         "source-map-support": {
-            "version": "0.5.4",
-            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.4.tgz",
-            "integrity": "sha512-PETSPG6BjY1AHs2t64vS2aqAgu6dMIMXJULWFBGbh2Gr8nVLbCFDo6i/RMMvviIQ2h1Z8+5gQhVKSn2je9nmdg==",
+            "version": "0.5.5",
+            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.5.tgz",
+            "integrity": "sha512-mR7/Nd5l1z6g99010shcXJiNEaf3fEtmLhRB/sBcQVJGodcHCULPp2y4Sfa43Kv2zq7T+Izmfp/WHCR6dYkQCA==",
             "dev": true,
             "requires": {
+                "buffer-from": "1.0.0",
                 "source-map": "0.6.1"
             },
             "dependencies": {
@@ -4821,13 +4767,10 @@
             "dev": true
         },
         "sourcemap-codec": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.3.1.tgz",
-            "integrity": "sha1-mtb5vb1pGTEBbjCTnbyGhnMyMUY=",
-            "dev": true,
-            "requires": {
-                "vlq": "0.2.3"
-            }
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz",
+            "integrity": "sha512-hX1eNBNuilj8yfFnECh0DzLgwKpBLMIvmhgEhixXNui8lMLBInTI8Kyxt++RwJnMNu7cAUo635L2+N1TxMJCzA==",
+            "dev": true
         },
         "sparkles": {
             "version": "1.0.0",
@@ -4842,27 +4785,6 @@
             "dev": true,
             "requires": {
                 "extend-shallow": "3.0.2"
-            },
-            "dependencies": {
-                "extend-shallow": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-                    "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-                    "dev": true,
-                    "requires": {
-                        "assign-symbols": "1.0.0",
-                        "is-extendable": "1.0.1"
-                    }
-                },
-                "is-extendable": {
-                    "version": "1.0.1",
-                    "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-                    "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-                    "dev": true,
-                    "requires": {
-                        "is-plain-object": "2.0.4"
-                    }
-                }
             }
         },
         "sprintf-js": {
@@ -4889,63 +4811,6 @@
                     "requires": {
                         "is-descriptor": "0.1.6"
                     }
-                },
-                "is-accessor-descriptor": {
-                    "version": "0.1.6",
-                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-                    "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "3.2.2"
-                    },
-                    "dependencies": {
-                        "kind-of": {
-                            "version": "3.2.2",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                            "dev": true,
-                            "requires": {
-                                "is-buffer": "1.1.6"
-                            }
-                        }
-                    }
-                },
-                "is-data-descriptor": {
-                    "version": "0.1.4",
-                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-                    "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "3.2.2"
-                    },
-                    "dependencies": {
-                        "kind-of": {
-                            "version": "3.2.2",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                            "dev": true,
-                            "requires": {
-                                "is-buffer": "1.1.6"
-                            }
-                        }
-                    }
-                },
-                "is-descriptor": {
-                    "version": "0.1.6",
-                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-                    "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-                    "dev": true,
-                    "requires": {
-                        "is-accessor-descriptor": "0.1.6",
-                        "is-data-descriptor": "0.1.4",
-                        "kind-of": "5.1.0"
-                    }
-                },
-                "kind-of": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-                    "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-                    "dev": true
                 }
             }
         },
@@ -4956,7 +4821,7 @@
             "dev": true,
             "requires": {
                 "inherits": "2.0.3",
-                "readable-stream": "2.3.3"
+                "readable-stream": "2.3.6"
             }
         },
         "stream-combiner2": {
@@ -4966,24 +4831,24 @@
             "dev": true,
             "requires": {
                 "duplexer2": "0.1.4",
-                "readable-stream": "2.3.3"
+                "readable-stream": "2.3.6"
             }
         },
         "stream-consume": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz",
-            "integrity": "sha1-pB6tGm1ggc63n2WwYZAbbY89HQ8=",
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz",
+            "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==",
             "dev": true
         },
         "stream-http": {
-            "version": "2.7.2",
-            "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz",
-            "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==",
+            "version": "2.8.1",
+            "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.1.tgz",
+            "integrity": "sha512-cQ0jo17BLca2r0GfRdZKYAGLU6JRoIWxqSOakUMuKOT6MOK7AAlE856L33QuDmAy/eeOrhLee3dZKX0Uadu93A==",
             "dev": true,
             "requires": {
                 "builtin-status-codes": "3.0.0",
                 "inherits": "2.0.3",
-                "readable-stream": "2.3.3",
+                "readable-stream": "2.3.6",
                 "to-arraybuffer": "1.0.1",
                 "xtend": "4.0.1"
             }
@@ -5001,7 +4866,7 @@
             "dev": true,
             "requires": {
                 "inherits": "2.0.3",
-                "readable-stream": "2.3.3"
+                "readable-stream": "2.3.6"
             }
         },
         "streamqueue": {
@@ -5040,12 +4905,12 @@
             }
         },
         "string_decoder": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-            "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
             "dev": true,
             "requires": {
-                "safe-buffer": "5.1.1"
+                "safe-buffer": "5.1.2"
             }
         },
         "strip-ansi": {
@@ -5082,13 +4947,22 @@
                 "minimist": "1.2.0"
             }
         },
-        "syntax-error": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.3.0.tgz",
-            "integrity": "sha1-HtkmbE1AvnXcVb+bsct3Biu5bKE=",
+        "supports-color": {
+            "version": "5.4.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+            "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
             "dev": true,
             "requires": {
-                "acorn": "4.0.13"
+                "has-flag": "3.0.0"
+            }
+        },
+        "syntax-error": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz",
+            "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==",
+            "dev": true,
+            "requires": {
+                "acorn-node": "1.3.0"
             }
         },
         "through": {
@@ -5103,7 +4977,7 @@
             "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
             "dev": true,
             "requires": {
-                "readable-stream": "2.3.3",
+                "readable-stream": "2.3.6",
                 "xtend": "4.0.1"
             }
         },
@@ -5142,15 +5016,25 @@
             }
         },
         "timers-ext": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.2.tgz",
-            "integrity": "sha1-YcxHp2wavTGV8UUn+XjViulMUgQ=",
+            "version": "0.1.5",
+            "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.5.tgz",
+            "integrity": "sha512-tsEStd7kmACHENhsUPaxb8Jf8/+GZZxyNFQbZD07HQOyooOa6At1rQqjffgvg7n+dxscQa9cjjMdWhJtsP2sxg==",
             "dev": true,
             "requires": {
-                "es5-ext": "0.10.37",
+                "es5-ext": "0.10.42",
                 "next-tick": "1.0.0"
             }
         },
+        "to-absolute-glob": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
+            "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
+            "dev": true,
+            "requires": {
+                "is-absolute": "1.0.0",
+                "is-negated-glob": "1.0.0"
+            }
+        },
         "to-arraybuffer": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
@@ -5178,82 +5062,15 @@
             }
         },
         "to-regex": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.1.tgz",
-            "integrity": "sha1-FTWL7kosg712N3uh3ASdDxiDeq4=",
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+            "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
             "dev": true,
             "requires": {
-                "define-property": "0.2.5",
-                "extend-shallow": "2.0.1",
-                "regex-not": "1.0.0"
-            },
-            "dependencies": {
-                "define-property": {
-                    "version": "0.2.5",
-                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-                    "dev": true,
-                    "requires": {
-                        "is-descriptor": "0.1.6"
-                    }
-                },
-                "is-accessor-descriptor": {
-                    "version": "0.1.6",
-                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-                    "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "3.2.2"
-                    },
-                    "dependencies": {
-                        "kind-of": {
-                            "version": "3.2.2",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                            "dev": true,
-                            "requires": {
-                                "is-buffer": "1.1.6"
-                            }
-                        }
-                    }
-                },
-                "is-data-descriptor": {
-                    "version": "0.1.4",
-                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-                    "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "3.2.2"
-                    },
-                    "dependencies": {
-                        "kind-of": {
-                            "version": "3.2.2",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                            "dev": true,
-                            "requires": {
-                                "is-buffer": "1.1.6"
-                            }
-                        }
-                    }
-                },
-                "is-descriptor": {
-                    "version": "0.1.6",
-                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-                    "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-                    "dev": true,
-                    "requires": {
-                        "is-accessor-descriptor": "0.1.6",
-                        "is-data-descriptor": "0.1.4",
-                        "kind-of": "5.1.0"
-                    }
-                },
-                "kind-of": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-                    "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-                    "dev": true
-                }
+                "define-property": "2.0.2",
+                "extend-shallow": "3.0.2",
+                "regex-not": "1.0.2",
+                "safe-regex": "1.1.0"
             }
         },
         "to-regex-range": {
@@ -5281,26 +5098,10 @@
             "integrity": "sha1-/sAF+dyqJZo/lFnOWmkGq6TFRdo=",
             "dev": true
         },
-        "ts-node": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-5.0.1.tgz",
-            "integrity": "sha512-XK7QmDcNHVmZkVtkiwNDWiERRHPyU8nBqZB1+iv2UhOG0q3RQ9HsZ2CMqISlFbxjrYFGfG2mX7bW4dAyxBVzUw==",
-            "dev": true,
-            "requires": {
-                "arrify": "1.0.1",
-                "chalk": "2.3.2",
-                "diff": "3.3.1",
-                "make-error": "1.3.2",
-                "minimist": "1.2.0",
-                "mkdirp": "0.5.1",
-                "source-map-support": "0.5.4",
-                "yn": "2.0.0"
-            }
-        },
         "tslib": {
-            "version": "1.8.1",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.8.1.tgz",
-            "integrity": "sha1-aUavLR1lGnsYY7Ux1uWvpBqkTqw=",
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz",
+            "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==",
             "dev": true
         },
         "tslint": {
@@ -5311,16 +5112,16 @@
             "requires": {
                 "babel-code-frame": "6.26.0",
                 "builtin-modules": "1.1.1",
-                "chalk": "2.3.2",
+                "chalk": "2.4.0",
                 "commander": "2.15.1",
-                "diff": "3.3.1",
+                "diff": "3.5.0",
                 "glob": "7.1.2",
-                "js-yaml": "3.10.0",
+                "js-yaml": "3.11.0",
                 "minimatch": "3.0.4",
-                "resolve": "1.6.0",
+                "resolve": "1.7.1",
                 "semver": "5.5.0",
-                "tslib": "1.8.1",
-                "tsutils": "2.16.0"
+                "tslib": "1.9.0",
+                "tsutils": "2.26.1"
             },
             "dependencies": {
                 "commander": {
@@ -5330,9 +5131,9 @@
                     "dev": true
                 },
                 "resolve": {
-                    "version": "1.6.0",
-                    "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.6.0.tgz",
-                    "integrity": "sha512-mw7JQNu5ExIkcw4LPih0owX/TZXjD/ZUF/ZQ/pDnkw3ZKhDcZZw5klmBlj6gVMwjQ3Pz5Jgu7F3d0jcDVuEWdw==",
+                    "version": "1.7.1",
+                    "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz",
+                    "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==",
                     "dev": true,
                     "requires": {
                         "path-parse": "1.0.5"
@@ -5347,14 +5148,20 @@
             }
         },
         "tsutils": {
-            "version": "2.16.0",
-            "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.16.0.tgz",
-            "integrity": "sha512-9Ier/60O7OZRNPiw+or5QAtAY4kQA+WDiO/r6xOYATEyefH9bdfvTRLCxrYnFhQlZfET2vYXKfpr3Vw2BiArZw==",
+            "version": "2.26.1",
+            "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.26.1.tgz",
+            "integrity": "sha512-bnm9bcjOqOr1UljleL94wVCDlpa6KjfGaTkefeLch4GRafgDkROxPizbB/FxTEdI++5JqhxczRy/Qub0syNqZA==",
             "dev": true,
             "requires": {
-                "tslib": "1.8.1"
+                "tslib": "1.9.0"
             }
         },
+        "tty-browserify": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
+            "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==",
+            "dev": true
+        },
         "type-check": {
             "version": "0.3.2",
             "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -5365,9 +5172,9 @@
             }
         },
         "type-detect": {
-            "version": "4.0.5",
-            "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.5.tgz",
-            "integrity": "sha512-N9IvkQslUGYGC24RkJk1ba99foK6TkwC2FHAEBlQFBP0RxQZS8ZpJuAZcwiY/w9ZJHFQb1aOXBI60OdxhTrwEQ==",
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+            "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
             "dev": true
         },
         "typedarray": {
@@ -5377,9 +5184,9 @@
             "dev": true
         },
         "typescript": {
-            "version": "2.8.0-dev.20180322",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.8.0-dev.20180322.tgz",
-            "integrity": "sha512-dSYa9IAoj3CRAxtKx9+cSCQLetB7OLtHXhvQWeWY6PPIXvbpAC41ulQWX3TUAkMYU9NS/kGIU8TFM9VFpinJTg==",
+            "version": "2.9.0-dev.20180425",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.0-dev.20180425.tgz",
+            "integrity": "sha512-6t/l13ofVeTSJVD78b20E0rkoOcFPrst5bK9vCGDbbjzx+Ab3HoV7fSTuwB8zMEvpxHwQtR+0kR3XUy06HzwUg==",
             "dev": true
         },
         "uglify-js": {
@@ -5402,9 +5209,9 @@
             "optional": true
         },
         "umd": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz",
-            "integrity": "sha1-iuVW4RAR9jwllnCKiDclnwGz1g4=",
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz",
+            "integrity": "sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==",
             "dev": true
         },
         "unc-path-regex": {
@@ -5425,6 +5232,15 @@
                 "set-value": "0.4.3"
             },
             "dependencies": {
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "requires": {
+                        "is-extendable": "0.1.1"
+                    }
+                },
                 "set-value": {
                     "version": "0.4.3",
                     "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
@@ -5510,82 +5326,12 @@
             }
         },
         "use": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/use/-/use-2.0.2.tgz",
-            "integrity": "sha1-riig1y+TvyJCKhii43mZMRLeyOg=",
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz",
+            "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==",
             "dev": true,
             "requires": {
-                "define-property": "0.2.5",
-                "isobject": "3.0.1",
-                "lazy-cache": "2.0.2"
-            },
-            "dependencies": {
-                "define-property": {
-                    "version": "0.2.5",
-                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-                    "dev": true,
-                    "requires": {
-                        "is-descriptor": "0.1.6"
-                    }
-                },
-                "is-accessor-descriptor": {
-                    "version": "0.1.6",
-                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-                    "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "3.2.2"
-                    },
-                    "dependencies": {
-                        "kind-of": {
-                            "version": "3.2.2",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                            "dev": true,
-                            "requires": {
-                                "is-buffer": "1.1.6"
-                            }
-                        }
-                    }
-                },
-                "is-data-descriptor": {
-                    "version": "0.1.4",
-                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-                    "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "3.2.2"
-                    },
-                    "dependencies": {
-                        "kind-of": {
-                            "version": "3.2.2",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                            "dev": true,
-                            "requires": {
-                                "is-buffer": "1.1.6"
-                            }
-                        }
-                    }
-                },
-                "is-descriptor": {
-                    "version": "0.1.6",
-                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-                    "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-                    "dev": true,
-                    "requires": {
-                        "is-accessor-descriptor": "0.1.6",
-                        "is-data-descriptor": "0.1.4",
-                        "kind-of": "5.1.0"
-                    }
-                },
-                "kind-of": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-                    "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-                    "dev": true
-                }
+                "kind-of": "6.0.2"
             }
         },
         "user-home": {
@@ -5647,7 +5393,7 @@
                 "clone": "2.1.2",
                 "clone-buffer": "1.0.0",
                 "clone-stats": "1.0.0",
-                "cloneable-readable": "1.0.0",
+                "cloneable-readable": "1.1.2",
                 "remove-trailing-separator": "1.1.0",
                 "replace-ext": "1.0.0"
             },
@@ -5763,20 +5509,11 @@
                 }
             }
         },
-        "vlq": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
-            "integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==",
-            "dev": true
-        },
         "vm-browserify": {
-            "version": "0.0.4",
-            "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-            "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
-            "dev": true,
-            "requires": {
-                "indexof": "0.0.1"
-            }
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.0.1.tgz",
+            "integrity": "sha512-EqzLchIMYLBjRPoqVsEkZOa/4Vr2RfOWbd58F+I/Gj79AYTrsseMunxbbSkbYfrqZaXSuPBBXNSOhtJgg0PpmA==",
+            "dev": true
         },
         "which": {
             "version": "1.3.0",
@@ -5813,13 +5550,13 @@
             "dev": true,
             "requires": {
                 "sax": "1.2.4",
-                "xmlbuilder": "9.0.4"
+                "xmlbuilder": "9.0.7"
             }
         },
         "xmlbuilder": {
-            "version": "9.0.4",
-            "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz",
-            "integrity": "sha1-UZy0ymhtAFqEINNJbz8MruzKWA8=",
+            "version": "9.0.7",
+            "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
+            "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
             "dev": true
         },
         "xtend": {
@@ -5840,12 +5577,6 @@
                 "decamelize": "1.2.0",
                 "window-size": "0.1.0"
             }
-        },
-        "yn": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz",
-            "integrity": "sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=",
-            "dev": true
         }
     }
 }
diff --git a/package.json b/package.json
index 5837f72317f..3e53a3c67b8 100644
--- a/package.json
+++ b/package.json
@@ -48,11 +48,12 @@
         "@types/q": "latest",
         "@types/run-sequence": "latest",
         "@types/through2": "latest",
+        "@types/travis-fold": "latest",
         "@types/xml2js": "^0.4.0",
-        "xml2js": "^0.4.19",
         "browser-resolve": "^1.11.2",
         "browserify": "latest",
         "chai": "latest",
+        "chalk": "latest",
         "convert-source-map": "latest",
         "del": "latest",
         "gulp": "3.X",
@@ -76,11 +77,10 @@
         "source-map-support": "latest",
         "through2": "latest",
         "travis-fold": "latest",
-        "ts-node": "latest",
         "tslint": "latest",
+        "typescript": "next",
         "vinyl": "latest",
-        "chalk": "latest",
-        "typescript": "next"
+        "xml2js": "^0.4.19"
     },
     "scripts": {
         "pretest": "jake tests",
diff --git a/scripts/buildProtocol.ts b/scripts/buildProtocol.ts
index 899ab700bf3..3ea7d703cd3 100644
--- a/scripts/buildProtocol.ts
+++ b/scripts/buildProtocol.ts
@@ -178,7 +178,7 @@ function writeProtocolFile(outputFile: string, protocolTs: string, typeScriptSer
     ts.sys.writeFile(outputFile, protocolDts);
 
     if (diagnostics.length) {
-        const flattenedDiagnostics = diagnostics.map(d => `${ts.flattenDiagnosticMessageText(d.messageText, "\n")} at ${d.file.fileName} line ${d.start}`).join("\n");
+        const flattenedDiagnostics = diagnostics.map(d => `${ts.flattenDiagnosticMessageText(d.messageText, "\n")} at ${d.file ? d.file.fileName : "<unknown>"} line ${d.start}`).join("\n");
         throw new Error(`Unexpected errors during sanity check: ${flattenedDiagnostics}`);
     }
 }
diff --git a/scripts/configurePrerelease.ts b/scripts/configurePrerelease.ts
index d17ddb963b1..da1984c13e0 100644
--- a/scripts/configurePrerelease.ts
+++ b/scripts/configurePrerelease.ts
@@ -1,4 +1,9 @@
-/// <reference path="../src/compiler/sys.ts" />
+/// <reference types="node"/>
+import { normalize } from "path";
+import assert = require("assert");
+import { readFileSync, writeFileSync } from "fs";
+const args = process.argv.slice(2);
+
 
 /**
  * A minimal description for a parsed package.json object.
@@ -10,28 +15,27 @@ interface PackageJson {
 }
 
 function main(): void {
-    const sys = ts.sys;
-    if (sys.args.length < 3) {
-        sys.write("Usage:" + sys.newLine)
-        sys.write("\tnode configureNightly.js <dev|insiders> <package.json location> <file containing version>" + sys.newLine);
+    if (args.length < 3) {
+        console.log("Usage:");
+        console.log("\tnode configureNightly.js <dev|insiders> <package.json location> <file containing version>");
         return;
     }
 
-    const tag = sys.args[0];
+    const tag = args[0];
     if (tag !== "dev" && tag !== "insiders") {
         throw new Error(`Unexpected tag name '${tag}'.`);
     }
 
     // Acquire the version from the package.json file and modify it appropriately.
-    const packageJsonFilePath = ts.normalizePath(sys.args[1]);
-    const packageJsonValue: PackageJson = JSON.parse(sys.readFile(packageJsonFilePath));
+    const packageJsonFilePath = normalize(args[1]);
+    const packageJsonValue: PackageJson = JSON.parse(readFileSync(packageJsonFilePath).toString());
 
     const { majorMinor, patch } = parsePackageJsonVersion(packageJsonValue.version);
     const prereleasePatch = getPrereleasePatch(tag, patch);
 
     // Acquire and modify the source file that exposes the version string.
-    const tsFilePath = ts.normalizePath(sys.args[2]);
-    const tsFileContents = ts.sys.readFile(tsFilePath);
+    const tsFilePath = normalize(args[2]);
+    const tsFileContents = readFileSync(tsFilePath).toString();
     const modifiedTsFileContents = updateTsFile(tsFilePath, tsFileContents, majorMinor, patch, prereleasePatch);
 
     // Ensure we are actually changing something - the user probably wants to know that the update failed.
@@ -44,20 +48,20 @@ function main(): void {
     // Finally write the changes to disk.
     // Modify the package.json structure
     packageJsonValue.version = `${majorMinor}.${prereleasePatch}`;
-    sys.writeFile(packageJsonFilePath, JSON.stringify(packageJsonValue, /*replacer:*/ undefined, /*space:*/ 4))
-    sys.writeFile(tsFilePath, modifiedTsFileContents);
+    writeFileSync(packageJsonFilePath, JSON.stringify(packageJsonValue, /*replacer:*/ undefined, /*space:*/ 4))
+    writeFileSync(tsFilePath, modifiedTsFileContents);
 }
 
 function updateTsFile(tsFilePath: string, tsFileContents: string, majorMinor: string, patch: string, nightlyPatch: string): string {
     const majorMinorRgx = /export const versionMajorMinor = "(\d+\.\d+)"/;
     const majorMinorMatch = majorMinorRgx.exec(tsFileContents);
-    ts.Debug.assert(majorMinorMatch !== null, "", () => `The file seems to no longer have a string matching '${majorMinorRgx}'.`);
+    assert(majorMinorMatch !== null, `The file seems to no longer have a string matching '${majorMinorRgx}'.`);
     const parsedMajorMinor = majorMinorMatch[1];
-    ts.Debug.assert(parsedMajorMinor === majorMinor, "versionMajorMinor does not match.", () => `${tsFilePath}: '${parsedMajorMinor}'; package.json: '${majorMinor}'`);
+    assert(parsedMajorMinor === majorMinor, `versionMajorMinor does not match. ${tsFilePath}: '${parsedMajorMinor}'; package.json: '${majorMinor}'`);
 
     const versionRgx = /export const version = `\$\{versionMajorMinor\}\.(\d)(-dev)?`;/;
     const patchMatch = versionRgx.exec(tsFileContents);
-    ts.Debug.assert(patchMatch !== null, "The file seems to no longer have a string matching", () => versionRgx.toString());
+    assert(patchMatch !== null, "The file seems to no longer have a string matching " + versionRgx.toString());
     const parsedPatch = patchMatch[1];
     if (parsedPatch !== patch) {
         throw new Error(`patch does not match. ${tsFilePath}: '${parsedPatch}; package.json: '${patch}'`);
@@ -69,7 +73,7 @@ function updateTsFile(tsFilePath: string, tsFileContents: string, majorMinor: st
 function parsePackageJsonVersion(versionString: string): { majorMinor: string, patch: string } {
     const versionRgx = /(\d+\.\d+)\.(\d+)($|\-)/;
     const match = versionString.match(versionRgx);
-    ts.Debug.assert(match !== null, "package.json 'version' should match", () => versionRgx.toString());
+    assert(match !== null, "package.json 'version' should match " + versionRgx.toString());
     return { majorMinor: match[1], patch: match[2] };
 }
 
diff --git a/scripts/processDiagnosticMessages.ts b/scripts/processDiagnosticMessages.ts
index dd66564b134..848a60cfb4f 100644
--- a/scripts/processDiagnosticMessages.ts
+++ b/scripts/processDiagnosticMessages.ts
@@ -1,9 +1,7 @@
-/// <reference path="../src/compiler/sys.ts" />
-/// <reference path="../src/compiler/core.ts" />
-
 interface DiagnosticDetails {
     category: string;
     code: number;
+    reportsUnnecessary?: {};
     isEarly?: boolean;
 }
 
@@ -56,17 +54,17 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, inputFil
     let result =
         "// <auto-generated />\r\n" +
         "// generated from '" + inputFilePathRel + "' by '" + thisFilePathRel + "'\r\n" +
-        "/// <reference path=\"types.ts\" />\r\n" +
         "/* @internal */\r\n" +
         "namespace ts {\r\n" +
-        "    function diag(code: number, category: DiagnosticCategory, key: string, message: string): DiagnosticMessage {\r\n" +
-        "        return { code, category, key, message };\r\n" +
+        "    function diag(code: number, category: DiagnosticCategory, key: string, message: string, reportsUnnecessary?: {}): DiagnosticMessage {\r\n" +
+        "        return { code, category, key, message, reportsUnnecessary };\r\n" +
         "    }\r\n" +
         "    // tslint:disable-next-line variable-name\r\n" +
         "    export const Diagnostics = {\r\n";
-    messageTable.forEach(({ code, category }, name) => {
+    messageTable.forEach(({ code, category, reportsUnnecessary }, name) => {
         const propName = convertPropertyName(name);
-        result += `        ${propName}: diag(${code}, DiagnosticCategory.${category}, "${createKey(propName, code)}", ${JSON.stringify(name)}),\r\n`;
+        const argReportsUnnecessary = reportsUnnecessary ? `, /*reportsUnnecessary*/ ${reportsUnnecessary}` : "";
+        result += `        ${propName}: diag(${code}, DiagnosticCategory.${category}, "${createKey(propName, code)}", ${JSON.stringify(name)}${argReportsUnnecessary}),\r\n`;
     });
 
     result += "    };\r\n}";
diff --git a/scripts/processDiagnosticMessages.tsconfig.json b/scripts/processDiagnosticMessages.tsconfig.json
new file mode 100644
index 00000000000..5675c8783b9
--- /dev/null
+++ b/scripts/processDiagnosticMessages.tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "removeComments": false,
+        "outFile": "processDiagnosticMessages.js",
+        "target": "es5",
+        "declaration": false,
+        "lib": [
+            "es6",
+            "scripthost"
+        ]
+    },
+    "files": [
+        "../src/compiler/types.ts",
+        "../src/compiler/performance.ts",
+        "../src/compiler/core.ts",
+        "../src/compiler/sys.ts",
+
+        "processDiagnosticMessages.ts"
+    ]
+}
diff --git a/scripts/tslint/rules/booleanTriviaRule.ts b/scripts/tslint/rules/booleanTriviaRule.ts
index dbfdc28438e..0224a0f08d8 100644
--- a/scripts/tslint/rules/booleanTriviaRule.ts
+++ b/scripts/tslint/rules/booleanTriviaRule.ts
@@ -28,13 +28,11 @@ function walk(ctx: Lint.WalkContext<void>): void {
     function shouldIgnoreCalledExpression(expression: ts.Expression): boolean {
         if (expression.kind === ts.SyntaxKind.PropertyAccessExpression) {
             const methodName = (expression as ts.PropertyAccessExpression).name.text;
-            if (methodName.indexOf("set") === 0) {
+            if (methodName.startsWith("set") || methodName.startsWith("assert")) {
                 return true;
             }
             switch (methodName) {
                 case "apply":
-                case "assert":
-                case "assertEqual":
                 case "call":
                 case "equal":
                 case "fail":
@@ -46,11 +44,10 @@ function walk(ctx: Lint.WalkContext<void>): void {
         }
         else if (expression.kind === ts.SyntaxKind.Identifier) {
             const functionName = (expression as ts.Identifier).text;
-            if (functionName.indexOf("set") === 0) {
+            if (functionName.startsWith("set") || functionName.startsWith("assert")) {
                 return true;
             }
             switch (functionName) {
-                case "assert":
                 case "contains":
                 case "createAnonymousType":
                 case "createImportSpecifier":
diff --git a/scripts/types/ambient.d.ts b/scripts/types/ambient.d.ts
index f99bf010198..4f9112d236e 100644
--- a/scripts/types/ambient.d.ts
+++ b/scripts/types/ambient.d.ts
@@ -14,4 +14,3 @@ declare module "gulp-insert" {
 }
 
 declare module "sorcery";
-declare module "travis-fold";
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 9281719b860..2557e3b7078 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -1,6 +1,3 @@
-/// <reference path="utilities.ts"/>
-/// <reference path="parser.ts"/>
-
 /* @internal */
 namespace ts {
     export const enum ModuleInstanceState {
@@ -519,8 +516,9 @@ namespace ts {
                 const saveReturnTarget = currentReturnTarget;
                 const saveActiveLabels = activeLabels;
                 const saveHasExplicitReturn = hasExplicitReturn;
-                const isIIFE = containerFlags & ContainerFlags.IsFunctionExpression && !hasModifier(node, ModifierFlags.Async) && !!getImmediatelyInvokedFunctionExpression(node);
-                // A non-async IIFE is considered part of the containing control flow. Return statements behave
+                const isIIFE = containerFlags & ContainerFlags.IsFunctionExpression && !hasModifier(node, ModifierFlags.Async) &&
+                    !(<FunctionLikeDeclaration>node).asteriskToken && !!getImmediatelyInvokedFunctionExpression(node);
+                // A non-async, non-generator IIFE is considered part of the containing control flow. Return statements behave
                 // similarly to break statements that exit to a label just past the statement body.
                 if (!isIIFE) {
                     currentFlow = { flags: FlowFlags.Start };
@@ -2222,14 +2220,14 @@ namespace ts {
             bindAnonymousDeclaration(file, SymbolFlags.ValueModule, `"${removeFileExtension(file.fileName)}"` as __String);
         }
 
-        function bindExportAssignment(node: ExportAssignment | BinaryExpression) {
+        function bindExportAssignment(node: ExportAssignment) {
             if (!container.symbol || !container.symbol.exports) {
                 // Export assignment in some sort of block construct
                 bindAnonymousDeclaration(node, SymbolFlags.Alias, getDeclarationName(node));
             }
             else {
                 const flags = node.kind === SyntaxKind.ExportAssignment && exportAssignmentIsAlias(node)
-                    // An export default clause with an EntityNameExpression exports all meanings of that identifier
+                    // An export default clause with an EntityNameExpression or a class expression exports all meanings of that identifier or expression;
                     ? SymbolFlags.Alias
                     // An export default clause with any other expression exports a value
                     : SymbolFlags.Property;
@@ -2324,7 +2322,10 @@ namespace ts {
 
             // 'module.exports = expr' assignment
             setCommonJsModuleIndicator(node);
-            declareSymbol(file.symbol.exports, file.symbol, node, SymbolFlags.Property | SymbolFlags.ExportValue | SymbolFlags.ValueModule, SymbolFlags.None);
+            const flags = exportAssignmentIsAlias(node)
+                ? SymbolFlags.Alias // An export= with an EntityNameExpression or a ClassExpression exports all meanings of that identifier or class
+                : SymbolFlags.Property | SymbolFlags.ExportValue | SymbolFlags.ValueModule;
+            declareSymbol(file.symbol.exports, file.symbol, node, flags, SymbolFlags.None);
         }
 
         function bindThisPropertyAssignment(node: BinaryExpression | PropertyAccessExpression) {
diff --git a/src/compiler/builder.ts b/src/compiler/builder.ts
index cc506852252..92e651061ed 100644
--- a/src/compiler/builder.ts
+++ b/src/compiler/builder.ts
@@ -1,5 +1,3 @@
-/// <reference path="builderState.ts" />
-
 /*@internal*/
 namespace ts {
     /**
diff --git a/src/compiler/builderState.ts b/src/compiler/builderState.ts
index 581aa05f12c..ac9f36b1258 100644
--- a/src/compiler/builderState.ts
+++ b/src/compiler/builderState.ts
@@ -1,4 +1,3 @@
-/// <reference path="program.ts" />
 namespace ts {
     export interface EmitOutput {
         outputFiles: OutputFile[];
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index aa9bbccffd9..499beb6e87d 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -1,7 +1,3 @@
-/// <reference path="moduleNameResolver.ts"/>
-/// <reference path="binder.ts"/>
-/// <reference path="symbolWalker.ts" />
-
 /* @internal */
 namespace ts {
     const ambientModuleSymbolRegex = /^".+"$/;
@@ -71,6 +67,7 @@ namespace ts {
         const strictPropertyInitialization = getStrictOptionValue(compilerOptions, "strictPropertyInitialization");
         const noImplicitAny = getStrictOptionValue(compilerOptions, "noImplicitAny");
         const noImplicitThis = getStrictOptionValue(compilerOptions, "noImplicitThis");
+        const keyofStringsOnly = !!compilerOptions.keyofStringsOnly;
 
         const emitResolver = createResolver();
         const nodeBuilder = createNodeBuilder();
@@ -328,6 +325,16 @@ namespace ts {
                     return diagnostics;
                 }
             },
+
+            runWithCancellationToken: (token, callback) => {
+                try {
+                    cancellationToken = token;
+                    return callback(checker);
+                }
+                finally {
+                    cancellationToken = undefined;
+                }
+            }
         };
 
         const tupleTypes: GenericType[] = [];
@@ -360,6 +367,8 @@ namespace ts {
         const silentNeverType = createIntrinsicType(TypeFlags.Never, "never");
         const implicitNeverType = createIntrinsicType(TypeFlags.Never, "never");
         const nonPrimitiveType = createIntrinsicType(TypeFlags.NonPrimitive, "object");
+        const stringNumberSymbolType = getUnionType([stringType, numberType, esSymbolType]);
+        const keyofConstraintType = keyofStringsOnly ? stringType : stringNumberSymbolType;
 
         const emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
 
@@ -435,6 +444,7 @@ namespace ts {
         let deferredGlobalAsyncIterableIteratorType: GenericType;
         let deferredGlobalTemplateStringsArrayType: ObjectType;
         let deferredGlobalImportMetaType: ObjectType;
+        let deferredGlobalExtractSymbol: Symbol;
 
         let deferredNodes: Node[];
         const allPotentiallyUnusedIdentifiers = createMap<ReadonlyArray<PotentiallyUnusedIdentifier>>(); // key is file name
@@ -1559,7 +1569,8 @@ namespace ts {
 
         function isTypeParameterSymbolDeclaredInContainer(symbol: Symbol, container: Node) {
             for (const decl of symbol.declarations) {
-                if (decl.kind === SyntaxKind.TypeParameter && decl.parent === container) {
+                const parent = isJSDocTemplateTag(decl.parent) ? getJSDocHost(decl.parent) : decl.parent;
+                if (decl.kind === SyntaxKind.TypeParameter && parent === container) {
                     return true;
                 }
             }
@@ -1572,7 +1583,7 @@ namespace ts {
                 return false;
             }
 
-            const container = getThisContainer(errorLocation, /*includeArrowFunctions*/ true);
+            const container = getThisContainer(errorLocation, /*includeArrowFunctions*/ false);
             let location = container;
             while (location) {
                 if (isClassLike(location.parent)) {
@@ -1845,7 +1856,7 @@ namespace ts {
                 return valueSymbol;
             }
             const result = createSymbol(valueSymbol.flags | typeSymbol.flags, valueSymbol.escapedName);
-            result.declarations = concatenate(valueSymbol.declarations, typeSymbol.declarations);
+            result.declarations = deduplicate(concatenate(valueSymbol.declarations, typeSymbol.declarations), equateValues);
             result.parent = valueSymbol.parent || typeSymbol.parent;
             if (valueSymbol.valueDeclaration) result.valueDeclaration = valueSymbol.valueDeclaration;
             if (typeSymbol.members) result.members = typeSymbol.members;
@@ -1880,7 +1891,7 @@ namespace ts {
 
                     let symbolFromVariable: Symbol;
                     // First check if module was specified with "export=". If so, get the member from the resolved type
-                    if (moduleSymbol && moduleSymbol.exports && moduleSymbol.exports.get("export=" as __String)) {
+                    if (moduleSymbol && moduleSymbol.exports && moduleSymbol.exports.get(InternalSymbolName.ExportEquals)) {
                         symbolFromVariable = getPropertyOfType(getTypeOfSymbol(targetSymbol), name.escapedText);
                     }
                     else {
@@ -1893,7 +1904,7 @@ namespace ts {
                     if (!symbolFromModule && allowSyntheticDefaultImports && name.escapedText === InternalSymbolName.Default) {
                         symbolFromModule = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias) || resolveSymbol(moduleSymbol, dontResolveAlias);
                     }
-                    const symbol = symbolFromModule && symbolFromVariable ?
+                    const symbol = symbolFromModule && symbolFromVariable && symbolFromModule !== symbolFromVariable ?
                         combineValueAndTypeSymbols(symbolFromVariable, symbolFromModule) :
                         symbolFromModule || symbolFromVariable;
                     if (!symbol) {
@@ -1926,13 +1937,17 @@ namespace ts {
                 resolveEntityName(node.propertyName || node.name, meaning, /*ignoreErrors*/ false, dontResolveAlias);
         }
 
-        function getTargetOfExportAssignment(node: ExportAssignment, dontResolveAlias: boolean): Symbol | undefined {
-            const aliasLike = resolveEntityName(<EntityNameExpression>node.expression, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace, /*ignoreErrors*/ true, dontResolveAlias);
+        function getTargetOfExportAssignment(node: ExportAssignment | BinaryExpression, dontResolveAlias: boolean): Symbol | undefined {
+            const expression = (isExportAssignment(node) ? node.expression : node.right) as EntityNameExpression | ClassExpression;
+            if (isClassExpression(expression)) {
+                return checkExpression(expression).symbol;
+            }
+            const aliasLike = resolveEntityName(expression, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace, /*ignoreErrors*/ true, dontResolveAlias);
             if (aliasLike) {
                 return aliasLike;
             }
-            checkExpression(node.expression);
-            return getNodeLinks(node.expression).resolvedSymbol;
+            checkExpression(expression);
+            return getNodeLinks(expression).resolvedSymbol;
         }
 
         function getTargetOfAliasDeclaration(node: Declaration, dontRecursivelyResolve?: boolean): Symbol | undefined {
@@ -1948,7 +1963,8 @@ namespace ts {
                 case SyntaxKind.ExportSpecifier:
                     return getTargetOfExportSpecifier(<ExportSpecifier>node, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace, dontRecursivelyResolve);
                 case SyntaxKind.ExportAssignment:
-                    return getTargetOfExportAssignment(<ExportAssignment>node, dontRecursivelyResolve);
+                case SyntaxKind.BinaryExpression:
+                    return getTargetOfExportAssignment((<ExportAssignment | BinaryExpression>node), dontRecursivelyResolve);
                 case SyntaxKind.NamespaceExportDeclaration:
                     return getTargetOfNamespaceExportDeclaration(<NamespaceExportDeclaration>node, dontRecursivelyResolve);
             }
@@ -2065,10 +2081,10 @@ namespace ts {
             let symbol: Symbol;
             if (name.kind === SyntaxKind.Identifier) {
                 const message = meaning === namespaceMeaning ? Diagnostics.Cannot_find_namespace_0 : Diagnostics.Cannot_find_name_0;
-
-                symbol = resolveName(location || name, name.escapedText, meaning, ignoreErrors ? undefined : message, name, /*isUse*/ true);
+                const symbolFromJSPrototype = isInJavaScriptFile(name) ? resolveEntityNameFromJSPrototype(name, meaning) : undefined;
+                symbol = resolveName(location || name, name.escapedText, meaning, ignoreErrors || symbolFromJSPrototype ? undefined : message, name, /*isUse*/ true);
                 if (!symbol) {
-                    return undefined;
+                    return symbolFromJSPrototype;
                 }
             }
             else if (name.kind === SyntaxKind.QualifiedName || name.kind === SyntaxKind.PropertyAccessExpression) {
@@ -2119,6 +2135,26 @@ namespace ts {
             return (symbol.flags & meaning) || dontResolveAlias ? symbol : resolveAlias(symbol);
         }
 
+        /**
+         * For prototype-property methods like `A.prototype.m = function () ...`, try to resolve names in the scope of `A` too.
+         * Note that prototype-property assignment to locations outside the current file (eg globals) doesn't work, so
+         * name resolution won't work either.
+         */
+        function resolveEntityNameFromJSPrototype(name: Identifier, meaning: SymbolFlags) {
+            if (isJSDocTypeReference(name.parent) && isJSDocTag(name.parent.parent.parent)) {
+                const host = getJSDocHost(name.parent.parent.parent as JSDocTag);
+                if (isExpressionStatement(host) &&
+                    isBinaryExpression(host.expression) &&
+                    getSpecialPropertyAssignmentKind(host.expression) === SpecialPropertyAssignmentKind.PrototypeProperty) {
+                    const symbol = getSymbolOfNode(host.expression.left);
+                    if (symbol) {
+                        const secondaryLocation = symbol.parent.valueDeclaration;
+                        return resolveName(secondaryLocation, name.escapedText, meaning, /*nameNotFoundMessage*/ undefined, name, /*isUse*/ true);
+                    }
+                }
+            }
+        }
+
         function resolveExternalModuleName(location: Node, moduleReferenceExpression: Expression): Symbol {
             return resolveExternalModuleNameWorker(location, moduleReferenceExpression, Diagnostics.Cannot_find_module_0);
         }
@@ -2217,20 +2253,28 @@ namespace ts {
         // An external module with an 'export =' declaration resolves to the target of the 'export =' declaration,
         // and an external module with no 'export =' declaration resolves to the module itself.
         function resolveExternalModuleSymbol(moduleSymbol: Symbol, dontResolveAlias?: boolean): Symbol {
-            return moduleSymbol && getMergedSymbol(resolveSymbol(getCommonJsExportEquals(moduleSymbol), dontResolveAlias)) || moduleSymbol;
+            return moduleSymbol && getMergedSymbol(getCommonJsExportEquals(resolveSymbol(moduleSymbol.exports.get(InternalSymbolName.ExportEquals), dontResolveAlias), moduleSymbol)) || moduleSymbol;
         }
 
-        function getCommonJsExportEquals(moduleSymbol: Symbol): Symbol {
-            const exported = moduleSymbol.exports.get(InternalSymbolName.ExportEquals);
-            if (!exported || !exported.exports || moduleSymbol.exports.size === 1) {
+        function getCommonJsExportEquals(exported: Symbol, moduleSymbol: Symbol): Symbol {
+            if (!exported || moduleSymbol.exports.size === 1) {
                 return exported;
             }
             const merged = cloneSymbol(exported);
+            if (merged.exports === undefined) {
+                merged.flags = merged.flags | SymbolFlags.ValueModule;
+                merged.exports = createSymbolTable();
+            }
             moduleSymbol.exports.forEach((s, name) => {
                 if (name === InternalSymbolName.ExportEquals) return;
                 if (!merged.exports.has(name)) {
                     merged.exports.set(name, s);
                 }
+                else {
+                    const ms = cloneSymbol(merged.exports.get(name));
+                    mergeSymbol(ms, s);
+                    merged.exports.set(name, ms);
+                }
             });
             return merged;
         }
@@ -2963,6 +3007,9 @@ namespace ts {
             }
 
             function typeToTypeNodeHelper(type: Type, context: NodeBuilderContext): TypeNode {
+                if (cancellationToken && cancellationToken.throwIfCancellationRequested) {
+                    cancellationToken.throwIfCancellationRequested();
+                }
                 const inTypeAlias = context.flags & NodeBuilderFlags.InTypeAlias;
                 context.flags &= ~NodeBuilderFlags.InTypeAlias;
 
@@ -3851,10 +3898,13 @@ namespace ts {
                         return "(Anonymous function)";
                 }
             }
-            if ((symbol as TransientSymbol).nameType && (symbol as TransientSymbol).nameType.flags & TypeFlags.StringLiteral) {
-                const stringValue = ((symbol as TransientSymbol).nameType as StringLiteralType).value;
-                if (!isIdentifierText(stringValue, compilerOptions.target)) {
-                    return `"${escapeString(stringValue, CharacterCodes.doubleQuote)}"`;
+            const nameType = symbol.nameType;
+            if (nameType) {
+                if (nameType.flags & TypeFlags.StringLiteral && !isIdentifierText((<StringLiteralType>nameType).value, compilerOptions.target)) {
+                    return `"${escapeString((<StringLiteralType>nameType).value, CharacterCodes.doubleQuote)}"`;
+                }
+                if (nameType && nameType.flags & TypeFlags.UniqueESSymbol) {
+                    return `[${getNameOfSymbolAsWritten((<UniqueESSymbolType>nameType).symbol, context)}]`;
                 }
             }
             return symbolName(symbol);
@@ -4175,14 +4225,17 @@ namespace ts {
                 else {
                     // Use explicitly specified property name ({ p: xxx } form), or otherwise the implied name ({ p } form)
                     const name = declaration.propertyName || <Identifier>declaration.name;
-                    if (isComputedNonLiteralName(name)) {
-                        // computed properties with non-literal names are treated as 'any'
+                    const isLate = isLateBindableName(name);
+                    const isWellKnown = isComputedPropertyName(name) && isWellKnownSymbolSyntactically(name.expression);
+                    if (!isLate && !isWellKnown && isComputedNonLiteralName(name)) {
                         return anyType;
                     }
 
                     // Use type of the specified property, or otherwise, for a numeric name, the type of the numeric index signature,
                     // or otherwise the type of the string index signature.
-                    const text = getTextOfPropertyName(name);
+                    const text = isLate ? getLateBoundNameFromType(checkComputedPropertyName(name as ComputedPropertyName) as LiteralType | UniqueESSymbolType) :
+                        isWellKnown ? getPropertyNameForKnownSymbolName(idText(((name as ComputedPropertyName).expression as PropertyAccessExpression).name)) :
+                        getTextOfPropertyName(name);
 
                     // Relax null check on ambient destructuring parameters, since the parameters have no implementation and are just documentation
                     if (strictNullChecks && declaration.flags & NodeFlags.Ambient && isParameterDeclaration(declaration)) {
@@ -4262,7 +4315,7 @@ namespace ts {
             // right hand expression is of a type parameter type.
             if (isVariableDeclaration(declaration) && declaration.parent.parent.kind === SyntaxKind.ForInStatement) {
                 const indexType = getIndexType(checkNonNullExpression(declaration.parent.parent.expression));
-                return indexType.flags & (TypeFlags.TypeParameter | TypeFlags.Index) ? indexType : stringType;
+                return indexType.flags & (TypeFlags.TypeParameter | TypeFlags.Index) ? getExtractStringType(indexType) : stringType;
             }
 
             if (isVariableDeclaration(declaration) && declaration.parent.parent.kind === SyntaxKind.ForOfStatement) {
@@ -4368,7 +4421,7 @@ namespace ts {
             for (const declaration of symbol.declarations) {
                 let declarationInConstructor = false;
                 const expression = declaration.kind === SyntaxKind.BinaryExpression ? <BinaryExpression>declaration :
-                    declaration.kind === SyntaxKind.PropertyAccessExpression ? <BinaryExpression>getAncestor(declaration, SyntaxKind.BinaryExpression) :
+                    declaration.kind === SyntaxKind.PropertyAccessExpression ? cast(declaration.parent, isBinaryExpression) :
                         undefined;
 
                 if (!expression) {
@@ -4899,8 +4952,7 @@ namespace ts {
         // in-place and returns the same array.
         function appendTypeParameters(typeParameters: TypeParameter[], declarations: ReadonlyArray<TypeParameterDeclaration>): TypeParameter[] {
             for (const declaration of declarations) {
-                const tp = getDeclaredTypeOfTypeParameter(getSymbolOfNode(declaration));
-                typeParameters = appendIfUnique(typeParameters, tp);
+                typeParameters = appendIfUnique(typeParameters, getDeclaredTypeOfTypeParameter(getSymbolOfNode(declaration)));
             }
             return typeParameters;
         }
@@ -4960,8 +5012,9 @@ namespace ts {
                 if (node.kind === SyntaxKind.InterfaceDeclaration || node.kind === SyntaxKind.ClassDeclaration ||
                     node.kind === SyntaxKind.ClassExpression || node.kind === SyntaxKind.TypeAliasDeclaration) {
                     const declaration = <InterfaceDeclaration | TypeAliasDeclaration>node;
-                    if (declaration.typeParameters) {
-                        result = appendTypeParameters(result, declaration.typeParameters);
+                    const typeParameters = getEffectiveTypeParameterDeclarations(declaration);
+                    if (typeParameters) {
+                        result = appendTypeParameters(result, typeParameters);
                     }
                 }
             }
@@ -5279,6 +5332,16 @@ namespace ts {
             return links.declaredType;
         }
 
+        function isStringConcatExpression(expr: Node): boolean {
+            if (expr.kind === SyntaxKind.StringLiteral) {
+                return true;
+            }
+            else if (expr.kind === SyntaxKind.BinaryExpression) {
+                return isStringConcatExpression((<BinaryExpression>expr).left) && isStringConcatExpression((<BinaryExpression>expr).right);
+            }
+            return false;
+        }
+
         function isLiteralEnumMember(member: EnumMember) {
             const expr = member.initializer;
             if (!expr) {
@@ -5293,6 +5356,8 @@ namespace ts {
                         (<PrefixUnaryExpression>expr).operand.kind === SyntaxKind.NumericLiteral;
                 case SyntaxKind.Identifier:
                     return nodeIsMissing(expr) || !!getSymbolOfNode(member.parent).exports.get((<Identifier>expr).escapedText);
+                case SyntaxKind.BinaryExpression:
+                    return isStringConcatExpression(expr);
                 default:
                     return false;
             }
@@ -5457,9 +5522,10 @@ namespace ts {
          */
         function isThislessFunctionLikeDeclaration(node: FunctionLikeDeclaration): boolean {
             const returnType = getEffectiveReturnTypeNode(node);
+            const typeParameters = getEffectiveTypeParameterDeclarations(node);
             return (node.kind === SyntaxKind.Constructor || (returnType && isThislessType(returnType))) &&
                 node.parameters.every(isThislessVariableLikeDeclaration) &&
-                (!node.typeParameters || node.typeParameters.every(isThislessTypeParameter));
+                (!typeParameters || typeParameters.every(isThislessTypeParameter));
         }
 
         /**
@@ -5653,13 +5719,7 @@ namespace ts {
                         error(decl.name || decl, Diagnostics.Duplicate_declaration_0, name);
                         lateSymbol = createSymbol(SymbolFlags.None, memberName, CheckFlags.Late);
                     }
-
-                    const symbolLinks = getSymbolLinks(lateSymbol);
-                    if (!symbolLinks.nameType) {
-                        // Retain link to name type so that it can be reused later
-                        symbolLinks.nameType = type;
-                    }
-
+                    lateSymbol.nameType = type;
                     addDeclarationToLateBoundSymbol(lateSymbol, decl, symbolFlags);
                     if (lateSymbol.parent) {
                         Debug.assert(lateSymbol.parent === parent, "Existing symbol parent should match new one");
@@ -6091,6 +6151,7 @@ namespace ts {
                 const checkFlags = CheckFlags.ReverseMapped | (readonlyMask && isReadonlySymbol(prop) ? CheckFlags.Readonly : 0);
                 const inferredProp = createSymbol(SymbolFlags.Property | prop.flags & optionalMask, prop.escapedName, checkFlags) as ReverseMappedSymbol;
                 inferredProp.declarations = prop.declarations;
+                inferredProp.nameType = prop.nameType;
                 inferredProp.propertyType = getTypeOfSymbol(prop);
                 inferredProp.mappedType = type.mappedType;
                 members.set(prop.escapedName, inferredProp);
@@ -6102,6 +6163,7 @@ namespace ts {
         function resolveMappedTypeMembers(type: MappedType) {
             const members: SymbolTable = createSymbolTable();
             let stringIndexInfo: IndexInfo;
+            let numberIndexInfo: IndexInfo;
             // Resolve upfront such that recursive references see an empty object type.
             setStructuredTypeMembers(type, emptySymbols, emptyArray, emptyArray, undefined, undefined);
             // In { [P in K]: T }, we refer to P as the type parameter type, K as the constraint type,
@@ -6112,15 +6174,19 @@ namespace ts {
             const modifiersType = getApparentType(getModifiersTypeFromMappedType(type)); // The 'T' in 'keyof T'
             const templateModifiers = getMappedTypeModifiers(type);
             const constraintDeclaration = type.declaration.typeParameter.constraint;
+            const include = keyofStringsOnly ? TypeFlags.StringLiteral : TypeFlags.StringOrNumberLiteralOrUnique;
             if (constraintDeclaration.kind === SyntaxKind.TypeOperator &&
                 (<TypeOperatorNode>constraintDeclaration).operator === SyntaxKind.KeyOfKeyword) {
                 // We have a { [P in keyof T]: X }
-                for (const propertySymbol of getPropertiesOfType(modifiersType)) {
-                    addMemberForKeyType(getLiteralTypeFromPropertyName(propertySymbol), propertySymbol);
+                for (const prop of getPropertiesOfType(modifiersType)) {
+                    addMemberForKeyType(getLiteralTypeFromPropertyName(prop, include), /*_index*/ undefined, prop);
                 }
                 if (modifiersType.flags & TypeFlags.Any || getIndexInfoOfType(modifiersType, IndexKind.String)) {
                     addMemberForKeyType(stringType);
                 }
+                if (!keyofStringsOnly && getIndexInfoOfType(modifiersType, IndexKind.Number)) {
+                    addMemberForKeyType(numberType);
+                }
             }
             else {
                 // First, if the constraint type is a type parameter, obtain the base constraint. Then,
@@ -6130,16 +6196,9 @@ namespace ts {
                 const iterationType = keyType.flags & TypeFlags.Index ? getIndexType(getApparentType((<IndexType>keyType).type)) : keyType;
                 forEachType(iterationType, addMemberForKeyType);
             }
-            setStructuredTypeMembers(type, members, emptyArray, emptyArray, stringIndexInfo, undefined);
+            setStructuredTypeMembers(type, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
 
-            function addMemberForKeyType(t: Type, propertySymbolOrIndex?: Symbol | number) {
-                let propertySymbol: Symbol;
-                // forEachType delegates to forEach, which calls with a numeric second argument
-                //  the type system currently doesn't catch this incompatibility, so we annotate
-                //  the function ourselves to indicate the runtime behavior and deal with it here
-                if (typeof propertySymbolOrIndex === "object") {
-                    propertySymbol = propertySymbolOrIndex;
-                }
+            function addMemberForKeyType(t: Type, _index?: number, origin?: Symbol) {
                 // Create a mapper from T to the current iteration type constituent. Then, if the
                 // mapped type is itself an instantiated type, combine the iteration mapper with the
                 // instantiation mapper.
@@ -6147,8 +6206,8 @@ namespace ts {
                 const propType = instantiateType(templateType, templateMapper);
                 // If the current iteration type constituent is a string literal type, create a property.
                 // Otherwise, for type string create a string index signature.
-                if (t.flags & TypeFlags.StringLiteral) {
-                    const propName = getLateBoundNameFromType(t as LiteralType | UniqueESSymbolType);
+                if (t.flags & TypeFlags.StringOrNumberLiteralOrUnique) {
+                    const propName = getLateBoundNameFromType(t as LiteralType);
                     const modifiersProp = getPropertyOfType(modifiersType, propName);
                     const isOptional = !!(templateModifiers & MappedTypeModifiers.IncludeOptional ||
                         !(templateModifiers & MappedTypeModifiers.ExcludeOptional) && modifiersProp && modifiersProp.flags & SymbolFlags.Optional);
@@ -6161,9 +6220,9 @@ namespace ts {
                     prop.type = strictNullChecks && isOptional && !isTypeAssignableTo(undefinedType, propType) ? getOptionalType(propType) :
                         strictNullChecks && !isOptional && modifiersProp && modifiersProp.flags & SymbolFlags.Optional ? getTypeWithFacts(propType, TypeFacts.NEUndefined) :
                         propType;
-                    if (propertySymbol) {
-                        prop.syntheticOrigin = propertySymbol;
-                        prop.declarations = propertySymbol.declarations;
+                    if (origin) {
+                        prop.syntheticOrigin = origin;
+                        prop.declarations = origin.declarations;
                     }
                     prop.nameType = t;
                     members.set(propName, prop);
@@ -6171,6 +6230,9 @@ namespace ts {
                 else if (t.flags & (TypeFlags.Any | TypeFlags.String)) {
                     stringIndexInfo = createIndexInfo(propType, !!(templateModifiers & MappedTypeModifiers.IncludeReadonly));
                 }
+                else if (t.flags & TypeFlags.Number) {
+                    numberIndexInfo = createIndexInfo(propType, !!(templateModifiers & MappedTypeModifiers.IncludeReadonly));
+                }
             }
         }
 
@@ -6350,18 +6412,10 @@ namespace ts {
         }
 
         function getConstraintOfIndexedAccess(type: IndexedAccessType) {
-            const transformed = getSimplifiedIndexedAccessType(type);
-            if (transformed) {
-                return transformed;
-            }
-            const baseObjectType = getBaseConstraintOfType(type.objectType);
-            const baseIndexType = getBaseConstraintOfType(type.indexType);
-            if (baseIndexType === stringType && !getIndexInfoOfType(baseObjectType || type.objectType, IndexKind.String)) {
-                // getIndexedAccessType returns `any` for X[string] where X doesn't have an index signature.
-                // to avoid this, return `undefined`.
-                return undefined;
-            }
-            return baseObjectType || baseIndexType ? getIndexedAccessType(baseObjectType || type.objectType, baseIndexType || type.indexType) : undefined;
+            const objectType = getBaseConstraintOfType(type.objectType) || type.objectType;
+            const indexType = getBaseConstraintOfType(type.indexType) || type.indexType;
+            const constraint = !isGenericObjectType(objectType) && !isGenericIndexType(indexType) ? getIndexedAccessType(objectType, indexType) : undefined;
+            return constraint && constraint !== unknownType ? constraint : undefined;
         }
 
         function getDefaultConstraintOfConditionalType(type: ConditionalType) {
@@ -6408,7 +6462,7 @@ namespace ts {
         function getBaseConstraintOfType(type: Type): Type {
             const constraint = getBaseConstraintOfInstantiableNonPrimitiveUnionOrIntersection(type);
             if (!constraint && type.flags & TypeFlags.Index) {
-                return stringType;
+                return keyofConstraintType;
             }
             return constraint;
         }
@@ -6443,7 +6497,7 @@ namespace ts {
                     circular = true;
                     return undefined;
                 }
-                const result = computeBaseConstraint(t);
+                const result = computeBaseConstraint(getSimplifiedType(t));
                 if (!popTypeResolution()) {
                     circular = true;
                     return undefined;
@@ -6472,13 +6526,9 @@ namespace ts {
                             undefined;
                 }
                 if (t.flags & TypeFlags.Index) {
-                    return stringType;
+                    return keyofConstraintType;
                 }
                 if (t.flags & TypeFlags.IndexedAccess) {
-                    const transformed = getSimplifiedIndexedAccessType(<IndexedAccessType>t);
-                    if (transformed) {
-                        return getBaseConstraint(transformed);
-                    }
                     const baseObjectType = getBaseConstraint((<IndexedAccessType>t).objectType);
                     const baseIndexType = getBaseConstraint((<IndexedAccessType>t).indexType);
                     const baseIndexedAccess = baseObjectType && baseIndexType ? getIndexedAccessType(baseObjectType, baseIndexType) : undefined;
@@ -6562,6 +6612,7 @@ namespace ts {
                 t.flags & TypeFlags.BooleanLike ? globalBooleanType :
                 t.flags & TypeFlags.ESSymbolLike ? getGlobalESSymbolType(/*reportErrors*/ languageVersion >= ScriptTarget.ES2015) :
                 t.flags & TypeFlags.NonPrimitive ? emptyObjectType :
+                t.flags & TypeFlags.Index ? keyofConstraintType :
                 t;
         }
 
@@ -6601,25 +6652,30 @@ namespace ts {
             if (props.length === 1 && !(checkFlags & CheckFlags.Partial)) {
                 return props[0];
             }
-            const propTypes: Type[] = [];
-            const declarations: Declaration[] = [];
+            let declarations: Declaration[];
             let commonType: Type;
+            let nameType: Type;
+            const propTypes: Type[] = [];
+            let first = true;
             for (const prop of props) {
-                if (prop.declarations) {
-                    addRange(declarations, prop.declarations);
-                }
+                declarations = addRange(declarations, prop.declarations);
                 const type = getTypeOfSymbol(prop);
-                if (!commonType) {
+                if (first) {
                     commonType = type;
+                    nameType = prop.nameType;
+                    first = false;
                 }
-                else if (type !== commonType) {
-                    checkFlags |= CheckFlags.HasNonUniformType;
+                else {
+                    if (type !== commonType) {
+                        checkFlags |= CheckFlags.HasNonUniformType;
+                    }
                 }
                 propTypes.push(type);
             }
             const result = createSymbol(SymbolFlags.Property | commonFlags, name, syntheticFlag | checkFlags);
             result.containingType = containingType;
             result.declarations = declarations;
+            result.nameType = nameType;
             result.type = isUnion ? getUnionType(propTypes) : getIntersectionType(propTypes);
             return result;
         }
@@ -6737,8 +6793,7 @@ namespace ts {
         function getTypeParametersFromDeclaration(declaration: DeclarationWithTypeParameters): TypeParameter[] {
             let result: TypeParameter[];
             forEach(getEffectiveTypeParameterDeclarations(declaration), node => {
-                const tp = getDeclaredTypeOfTypeParameter(node.symbol);
-                result = appendIfUnique(result, tp);
+                result = appendIfUnique(result, getDeclaredTypeOfTypeParameter(node.symbol));
             });
             return result;
         }
@@ -7242,7 +7297,8 @@ namespace ts {
         }
 
         function getConstraintDeclaration(type: TypeParameter) {
-            return type.symbol && getDeclarationOfKind<TypeParameterDeclaration>(type.symbol, SyntaxKind.TypeParameter).constraint;
+            const decl = type.symbol && getDeclarationOfKind<TypeParameterDeclaration>(type.symbol, SyntaxKind.TypeParameter);
+            return decl && decl.constraint;
         }
 
         function getInferredTypeParameterConstraint(typeParameter: TypeParameter) {
@@ -7549,7 +7605,7 @@ namespace ts {
             return constraints ? getSubstitutionType(typeVariable, getIntersectionType(append(constraints, typeVariable))) : typeVariable;
         }
 
-        function isJSDocTypeReference(node: NodeWithTypeArguments): node is TypeReferenceNode {
+        function isJSDocTypeReference(node: Node): node is TypeReferenceNode {
             return node.flags & NodeFlags.JSDoc && node.kind === SyntaxKind.TypeReference;
         }
 
@@ -7762,6 +7818,10 @@ namespace ts {
             return symbol && <GenericType>getTypeOfGlobalSymbol(symbol, arity);
         }
 
+        function getGlobalExtractSymbol(): Symbol {
+            return deferredGlobalExtractSymbol || (deferredGlobalExtractSymbol = getGlobalSymbol("Extract" as __String, SymbolFlags.TypeAlias, Diagnostics.Cannot_find_global_type_0));
+        }
+
         /**
          * Instantiates a global type that is generic with some element type, and returns that instantiation.
          */
@@ -8196,53 +8256,67 @@ namespace ts {
             return links.resolvedType;
         }
 
-        function getIndexTypeForGenericType(type: InstantiableType | UnionOrIntersectionType, includeDeclaredTypes?: boolean) {
-            const cacheLocation = includeDeclaredTypes ? "resolvedDeclaredIndexType" : "resolvedIndexType";
-            if (!type[cacheLocation]) {
-                type[cacheLocation] = <IndexType>createType(TypeFlags.Index);
-                type[cacheLocation].type = type;
-                if (includeDeclaredTypes) {
-                    type[cacheLocation].isDeclaredType = true;
-                }
-            }
-            return type[cacheLocation];
+        function createIndexType(type: InstantiableType | UnionOrIntersectionType, stringsOnly: boolean) {
+            const result = <IndexType>createType(TypeFlags.Index);
+            result.type = type;
+            result.stringsOnly = stringsOnly;
+            return result;
         }
 
-        function getLiteralTypeFromPropertyName(prop: Symbol) {
-            const links = getSymbolLinks(getLateBoundSymbol(prop));
-            if (!links.nameType) {
-                if (links.target && links.target !== unknownSymbol && links.target !== resolvingSymbol && links.target.escapedName === prop.escapedName) {
-                    links.nameType = getLiteralTypeFromPropertyName(links.target);
-                }
-                else {
-                    links.nameType = getDeclarationModifierFlagsFromSymbol(prop) & ModifierFlags.NonPublicAccessibilityModifier || isKnownSymbol(prop) ?
-                        neverType :
+        function getIndexTypeForGenericType(type: InstantiableType | UnionOrIntersectionType, stringsOnly: boolean) {
+            return stringsOnly ?
+                type.resolvedStringIndexType || (type.resolvedStringIndexType = createIndexType(type, /*stringsOnly*/ true)) :
+                type.resolvedIndexType || (type.resolvedIndexType = createIndexType(type, /*stringsOnly*/ false));
+        }
+
+        function getLiteralTypeFromPropertyName(prop: Symbol, include: TypeFlags) {
+            if (!(getDeclarationModifierFlagsFromSymbol(prop) & ModifierFlags.NonPublicAccessibilityModifier)) {
+                let type = getLateBoundSymbol(prop).nameType;
+                if (!type && !isKnownSymbol(prop)) {
+                    const name = getNameOfDeclaration(prop.valueDeclaration);
+                    type = name && isNumericLiteral(name) ? getLiteralType(+name.text) :
+                        name && name.kind === SyntaxKind.ComputedPropertyName && isNumericLiteral(name.expression) ? getLiteralType(+name.expression.text) :
                         getLiteralType(symbolName(prop));
                 }
+                if (type && type.flags & include) {
+                    return type;
+                }
             }
-            return links.nameType;
+            return neverType;
         }
 
-        function isTypeString(type: Type) {
-            return isTypeAssignableToKind(type, TypeFlags.StringLike);
+        function getLiteralTypeFromPropertyNames(type: Type, include: TypeFlags) {
+            return getUnionType(map(getPropertiesOfType(type), t => getLiteralTypeFromPropertyName(t, include)));
         }
 
-        function getLiteralTypeFromPropertyNames(type: Type, includeDeclaredTypes?: boolean) {
-            const originalKeys = map(getPropertiesOfType(type), getLiteralTypeFromPropertyName);
-            return getUnionType(includeDeclaredTypes ? originalKeys : filter(originalKeys, isTypeString));
+        function getNonEnumNumberIndexInfo(type: Type) {
+            const numberIndexInfo = getIndexInfoOfType(type, IndexKind.Number);
+            return numberIndexInfo !== enumNumberIndexInfo ? numberIndexInfo : undefined;
         }
 
-        function getIndexType(type: Type, includeDeclaredTypes?: boolean): Type {
-            return type.flags & TypeFlags.Intersection ? getUnionType(map((<IntersectionType>type).types, t => getIndexType(t, includeDeclaredTypes))) :
-                maybeTypeOfKind(type, TypeFlags.InstantiableNonPrimitive) ? getIndexTypeForGenericType(<InstantiableType | UnionOrIntersectionType>type, includeDeclaredTypes) :
+        function getIndexType(type: Type, stringsOnly = keyofStringsOnly): Type {
+            return type.flags & TypeFlags.Union ? getIntersectionType(map((<IntersectionType>type).types, t => getIndexType(t, stringsOnly))) :
+                type.flags & TypeFlags.Intersection ? getUnionType(map((<IntersectionType>type).types, t => getIndexType(t, stringsOnly))) :
+                maybeTypeOfKind(type, TypeFlags.InstantiableNonPrimitive) ? getIndexTypeForGenericType(<InstantiableType | UnionOrIntersectionType>type, stringsOnly) :
                 getObjectFlags(type) & ObjectFlags.Mapped ? getConstraintTypeFromMappedType(<MappedType>type) :
                 type === wildcardType ? wildcardType :
-                type.flags & TypeFlags.Any || getIndexInfoOfType(type, IndexKind.String) ? stringType :
-                getLiteralTypeFromPropertyNames(type, includeDeclaredTypes);
+                type.flags & TypeFlags.Any ? keyofConstraintType :
+                stringsOnly ? getIndexInfoOfType(type, IndexKind.String) ? stringType : getLiteralTypeFromPropertyNames(type, TypeFlags.StringLiteral) :
+                getIndexInfoOfType(type, IndexKind.String) ? getUnionType([stringType, numberType, getLiteralTypeFromPropertyNames(type, TypeFlags.UniqueESSymbol)]) :
+                getNonEnumNumberIndexInfo(type) ? getUnionType([numberType, getLiteralTypeFromPropertyNames(type, TypeFlags.StringLiteral | TypeFlags.UniqueESSymbol)]) :
+                getLiteralTypeFromPropertyNames(type, TypeFlags.StringOrNumberLiteralOrUnique);
+        }
+
+        function getExtractStringType(type: Type) {
+            if (keyofStringsOnly) {
+                return type;
+            }
+            const extractTypeAlias = getGlobalExtractSymbol();
+            return extractTypeAlias ? getTypeAliasInstantiation(extractTypeAlias, [type, stringType]) : stringType;
         }
 
         function getIndexTypeOrString(type: Type): Type {
-            const indexType = getIndexType(type);
+            const indexType = getExtractStringType(getIndexType(type));
             return indexType.flags & TypeFlags.Never ? stringType : indexType;
         }
 
@@ -8300,7 +8374,11 @@ namespace ts {
                     getIndexInfoOfType(objectType, IndexKind.String) ||
                     undefined;
                 if (indexInfo) {
-                    if (accessExpression && indexInfo.isReadonly && (isAssignmentTarget(accessExpression) || isDeleteTarget(accessExpression))) {
+                    if (accessNode && !isTypeAssignableToKind(indexType, TypeFlags.String | TypeFlags.Number)) {
+                        const indexNode = accessNode.kind === SyntaxKind.ElementAccessExpression ? accessNode.argumentExpression : accessNode.indexType;
+                        error(indexNode, Diagnostics.Type_0_cannot_be_used_as_an_index_type, typeToString(indexType));
+                    }
+                    else if (accessExpression && indexInfo.isReadonly && (isAssignmentTarget(accessExpression) || isDeleteTarget(accessExpression))) {
                         error(accessExpression, Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
                     }
                     return indexInfo.type;
@@ -8331,9 +8409,8 @@ namespace ts {
                 else {
                     error(indexNode, Diagnostics.Type_0_cannot_be_used_as_an_index_type, typeToString(indexType));
                 }
-                return unknownType;
             }
-            return anyType;
+            return unknownType;
         }
 
         function isGenericObjectType(type: Type): boolean {
@@ -8360,8 +8437,12 @@ namespace ts {
             return getObjectFlags(type) & ObjectFlags.Mapped && getTemplateTypeFromMappedType(type as MappedType) === neverType;
         }
 
+        function getSimplifiedType(type: Type): Type {
+            return type.flags & TypeFlags.IndexedAccess ? getSimplifiedIndexedAccessType(<IndexedAccessType>type) : type;
+        }
+
         // Transform an indexed access to a simpler form, if possible. Return the simpler form, or return
-        // undefined if no transformation is possible.
+        // the type itself if no transformation is possible.
         function getSimplifiedIndexedAccessType(type: IndexedAccessType): Type {
             const objectType = type.objectType;
             if (objectType.flags & TypeFlags.Intersection && isGenericObjectType(objectType)) {
@@ -8381,7 +8462,7 @@ namespace ts {
                         }
                     }
                     return getUnionType([
-                        getIndexedAccessType(getIntersectionType(regularTypes), type.indexType),
+                        getSimplifiedType(getIndexedAccessType(getIntersectionType(regularTypes), type.indexType)),
                         getIntersectionType(stringIndexTypes)
                     ]);
                 }
@@ -8391,13 +8472,13 @@ namespace ts {
                 // eventually anyway, but it easier to reason about.
                 if (some((<IntersectionType>objectType).types, isMappedTypeToNever)) {
                     const nonNeverTypes = filter((<IntersectionType>objectType).types, t => !isMappedTypeToNever(t));
-                    return getIndexedAccessType(getIntersectionType(nonNeverTypes), type.indexType);
+                    return getSimplifiedType(getIndexedAccessType(getIntersectionType(nonNeverTypes), type.indexType));
                 }
             }
-
             // If the object type is a mapped type { [P in K]: E }, where K is generic, instantiate E using a mapper
             // that substitutes the index type for P. For example, for an index access { [P in K]: Box<T[P]> }[X], we
-            // construct the type Box<T[X]>.
+            // construct the type Box<T[X]>. We do not further simplify the result because mapped types can be recursive
+            // and we might never terminate.
             if (isGenericMappedType(objectType)) {
                 return substituteIndexedMappedType(objectType, type);
             }
@@ -8407,7 +8488,7 @@ namespace ts {
                     return substituteIndexedMappedType(constraint, type);
                 }
             }
-            return undefined;
+            return type;
         }
 
         function substituteIndexedMappedType(objectType: MappedType, type: IndexedAccessType) {
@@ -8740,7 +8821,7 @@ namespace ts {
             if (right.flags & TypeFlags.Union) {
                 return mapType(right, t => getSpreadType(left, t, symbol, typeFlags, objectFlags));
             }
-            if (right.flags & (TypeFlags.BooleanLike | TypeFlags.NumberLike | TypeFlags.StringLike | TypeFlags.EnumLike | TypeFlags.NonPrimitive)) {
+            if (right.flags & (TypeFlags.BooleanLike | TypeFlags.NumberLike | TypeFlags.StringLike | TypeFlags.EnumLike | TypeFlags.NonPrimitive | TypeFlags.Index)) {
                 return left;
             }
 
@@ -8786,6 +8867,7 @@ namespace ts {
                         result.leftSpread = leftProp;
                         result.rightSpread = rightProp;
                         result.declarations = declarations;
+                        result.nameType = leftProp.nameType;
                         members.set(leftProp.escapedName, result);
                     }
                 }
@@ -8814,6 +8896,7 @@ namespace ts {
             const result = createSymbol(flags, prop.escapedName);
             result.type = getTypeOfSymbol(prop);
             result.declarations = prop.declarations;
+            result.nameType = prop.nameType;
             result.syntheticOrigin = prop;
             return result;
         }
@@ -9159,8 +9242,13 @@ namespace ts {
             if (symbol.valueDeclaration) {
                 result.valueDeclaration = symbol.valueDeclaration;
             }
-            if ((symbol as TransientSymbol).isRestParameter) {
-                result.isRestParameter = (symbol as TransientSymbol).isRestParameter;
+            if (symbol.nameType) {
+                result.nameType = symbol.nameType;
+            }
+            if (isTransientSymbol(symbol)) {
+                if (symbol.isRestParameter) {
+                    result.isRestParameter = symbol.isRestParameter;
+                }
             }
             return result;
         }
@@ -9176,10 +9264,15 @@ namespace ts {
                 // aren't the right hand side of a generic type alias declaration we optimize by reducing the
                 // set of type parameters to those that are possibly referenced in the literal.
                 const declaration = symbol.declarations[0];
-                const outerTypeParameters = getOuterTypeParameters(declaration, /*includeThisTypes*/ true) || emptyArray;
+                let outerTypeParameters = getOuterTypeParameters(declaration, /*includeThisTypes*/ true);
+                if (isJavaScriptConstructor(declaration)) {
+                    const templateTagParameters = getTypeParametersFromDeclaration(declaration as DeclarationWithTypeParameters);
+                    outerTypeParameters = addRange(outerTypeParameters, templateTagParameters);
+                }
+                typeParameters = outerTypeParameters || emptyArray;
                 typeParameters = symbol.flags & SymbolFlags.TypeLiteral && !target.aliasTypeArguments ?
-                    filter(outerTypeParameters, tp => isTypeParameterPossiblyReferenced(tp, declaration)) :
-                    outerTypeParameters;
+                    filter(typeParameters, tp => isTypeParameterPossiblyReferenced(tp, declaration)) :
+                    typeParameters;
                 links.outerTypeParameters = typeParameters;
                 if (typeParameters.length) {
                     links.instantiations = createMap<Type>();
@@ -9961,6 +10054,12 @@ namespace ts {
                 if (target.flags & TypeFlags.Substitution) {
                     target = (<SubstitutionType>target).typeVariable;
                 }
+                if (source.flags & TypeFlags.IndexedAccess) {
+                    source = getSimplifiedType(source);
+                }
+                if (target.flags & TypeFlags.IndexedAccess) {
+                    target = getSimplifiedType(target);
+                }
 
                 // both types are the same - covers 'they are the same primitive type or both are Any' or the same type parameter cases
                 if (source === target) return Ternary.True;
@@ -10414,15 +10513,15 @@ namespace ts {
                     // constraint of T.
                     const constraint = getConstraintForRelation((<IndexType>target).type);
                     if (constraint) {
-                        if (result = isRelatedTo(source, getIndexType(constraint, (target as IndexType).isDeclaredType), reportErrors)) {
+                        if (result = isRelatedTo(source, getIndexType(constraint, (target as IndexType).stringsOnly), reportErrors)) {
                             return result;
                         }
                     }
                 }
                 else if (target.flags & TypeFlags.IndexedAccess) {
-                    // A type S is related to a type T[K] if S is related to A[K], where K is string-like and
-                    // A is the apparent type of T.
-                    const constraint = getConstraintForRelation(<IndexedAccessType>target);
+                    // A type S is related to a type T[K] if S is related to C, where C is the
+                    // constraint of T[K]
+                    const constraint = getConstraintForRelation(target);
                     if (constraint) {
                         if (result = isRelatedTo(source, constraint, reportErrors)) {
                             errorInfo = saveErrorInfo;
@@ -10435,21 +10534,21 @@ namespace ts {
                     const template = getTemplateTypeFromMappedType(target);
                     const modifiers = getMappedTypeModifiers(target);
                     if (!(modifiers & MappedTypeModifiers.ExcludeOptional)) {
-                    if (template.flags & TypeFlags.IndexedAccess && (<IndexedAccessType>template).objectType === source &&
-                        (<IndexedAccessType>template).indexType === getTypeParameterFromMappedType(target)) {
-                        return Ternary.True;
-                    }
-                    // A source type T is related to a target type { [P in keyof T]: X } if T[P] is related to X.
-                    if (!isGenericMappedType(source) && getConstraintTypeFromMappedType(target) === getIndexType(source)) {
-                        const indexedAccessType = getIndexedAccessType(source, getTypeParameterFromMappedType(target));
-                        const templateType = getTemplateTypeFromMappedType(target);
-                        if (result = isRelatedTo(indexedAccessType, templateType, reportErrors)) {
-                            errorInfo = saveErrorInfo;
-                            return result;
+                        if (template.flags & TypeFlags.IndexedAccess && (<IndexedAccessType>template).objectType === source &&
+                            (<IndexedAccessType>template).indexType === getTypeParameterFromMappedType(target)) {
+                            return Ternary.True;
+                        }
+                        // A source type T is related to a target type { [P in keyof T]: X } if T[P] is related to X.
+                        if (!isGenericMappedType(source) && getConstraintTypeFromMappedType(target) === getIndexType(source)) {
+                            const indexedAccessType = getIndexedAccessType(source, getTypeParameterFromMappedType(target));
+                            const templateType = getTemplateTypeFromMappedType(target);
+                            if (result = isRelatedTo(indexedAccessType, templateType, reportErrors)) {
+                                errorInfo = saveErrorInfo;
+                                return result;
+                            }
                         }
                     }
                 }
-                }
 
                 if (source.flags & TypeFlags.TypeParameter) {
                     let constraint = getConstraintForRelation(<TypeParameter>source);
@@ -10467,16 +10566,8 @@ namespace ts {
                     }
                 }
                 else if (source.flags & TypeFlags.IndexedAccess) {
-                    // A type S[K] is related to a type T if A[K] is related to T, where K is string-like and
-                    // A is the apparent type of S.
-                    const constraint = getConstraintForRelation(<IndexedAccessType>source);
-                    if (constraint) {
-                        if (result = isRelatedTo(constraint, target, reportErrors)) {
-                            errorInfo = saveErrorInfo;
-                            return result;
-                        }
-                    }
-                    else if (target.flags & TypeFlags.IndexedAccess) {
+                    if (target.flags & TypeFlags.IndexedAccess) {
+                        // A type S[K] is related to a type T[J] if S is related to T and K is related to J.
                         if (result = isRelatedTo((<IndexedAccessType>source).objectType, (<IndexedAccessType>target).objectType, reportErrors)) {
                             result &= isRelatedTo((<IndexedAccessType>source).indexType, (<IndexedAccessType>target).indexType, reportErrors);
                         }
@@ -10485,6 +10576,21 @@ namespace ts {
                             return result;
                         }
                     }
+                    // A type S[K] is related to a type T if C is related to T, where C is the
+                    // constraint of S[K].
+                    const constraint = getConstraintForRelation(<IndexedAccessType>source);
+                    if (constraint) {
+                        if (result = isRelatedTo(constraint, target, reportErrors)) {
+                            errorInfo = saveErrorInfo;
+                            return result;
+                        }
+                    }
+                }
+                else if (source.flags & TypeFlags.Index) {
+                    if (result = isRelatedTo(keyofConstraintType, target, reportErrors)) {
+                        errorInfo = saveErrorInfo;
+                        return result;
+                    }
                 }
                 else if (source.flags & TypeFlags.Conditional) {
                     if (target.flags & TypeFlags.Conditional) {
@@ -10877,8 +10983,7 @@ namespace ts {
                         continue;
                     }
                     // Skip over symbol-named members
-                    const nameType = getLiteralTypeFromPropertyName(prop);
-                    if (nameType !== undefined && !(isRelatedTo(nameType, stringType) || isRelatedTo(nameType, numberType))) {
+                    if (prop.nameType && prop.nameType.flags & TypeFlags.UniqueESSymbol) {
                         continue;
                     }
                     if (kind === IndexKind.String || isNumericLiteralName(prop.escapedName)) {
@@ -11481,6 +11586,9 @@ namespace ts {
             if (source.valueDeclaration) {
                 symbol.valueDeclaration = source.valueDeclaration;
             }
+            if (source.nameType) {
+                symbol.nameType = source.nameType;
+            }
             return symbol;
         }
 
@@ -11523,7 +11631,7 @@ namespace ts {
         }
 
         function createWideningContext(parent: WideningContext, propertyName: __String, siblings: Type[]): WideningContext {
-            return { parent, propertyName, siblings, resolvedPropertyNames: undefined };
+            return { parent, propertyName, siblings, resolvedProperties: undefined };
         }
 
         function getSiblingsOfContext(context: WideningContext): Type[] {
@@ -11544,19 +11652,19 @@ namespace ts {
             return context.siblings;
         }
 
-        function getPropertyNamesOfContext(context: WideningContext): __String[] {
-            if (!context.resolvedPropertyNames) {
-                const names = createMap<boolean>() as UnderscoreEscapedMap<boolean>;
+        function getPropertiesOfContext(context: WideningContext): Symbol[] {
+            if (!context.resolvedProperties) {
+                const names = createMap<Symbol>() as UnderscoreEscapedMap<Symbol>;
                 for (const t of getSiblingsOfContext(context)) {
                     if (isObjectLiteralType(t) && !(getObjectFlags(t) & ObjectFlags.ContainsSpread)) {
                         for (const prop of getPropertiesOfType(t)) {
-                            names.set(prop.escapedName, true);
+                            names.set(prop.escapedName, prop);
                         }
                     }
                 }
-                context.resolvedPropertyNames = arrayFrom(names.keys());
+                context.resolvedProperties = arrayFrom(names.values());
             }
-            return context.resolvedPropertyNames;
+            return context.resolvedProperties;
         }
 
         function getWidenedProperty(prop: Symbol, context: WideningContext): Symbol {
@@ -11566,18 +11674,14 @@ namespace ts {
             return widened === original ? prop : createSymbolWithType(prop, widened);
         }
 
-        function getUndefinedProperty(name: __String) {
-            const cached = undefinedProperties.get(name);
+        function getUndefinedProperty(prop: Symbol) {
+            const cached = undefinedProperties.get(prop.escapedName);
             if (cached) {
                 return cached;
             }
-            const result = createSymbol(SymbolFlags.Property | SymbolFlags.Optional, name);
-            result.type = undefinedType;
-            const associatedKeyType = getLiteralType(unescapeLeadingUnderscores(name));
-            if (associatedKeyType.flags & TypeFlags.StringLiteral) {
-                result.nameType = associatedKeyType;
-            }
-            undefinedProperties.set(name, result);
+            const result = createSymbolWithType(prop, undefinedType);
+            result.flags |= SymbolFlags.Optional;
+            undefinedProperties.set(prop.escapedName, result);
             return result;
         }
 
@@ -11589,9 +11693,9 @@ namespace ts {
                 members.set(prop.escapedName, prop.flags & SymbolFlags.Property ? getWidenedProperty(prop, context) : prop);
             }
             if (context) {
-                for (const name of getPropertyNamesOfContext(context)) {
-                    if (!members.has(name)) {
-                        members.set(name, getUndefinedProperty(name));
+                for (const prop of getPropertiesOfContext(context)) {
+                    if (!members.has(prop.escapedName)) {
+                        members.set(prop.escapedName, getUndefinedProperty(prop));
                     }
                 }
             }
@@ -12348,14 +12452,13 @@ namespace ts {
                     inferredType = getTypeFromInference(inference);
                 }
 
-                inferredType = getWidenedUniqueESSymbolType(inferredType);
                 inference.inferredType = inferredType;
 
                 const constraint = getConstraintOfTypeParameter(inference.typeParameter);
                 if (constraint) {
                     const instantiatedConstraint = instantiateType(constraint, context);
                     if (!context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
-                        inference.inferredType = inferredType = getWidenedUniqueESSymbolType(instantiatedConstraint);
+                        inference.inferredType = inferredType = instantiatedConstraint;
                     }
                 }
             }
@@ -13884,7 +13987,8 @@ namespace ts {
             const assignmentKind = getAssignmentTargetKind(node);
 
             if (assignmentKind) {
-                if (!(localOrExportSymbol.flags & SymbolFlags.Variable)) {
+                if (!(localOrExportSymbol.flags & SymbolFlags.Variable) &&
+                    !(isInJavaScriptFile(node) && localOrExportSymbol.flags & SymbolFlags.ValueModule)) {
                     error(node, Diagnostics.Cannot_assign_to_0_because_it_is_not_a_variable, symbolToString(symbol));
                     return unknownType;
                 }
@@ -15298,7 +15402,7 @@ namespace ts {
                 // type, and any union of these types (like string | number).
                 if (links.resolvedType.flags & TypeFlags.Nullable ||
                     !isTypeAssignableToKind(links.resolvedType, TypeFlags.StringLike | TypeFlags.NumberLike | TypeFlags.ESSymbolLike) &&
-                    !isTypeAssignableTo(links.resolvedType, getUnionType([stringType, numberType, esSymbolType]))) {
+                    !isTypeAssignableTo(links.resolvedType, stringNumberSymbolType)) {
                     error(node, Diagnostics.A_computed_property_name_must_be_of_type_string_number_symbol_or_any);
                 }
                 else {
@@ -15339,6 +15443,7 @@ namespace ts {
             let patternWithComputedProperties = false;
             let hasComputedStringProperty = false;
             let hasComputedNumberProperty = false;
+
             if (isInJSFile && node.properties.length === 0) {
                 // an empty JS object literal that nonetheless has members is a JS namespace
                 const symbol = getSymbolOfNode(node);
@@ -15354,47 +15459,28 @@ namespace ts {
             for (let i = 0; i < node.properties.length; i++) {
                 const memberDecl = node.properties[i];
                 let member = getSymbolOfNode(memberDecl);
-                let literalName: __String | undefined;
+                const computedNameType = memberDecl.name && memberDecl.name.kind === SyntaxKind.ComputedPropertyName && !isWellKnownSymbolSyntactically(memberDecl.name.expression) ?
+                    checkComputedPropertyName(memberDecl.name) : undefined;
                 if (memberDecl.kind === SyntaxKind.PropertyAssignment ||
                     memberDecl.kind === SyntaxKind.ShorthandPropertyAssignment ||
                     isObjectLiteralMethod(memberDecl)) {
-                    let jsdocType: Type;
+                    let type = memberDecl.kind === SyntaxKind.PropertyAssignment ? checkPropertyAssignment(memberDecl, checkMode) :
+                        memberDecl.kind === SyntaxKind.ShorthandPropertyAssignment ? checkExpressionForMutableLocation(memberDecl.name, checkMode) :
+                        checkObjectLiteralMethod(memberDecl, checkMode);
                     if (isInJSFile) {
-                        jsdocType = getTypeForDeclarationFromJSDocComment(memberDecl);
-                    }
-
-                    let type: Type;
-                    if (memberDecl.kind === SyntaxKind.PropertyAssignment) {
-                        if (memberDecl.name.kind === SyntaxKind.ComputedPropertyName) {
-                            const t = checkComputedPropertyName(memberDecl.name);
-                            if (t.flags & TypeFlags.Literal) {
-                                literalName = escapeLeadingUnderscores("" + (t as LiteralType).value);
-                            }
+                        const jsDocType = getTypeForDeclarationFromJSDocComment(memberDecl);
+                        if (jsDocType) {
+                            checkTypeAssignableTo(type, jsDocType, memberDecl);
+                            type = jsDocType;
                         }
-                        type = checkPropertyAssignment(memberDecl, checkMode);
                     }
-                    else if (memberDecl.kind === SyntaxKind.MethodDeclaration) {
-                        type = checkObjectLiteralMethod(memberDecl, checkMode);
-                    }
-                    else {
-                        Debug.assert(memberDecl.kind === SyntaxKind.ShorthandPropertyAssignment);
-                        type = checkExpressionForMutableLocation(memberDecl.name, checkMode);
-                    }
-
-                    if (jsdocType) {
-                        checkTypeAssignableTo(type, jsdocType, memberDecl);
-                        type = jsdocType;
-                    }
-
                     typeFlags |= type.flags;
-
-                    const nameType = hasLateBindableName(memberDecl) ? checkComputedPropertyName(memberDecl.name) : undefined;
-                    const hasLateBoundName = nameType && isTypeUsableAsLateBoundName(nameType);
-                    const prop = hasLateBoundName
-                        ? createSymbol(SymbolFlags.Property | member.flags, getLateBoundNameFromType(nameType as LiteralType | UniqueESSymbolType), CheckFlags.Late)
-                        : createSymbol(SymbolFlags.Property | member.flags, literalName || member.escapedName);
-
-                    if (hasLateBoundName) {
+                    const nameType = computedNameType && computedNameType.flags & TypeFlags.StringOrNumberLiteralOrUnique ?
+                        <LiteralType | UniqueESSymbolType>computedNameType : undefined;
+                    const prop = nameType ?
+                        createSymbol(SymbolFlags.Property | member.flags, getLateBoundNameFromType(nameType), CheckFlags.Late) :
+                        createSymbol(SymbolFlags.Property | member.flags, member.escapedName);
+                    if (nameType) {
                         prop.nameType = nameType;
                     }
 
@@ -15407,9 +15493,6 @@ namespace ts {
                         if (isOptional) {
                             prop.flags |= SymbolFlags.Optional;
                         }
-                        if (!literalName && hasDynamicName(memberDecl)) {
-                            patternWithComputedProperties = true;
-                        }
                     }
                     else if (contextualTypeHasPattern && !(getObjectFlags(contextualType) & ObjectFlags.ObjectLiteralPatternWithComputedProperties)) {
                         // If object literal is contextually typed by the implied type of a binding pattern, and if the
@@ -15465,12 +15548,17 @@ namespace ts {
                     checkNodeDeferred(memberDecl);
                 }
 
-                if (!literalName && hasNonBindableDynamicName(memberDecl)) {
-                    if (isNumericName(memberDecl.name)) {
-                        hasComputedNumberProperty = true;
-                    }
-                    else {
-                        hasComputedStringProperty = true;
+                if (computedNameType && !(computedNameType.flags & TypeFlags.StringOrNumberLiteralOrUnique)) {
+                    if (isTypeAssignableTo(computedNameType, stringNumberSymbolType)) {
+                        if (isTypeAssignableTo(computedNameType, numberType)) {
+                            hasComputedNumberProperty = true;
+                        }
+                        else {
+                            hasComputedStringProperty = true;
+                        }
+                        if (inDestructuringPattern) {
+                            patternWithComputedProperties = true;
+                        }
                     }
                 }
                 else {
@@ -17754,11 +17842,11 @@ namespace ts {
 
             let typeArguments: NodeArray<TypeNode>;
 
-            if (!isTaggedTemplate && !isDecorator && !isJsxOpeningOrSelfClosingElement) {
+            if (!isDecorator && !isJsxOpeningOrSelfClosingElement) {
                 typeArguments = (<CallExpression>node).typeArguments;
 
                 // We already perform checking on the type arguments on the class declaration itself.
-                if ((<CallExpression>node).expression.kind !== SyntaxKind.SuperKeyword) {
+                if (isTaggedTemplate || (<CallExpression>node).expression.kind !== SyntaxKind.SuperKeyword) {
                     forEach(typeArguments, checkSourceElement);
                 }
             }
@@ -17871,7 +17959,7 @@ namespace ts {
                 checkApplicableSignature(node, args, candidateForArgumentError, assignableRelation, /*excludeArgument*/ undefined, /*reportErrors*/ true);
             }
             else if (candidateForTypeArgumentError) {
-                checkTypeArguments(candidateForTypeArgumentError, (node as CallExpression).typeArguments, /*reportErrors*/ true, fallbackError);
+                checkTypeArguments(candidateForTypeArgumentError, (node as CallExpression | TaggedTemplateExpression).typeArguments, /*reportErrors*/ true, fallbackError);
             }
             else if (typeArguments && every(signatures, sig => length(sig.typeParameters) !== typeArguments.length)) {
                 diagnostics.add(getTypeArgumentArityError(node, signatures, typeArguments));
@@ -18538,7 +18626,7 @@ namespace ts {
                     }
                     const type = funcSymbol && getJavaScriptClassType(funcSymbol);
                     if (type) {
-                        return type;
+                        return signature.target ? instantiateType(type, signature.mapper) : type;
                     }
                     if (noImplicitAny) {
                         error(node, Diagnostics.new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type);
@@ -18665,6 +18753,7 @@ namespace ts {
         }
 
         function checkTaggedTemplateExpression(node: TaggedTemplateExpression): Type {
+            checkGrammarTypeArguments(node, node.typeArguments);
             if (languageVersion < ScriptTarget.ES2015) {
                 checkExternalEmitHelpers(node, ExternalEmitHelpers.MakeTemplateObject);
             }
@@ -19116,6 +19205,9 @@ namespace ts {
 
             const links = getNodeLinks(node);
             const type = getTypeOfSymbol(node.symbol);
+            if (isTypeAny(type)) {
+                return type;
+            }
 
             // Check if function expression is contextually typed and assign parameter types if so.
             if (!(links.flags & NodeCheckFlags.ContextChecked)) {
@@ -19878,8 +19970,9 @@ namespace ts {
                     //    VarExpr = ValueExpr
                     // requires VarExpr to be classified as a reference
                     // A compound assignment furthermore requires VarExpr to be classified as a reference (section 4.1)
-                    // and the type of the non - compound operation to be assignable to the type of VarExpr.
-                    if (checkReferenceExpression(left, Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access)) {
+                    // and the type of the non-compound operation to be assignable to the type of VarExpr.
+                    if (checkReferenceExpression(left, Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access)
+                        && (!isIdentifier(left) || unescapeLeadingUnderscores(left.escapedText) !== "exports")) {
                         // to avoid cascading errors check assignability only if 'isReference' check succeeded and no errors were reported
                         checkTypeAssignableTo(valueType, leftType, left, /*headMessage*/ undefined);
                     }
@@ -20048,6 +20141,15 @@ namespace ts {
             return widened;
         }
 
+        function isTypeParameterWithKeyofConstraint(type: Type) {
+            if (type.flags & TypeFlags.TypeParameter) {
+                const constraintDeclaration = getConstraintDeclaration(<TypeParameter>type);
+                return constraintDeclaration && constraintDeclaration.kind === SyntaxKind.TypeOperator &&
+                    (<TypeOperatorNode>constraintDeclaration).operator === SyntaxKind.KeyOfKeyword;
+            }
+            return false;
+        }
+
         function isLiteralOfContextualType(candidateType: Type, contextualType: Type): boolean {
             if (contextualType) {
                 if (contextualType.flags & TypeFlags.UnionOrIntersection) {
@@ -20059,7 +20161,8 @@ namespace ts {
                     // this a literal context for literals of that primitive type. For example, given a
                     // type parameter 'T extends string', infer string literal types for T.
                     const constraint = getBaseConstraintOfType(contextualType) || emptyObjectType;
-                    return constraint.flags & TypeFlags.String && maybeTypeOfKind(candidateType, TypeFlags.StringLiteral) ||
+                    return isTypeParameterWithKeyofConstraint(contextualType) && maybeTypeOfKind(candidateType, TypeFlags.StringLiteral | TypeFlags.NumberLiteral | TypeFlags.UniqueESSymbol) ||
+                        constraint.flags & TypeFlags.String && maybeTypeOfKind(candidateType, TypeFlags.StringLiteral) ||
                         constraint.flags & TypeFlags.Number && maybeTypeOfKind(candidateType, TypeFlags.NumberLiteral) ||
                         constraint.flags & TypeFlags.Boolean && maybeTypeOfKind(candidateType, TypeFlags.BooleanLiteral) ||
                         constraint.flags & TypeFlags.ESSymbol && maybeTypeOfKind(candidateType, TypeFlags.UniqueESSymbol) ||
@@ -20988,7 +21091,7 @@ namespace ts {
             // Check if the index type is assignable to 'keyof T' for the object type.
             const objectType = (<IndexedAccessType>type).objectType;
             const indexType = (<IndexedAccessType>type).indexType;
-            if (isTypeAssignableTo(indexType, getIndexType(objectType, /*includeDeclaredTypes*/ true))) {
+            if (isTypeAssignableTo(indexType, getIndexType(objectType, /*stringsOnly*/ false))) {
                 if (accessNode.kind === SyntaxKind.ElementAccessExpression && isAssignmentTarget(accessNode) &&
                     getObjectFlags(objectType) & ObjectFlags.Mapped && getMappedTypeModifiers(<MappedType>objectType) & MappedTypeModifiers.IncludeReadonly) {
                     error(accessNode, Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
@@ -21020,7 +21123,7 @@ namespace ts {
 
             const type = <MappedType>getTypeFromMappedTypeNode(node);
             const constraintType = getConstraintTypeFromMappedType(type);
-            checkTypeAssignableTo(constraintType, stringType, node.typeParameter.constraint);
+            checkTypeAssignableTo(constraintType, keyofConstraintType, node.typeParameter.constraint);
         }
 
         function checkTypeOperator(node: TypeOperatorNode) {
@@ -21887,6 +21990,11 @@ namespace ts {
                 // If the node had `@property` tags, `typeExpression` would have been set to the first property tag.
                 error(node.name, Diagnostics.JSDoc_typedef_tag_should_either_have_a_type_annotation_or_be_followed_by_property_or_member_tags);
             }
+
+            if (node.name) {
+                checkTypeNameIsReserved(node.name, Diagnostics.Type_alias_name_cannot_be_0);
+            }
+            checkSourceElement(node.typeExpression);
         }
 
         function checkJSDocParameterTag(node: JSDocParameterTag) {
@@ -21897,6 +22005,10 @@ namespace ts {
                 // and give a better error message when the host function mentions `arguments`
                 // but the tag doesn't have an array type
                 if (decl) {
+                    const i = getJSDocTags(decl).filter(isJSDocParameterTag).indexOf(node);
+                    if (i > -1 && i < decl.parameters.length && isBindingPattern(decl.parameters[i].name)) {
+                        return;
+                    }
                     if (!containsArgumentsReference(decl)) {
                         error(node.name,
                             Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name,
@@ -22120,7 +22232,8 @@ namespace ts {
             }
 
             if (!isRemovedPropertyFromObjectSpread(node.kind === SyntaxKind.Identifier ? node.parent : node)) {
-                addDiagnostic(UnusedKind.Local, createDiagnosticForNodeSpan(getSourceFileOfNode(declaration), declaration, node, Diagnostics._0_is_declared_but_its_value_is_never_read, name));
+                const message = isTypeDeclaration(declaration) ? Diagnostics._0_is_declared_but_never_used : Diagnostics._0_is_declared_but_its_value_is_never_read;
+                addDiagnostic(UnusedKind.Local, createDiagnosticForNodeSpan(getSourceFileOfNode(declaration), declaration, node, message, name));
             }
         }
 
@@ -22173,8 +22286,9 @@ namespace ts {
         ): void {
             // Only report errors on the last declaration for the type parameter container;
             // this ensures that all uses have been accounted for.
-            if (!(node.flags & NodeFlags.Ambient) && node.typeParameters && last(getSymbolOfNode(node)!.declarations) === node) {
-                for (const typeParameter of node.typeParameters) {
+            const typeParameters = getEffectiveTypeParameterDeclarations(node);
+            if (!(node.flags & NodeFlags.Ambient) && typeParameters && last(getSymbolOfNode(node)!.declarations) === node) {
+                for (const typeParameter of typeParameters) {
                     if (!(getMergedSymbol(typeParameter.symbol).isReferenced & SymbolFlags.TypeParameter) && !isIdentifierThatStartsWithUnderScore(typeParameter.name)) {
                         addDiagnostic(UnusedKind.Parameter, createDiagnosticForNode(typeParameter.name, Diagnostics._0_is_declared_but_its_value_is_never_read, symbolName(typeParameter.symbol)));
                     }
@@ -23548,20 +23662,21 @@ namespace ts {
             }
         }
 
-        function areTypeParametersIdentical(declarations: ReadonlyArray<ClassDeclaration | InterfaceDeclaration>, typeParameters: TypeParameter[]) {
-            const maxTypeArgumentCount = length(typeParameters);
-            const minTypeArgumentCount = getMinTypeArgumentCount(typeParameters);
+        function areTypeParametersIdentical(declarations: ReadonlyArray<ClassDeclaration | InterfaceDeclaration>, targetParameters: TypeParameter[]) {
+            const maxTypeArgumentCount = length(targetParameters);
+            const minTypeArgumentCount = getMinTypeArgumentCount(targetParameters);
 
             for (const declaration of declarations) {
                 // If this declaration has too few or too many type parameters, we report an error
-                const numTypeParameters = length(declaration.typeParameters);
+                const sourceParameters = getEffectiveTypeParameterDeclarations(declaration);
+                const numTypeParameters = length(sourceParameters);
                 if (numTypeParameters < minTypeArgumentCount || numTypeParameters > maxTypeArgumentCount) {
                     return false;
                 }
 
                 for (let i = 0; i < numTypeParameters; i++) {
-                    const source = declaration.typeParameters[i];
-                    const target = typeParameters[i];
+                    const source = sourceParameters[i];
+                    const target = targetParameters[i];
 
                     // If the type parameter node does not have the same as the resolved type
                     // parameter at this position, we report an error.
@@ -23622,7 +23737,7 @@ namespace ts {
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
                 checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             }
-            checkTypeParameters(node.typeParameters);
+            checkTypeParameters(getEffectiveTypeParameterDeclarations(node));
             checkExportsOnMergedDeclarations(node);
             const symbol = getSymbolOfNode(node);
             const type = <InterfaceType>getDeclaredTypeOfSymbol(symbol);
@@ -24082,6 +24197,9 @@ namespace ts {
                                 case SyntaxKind.AsteriskAsteriskToken: return left ** right;
                             }
                         }
+                        else if (typeof left === "string" && typeof right === "string" && (<BinaryExpression>expr).operatorToken.kind === SyntaxKind.PlusToken) {
+                            return left + right;
+                        }
                         break;
                     case SyntaxKind.StringLiteral:
                         return (<StringLiteral>expr).text;
@@ -24483,7 +24601,10 @@ namespace ts {
                             checkImportBinding(importClause.namedBindings);
                         }
                         else {
-                            forEach(importClause.namedBindings.elements, checkImportBinding);
+                            const moduleExisted = resolveExternalModuleName(node, node.moduleSpecifier);
+                            if (moduleExisted) {
+                                forEach(importClause.namedBindings.elements, checkImportBinding);
+                            }
                         }
                     }
                 }
@@ -24780,6 +24901,7 @@ namespace ts {
                 case SyntaxKind.JSDocNullableType:
                 case SyntaxKind.JSDocAllType:
                 case SyntaxKind.JSDocUnknownType:
+                case SyntaxKind.JSDocTypeLiteral:
                     checkJSDocTypeIsInJsFile(node);
                     forEachChild(node, checkSourceElement);
                     return;
@@ -26854,7 +26976,7 @@ namespace ts {
 
         function checkGrammarClassLikeDeclaration(node: ClassLikeDeclaration): boolean {
             const file = getSourceFileOfNode(node);
-            return checkGrammarClassDeclarationHeritageClauses(node) || checkGrammarTypeParameterList(node.typeParameters, file);
+            return checkGrammarClassDeclarationHeritageClauses(node) || checkGrammarTypeParameterList(getEffectiveTypeParameterDeclarations(node), file);
         }
 
         function checkGrammarArrowFunction(node: Node, file: SourceFile): boolean {
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index f386c701dd7..126c1529094 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -1,9 +1,3 @@
-/// <reference path="sys.ts"/>
-/// <reference path="types.ts"/>
-/// <reference path="core.ts"/>
-/// <reference path="diagnosticInformationMap.generated.ts"/>
-/// <reference path="parser.ts"/>
-
 namespace ts {
     /* @internal */
     export const compileOnSaveCommandLineOption: CommandLineOption = { name: "compileOnSave", type: "boolean" };
@@ -678,6 +672,12 @@ namespace ts {
             category: Diagnostics.Advanced_Options,
             description: Diagnostics.Disable_strict_checking_of_generic_signatures_in_function_types,
         },
+        {
+            name: "keyofStringsOnly",
+            type: "boolean",
+            category: Diagnostics.Advanced_Options,
+            description: Diagnostics.Resolve_keyof_to_string_valued_property_names_only_no_numbers_or_symbols,
+        },
         {
             // A list of plugins to load in the language service
             name: "plugins",
diff --git a/src/compiler/comments.ts b/src/compiler/comments.ts
index f26a66701e4..de629cccfe1 100644
--- a/src/compiler/comments.ts
+++ b/src/compiler/comments.ts
@@ -1,5 +1,3 @@
-/// <reference path="sourcemap.ts" />
-
 /* @internal */
 namespace ts {
     export interface CommentWriter {
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 2d3b2a2a0ce..f0220fb8c93 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -1,6 +1,3 @@
-/// <reference path="types.ts"/>
-/// <reference path="performance.ts" />
-
 namespace ts {
     // WARNING: The script `configureNightly.ts` uses a regexp to parse out these values.
     // If changing the text in this section, be sure to test `configureNightly` too.
@@ -1268,10 +1265,7 @@ namespace ts {
         });
     }
 
-    export function assign<T1 extends MapLike<{}>, T2, T3>(t: T1, arg1: T2, arg2: T3): T1 & T2 & T3;
-    export function assign<T1 extends MapLike<{}>, T2>(t: T1, arg1: T2): T1 & T2;
-    export function assign<T1 extends MapLike<{}>>(t: T1, ...args: any[]): any;
-    export function assign<T1 extends MapLike<{}>>(t: T1, ...args: any[]) {
+    export function assign<T extends object>(t: T, ...args: T[]) {
         for (const arg of args) {
             for (const p in arg) {
                 if (hasProperty(arg, p)) {
@@ -1317,12 +1311,13 @@ namespace ts {
      * the same key with the given 'makeKey' function, then the element with the higher
      * index in the array will be the one associated with the produced key.
      */
-    export function arrayToMap<T>(array: ReadonlyArray<T>, makeKey: (value: T) => string): Map<T>;
-    export function arrayToMap<T, U>(array: ReadonlyArray<T>, makeKey: (value: T) => string, makeValue: (value: T) => U): Map<U>;
-    export function arrayToMap<T, U>(array: ReadonlyArray<T>, makeKey: (value: T) => string, makeValue: (value: T) => T | U = identity): Map<T | U> {
+    export function arrayToMap<T>(array: ReadonlyArray<T>, makeKey: (value: T) => string | undefined): Map<T>;
+    export function arrayToMap<T, U>(array: ReadonlyArray<T>, makeKey: (value: T) => string | undefined, makeValue: (value: T) => U): Map<U>;
+    export function arrayToMap<T, U>(array: ReadonlyArray<T>, makeKey: (value: T) => string | undefined, makeValue: (value: T) => T | U = identity): Map<T | U> {
         const result = createMap<T | U>();
         for (const value of array) {
-            result.set(makeKey(value), makeValue(value));
+            const key = makeKey(value);
+            if (key !== undefined) result.set(key, makeValue(value));
         }
         return result;
     }
@@ -1343,8 +1338,9 @@ namespace ts {
      * @param array the array of input elements.
      */
     export function arrayToSet(array: ReadonlyArray<string>): Map<true>;
-    export function arrayToSet<T>(array: ReadonlyArray<T>, makeKey: (value: T) => string): Map<true>;
-    export function arrayToSet(array: ReadonlyArray<any>, makeKey?: (value: any) => string): Map<true> {
+    export function arrayToSet<T>(array: ReadonlyArray<T>, makeKey: (value: T) => string | undefined): Map<true>;
+    export function arrayToSet<T>(array: ReadonlyArray<T>, makeKey: (value: T) => __String | undefined): UnderscoreEscapedMap<true>;
+    export function arrayToSet(array: ReadonlyArray<any>, makeKey?: (value: any) => string | __String | undefined): Map<true> | UnderscoreEscapedMap<true> {
         return arrayToMap<any, true>(array, makeKey || (s => s), () => true);
     }
 
@@ -1606,7 +1602,7 @@ namespace ts {
             messageText: text,
             category: message.category,
             code: message.code,
-            reportsUnnecessary: message.unused,
+            reportsUnnecessary: message.reportsUnnecessary,
         };
     }
 
@@ -1637,7 +1633,7 @@ namespace ts {
             messageText: text,
             category: message.category,
             code: message.code,
-            reportsUnnecessary: message.unused,
+            reportsUnnecessary: message.reportsUnnecessary,
         };
     }
 
@@ -1727,6 +1723,10 @@ namespace ts {
         return compareComparableValues(a, b);
     }
 
+    export function min<T>(a: T, b: T, compare: Comparer<T>): T {
+        return compare(a, b) === Comparison.LessThan ? a : b;
+    }
+
     /**
      * Compare two strings using a case-insensitive ordinal comparison.
      *
@@ -2212,6 +2212,15 @@ namespace ts {
         return absolutePath;
     }
 
+    export function getRelativePath(path: string, directoryPath: string, getCanonicalFileName: GetCanonicalFileName) {
+        const relativePath = getRelativePathToDirectoryOrUrl(directoryPath, path, directoryPath, getCanonicalFileName, /*isAbsolutePathAnUrl*/ false);
+        return ensurePathIsRelative(relativePath);
+    }
+
+    export function ensurePathIsRelative(path: string): string {
+        return !pathIsRelative(path) ? "./" + path : path;
+    }
+
     export function getBaseFileName(path: string) {
         if (path === undefined) {
             return undefined;
@@ -2987,18 +2996,19 @@ namespace ts {
     }
 
     /** Remove the *first* occurrence of `item` from the array. */
-    export function unorderedRemoveItem<T>(array: T[], item: T): void {
-        unorderedRemoveFirstItemWhere(array, element => element === item);
+    export function unorderedRemoveItem<T>(array: T[], item: T) {
+        return unorderedRemoveFirstItemWhere(array, element => element === item);
     }
 
     /** Remove the *first* element satisfying `predicate`. */
-    function unorderedRemoveFirstItemWhere<T>(array: T[], predicate: (element: T) => boolean): void {
+    function unorderedRemoveFirstItemWhere<T>(array: T[], predicate: (element: T) => boolean) {
         for (let i = 0; i < array.length; i++) {
             if (predicate(array[i])) {
                 unorderedRemoveItemAt(array, i);
-                break;
+                return true;
             }
         }
+        return false;
     }
 
     export type GetCanonicalFileName = (fileName: string) => string;
@@ -3122,8 +3132,8 @@ namespace ts {
         return (arg: T) => f(arg) && g(arg);
     }
 
-    export function or<T>(f: (arg: T) => boolean, g: (arg: T) => boolean) {
-        return (arg: T) => f(arg) || g(arg);
+    export function or<T>(f: (arg: T) => boolean, g: (arg: T) => boolean): (arg: T) => boolean {
+        return arg => f(arg) || g(arg);
     }
 
     export function assertTypeIsNever(_: never): void { } // tslint:disable-line no-empty
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index b91165ea17b..46695ab2d75 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -23,6 +23,10 @@
         "category": "Error",
         "code": 1010
     },
+    "An element access expression should take an argument.": {
+        "category": "Error",
+        "code": 1011
+    },
     "Unexpected token.": {
         "category": "Error",
         "code": 1012
@@ -2947,10 +2951,6 @@
         "category": "Message",
         "code": 6040
     },
-    "Compilation complete. Watching for file changes.": {
-        "category": "Message",
-        "code": 6042
-    },
     "Generates corresponding '.map' file.": {
         "category": "Message",
         "code": 6043
@@ -3290,7 +3290,7 @@
     "'{0}' is declared but its value is never read.": {
         "category": "Error",
         "code": 6133,
-        "unused": true
+        "reportsUnnecessary": true
     },
     "Report errors on unused locals.": {
         "category": "Message",
@@ -3311,7 +3311,7 @@
     "Property '{0}' is declared but its value is never read.": {
         "category": "Error",
         "code": 6138,
-        "unused": true
+        "reportsUnnecessary": true
     },
     "Import emit helpers from 'tslib'.": {
         "category": "Message",
@@ -3524,16 +3524,25 @@
     "All imports in import declaration are unused.": {
         "category": "Error",
         "code": 6192,
-        "unused": true
+        "reportsUnnecessary": true
     },
-    "Found 1 error.": {
+    "Found 1 error. Watching for file changes.": {
         "category": "Message",
         "code": 6193
     },
-    "Found {0} errors.": {
+    "Found {0} errors. Watching for file changes.": {
         "category": "Message",
         "code": 6194
     },
+    "Resolve 'keyof' to string valued property names only (no numbers or symbols).": {
+        "category": "Message",
+        "code": 6195
+    },
+    "'{0}' is declared but never used.": {
+        "category": "Error",
+        "code": 6196,
+        "reportsUnnecessary": true
+    },
     "Variable '{0}' implicitly has an '{1}' type.": {
         "category": "Error",
         "code": 7005
@@ -3613,7 +3622,7 @@
     "Unused label.": {
         "category": "Error",
         "code": 7028,
-        "unused": true
+        "reportsUnnecessary": true
     },
     "Fallthrough case in switch.": {
         "category": "Error",
@@ -3922,7 +3931,7 @@
         "category": "Message",
         "code": 90007
     },
-    "Add 'this.' to unresolved variable": {
+    "Add '{0}.' to unresolved variable": {
         "category": "Message",
         "code": 90008
     },
@@ -4130,7 +4139,7 @@
         "category": "Message",
         "code": 95036
     },
-    "Add 'this.' to all unresolved variables matching a member name": {
+    "Add qualifier to all unresolved variables matching a member name": {
         "category": "Message",
         "code": 95037
     },
@@ -4165,5 +4174,9 @@
     "Convert all constructor functions to classes": {
         "category": "Message",
         "code": 95045
+    },
+    "Generate 'get' and 'set' accessors": {
+        "category": "Message",
+        "code": 95046
     }
 }
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 4bd055b1618..53d4e56c301 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -1,8 +1,3 @@
-/// <reference path="checker.ts" />
-/// <reference path="transformer.ts" />
-/// <reference path="sourcemap.ts" />
-/// <reference path="comments.ts" />
-
 namespace ts {
     const brackets = createBracketsMap();
 
@@ -1446,9 +1441,9 @@ namespace ts {
 
         function emitElementAccessExpression(node: ElementAccessExpression) {
             emitExpression(node.expression);
-            const openPos = emitTokenWithComment(SyntaxKind.OpenBracketToken, node.expression.end, writePunctuation, node);
+            emitTokenWithComment(SyntaxKind.OpenBracketToken, node.expression.end, writePunctuation, node);
             emitExpression(node.argumentExpression);
-            emitTokenWithComment(SyntaxKind.CloseBracketToken, node.argumentExpression ? node.argumentExpression.end : openPos, writePunctuation, node);
+            emitTokenWithComment(SyntaxKind.CloseBracketToken, node.argumentExpression.end, writePunctuation, node);
         }
 
         function emitCallExpression(node: CallExpression) {
@@ -1467,6 +1462,7 @@ namespace ts {
 
         function emitTaggedTemplateExpression(node: TaggedTemplateExpression) {
             emitExpression(node.tag);
+            emitTypeArguments(node, node.typeArguments);
             writeSpace();
             emitExpression(node.template);
         }
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index 82e4782f848..e3191930c0e 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -1,6 +1,3 @@
-/// <reference path="core.ts"/>
-/// <reference path="utilities.ts"/>
-
 namespace ts {
     function createSynthesizedNode(kind: SyntaxKind): Node {
         const node = createNode(kind, -1, -1);
@@ -1035,17 +1032,32 @@ namespace ts {
             : node;
     }
 
-    export function createTaggedTemplate(tag: Expression, template: TemplateLiteral) {
+    export function createTaggedTemplate(tag: Expression, template: TemplateLiteral): TaggedTemplateExpression;
+    export function createTaggedTemplate(tag: Expression, typeArguments: ReadonlyArray<TypeNode>, template: TemplateLiteral): TaggedTemplateExpression;
+    /** @internal */
+    export function createTaggedTemplate(tag: Expression, typeArgumentsOrTemplate: ReadonlyArray<TypeNode> | TemplateLiteral, template?: TemplateLiteral): TaggedTemplateExpression;
+    export function createTaggedTemplate(tag: Expression, typeArgumentsOrTemplate: ReadonlyArray<TypeNode> | TemplateLiteral, template?: TemplateLiteral) {
         const node = <TaggedTemplateExpression>createSynthesizedNode(SyntaxKind.TaggedTemplateExpression);
         node.tag = parenthesizeForAccess(tag);
-        node.template = template;
+        if (template) {
+            node.typeArguments = asNodeArray(typeArgumentsOrTemplate as ReadonlyArray<TypeNode>);
+            node.template = template!;
+        }
+        else {
+            node.typeArguments = undefined;
+            node.template = typeArgumentsOrTemplate as TemplateLiteral;
+        }
         return node;
     }
 
-    export function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, template: TemplateLiteral) {
+    export function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, template: TemplateLiteral): TaggedTemplateExpression;
+    export function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, typeArguments: ReadonlyArray<TypeNode>, template: TemplateLiteral): TaggedTemplateExpression;
+    export function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, typeArgumentsOrTemplate: ReadonlyArray<TypeNode> | TemplateLiteral, template?: TemplateLiteral) {
         return node.tag !== tag
-            || node.template !== template
-            ? updateNode(createTaggedTemplate(tag, template), node)
+            || (template
+                ? node.typeArguments !== typeArgumentsOrTemplate || node.template !== template
+                : node.typeArguments !== undefined || node.template !== typeArgumentsOrTemplate)
+            ? updateNode(createTaggedTemplate(tag, typeArgumentsOrTemplate, template), node)
             : node;
     }
 
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
index d66ab5eb524..81aed522490 100644
--- a/src/compiler/moduleNameResolver.ts
+++ b/src/compiler/moduleNameResolver.ts
@@ -1,6 +1,3 @@
-/// <reference path="core.ts" />
-/// <reference path="diagnosticInformationMap.generated.ts" />
-
 namespace ts {
     /* @internal */
     export function trace(host: ModuleResolutionHost, message: DiagnosticMessage, ...args: any[]): void;
@@ -447,6 +444,12 @@ namespace ts {
         }
     }
 
+    export function resolveModuleNameFromCache(moduleName: string, containingFile: string, cache: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations | undefined {
+        const containingDirectory = getDirectoryPath(containingFile);
+        const perFolderCache = cache && cache.getOrCreateCacheForDirectory(containingDirectory);
+        return perFolderCache && perFolderCache.get(moduleName);
+    }
+
     export function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations {
         const traceEnabled = isTraceEnabled(compilerOptions, host);
         if (traceEnabled) {
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index d61a57ce5ae..12e498787c8 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -1,6 +1,3 @@
-/// <reference path="utilities.ts"/>
-/// <reference path="scanner.ts"/>
-
 namespace ts {
     const enum SignatureFlags {
         None = 0,
@@ -226,6 +223,7 @@ namespace ts {
                     visitNodes(cbNode, cbNodes, (<CallExpression>node).arguments);
             case SyntaxKind.TaggedTemplateExpression:
                 return visitNode(cbNode, (<TaggedTemplateExpression>node).tag) ||
+                    visitNodes(cbNode, cbNodes, (<TaggedTemplateExpression>node).typeArguments) ||
                     visitNode(cbNode, (<TaggedTemplateExpression>node).template);
             case SyntaxKind.TypeAssertionExpression:
                 return visitNode(cbNode, (<TypeAssertion>node).type) ||
@@ -1242,7 +1240,7 @@ namespace ts {
             if (reportAtCurrentPosition) {
                 parseErrorAtPosition(scanner.getStartPos(), 0, diagnosticMessage, arg0);
             }
-            else {
+            else if (diagnosticMessage) {
                 parseErrorAtCurrentToken(diagnosticMessage, arg0);
             }
 
@@ -4381,14 +4379,15 @@ namespace ts {
                     const indexedAccess = <ElementAccessExpression>createNode(SyntaxKind.ElementAccessExpression, expression.pos);
                     indexedAccess.expression = expression;
 
-                    // It's not uncommon for a user to write: "new Type[]".
-                    // Check for that common pattern and report a better error message.
-                    if (token() !== SyntaxKind.CloseBracketToken) {
-                        indexedAccess.argumentExpression = allowInAnd(parseExpression);
-                        if (indexedAccess.argumentExpression.kind === SyntaxKind.StringLiteral || indexedAccess.argumentExpression.kind === SyntaxKind.NumericLiteral) {
-                            const literal = <LiteralExpression>indexedAccess.argumentExpression;
-                            literal.text = internIdentifier(literal.text);
+                    if (token() === SyntaxKind.CloseBracketToken) {
+                        indexedAccess.argumentExpression = createMissingNode(SyntaxKind.Identifier, /*reportAtCurrentPosition*/ true, Diagnostics.An_element_access_expression_should_take_an_argument);
+                    }
+                    else {
+                        const argument = allowInAnd(parseExpression);
+                        if (isStringOrNumericLiteral(argument)) {
+                            argument.text = internIdentifier(argument.text);
                         }
+                        indexedAccess.argumentExpression = argument;
                     }
 
                     parseExpected(SyntaxKind.CloseBracketToken);
@@ -4396,13 +4395,8 @@ namespace ts {
                     continue;
                 }
 
-                if (token() === SyntaxKind.NoSubstitutionTemplateLiteral || token() === SyntaxKind.TemplateHead) {
-                    const tagExpression = <TaggedTemplateExpression>createNode(SyntaxKind.TaggedTemplateExpression, expression.pos);
-                    tagExpression.tag = expression;
-                    tagExpression.template = token() === SyntaxKind.NoSubstitutionTemplateLiteral
-                        ? <NoSubstitutionTemplateLiteral>parseLiteralNode()
-                        : parseTemplateExpression();
-                    expression = finishNode(tagExpression);
+                if (isTemplateStartOfTaggedTemplate()) {
+                    expression = parseTaggedTemplateRest(expression, /*typeArguments*/ undefined);
                     continue;
                 }
 
@@ -4410,6 +4404,20 @@ namespace ts {
             }
         }
 
+        function isTemplateStartOfTaggedTemplate() {
+            return token() === SyntaxKind.NoSubstitutionTemplateLiteral || token() === SyntaxKind.TemplateHead;
+        }
+
+        function parseTaggedTemplateRest(tag: LeftHandSideExpression, typeArguments: NodeArray<TypeNode> | undefined) {
+            const tagExpression = <TaggedTemplateExpression>createNode(SyntaxKind.TaggedTemplateExpression, tag.pos);
+            tagExpression.tag = tag;
+            tagExpression.typeArguments = typeArguments;
+            tagExpression.template = token() === SyntaxKind.NoSubstitutionTemplateLiteral
+                ? <NoSubstitutionTemplateLiteral>parseLiteralNode()
+                : parseTemplateExpression();
+            return finishNode(tagExpression);
+        }
+
         function parseCallExpressionRest(expression: LeftHandSideExpression): LeftHandSideExpression {
             while (true) {
                 expression = parseMemberExpressionRest(expression);
@@ -4423,6 +4431,11 @@ namespace ts {
                         return expression;
                     }
 
+                    if (isTemplateStartOfTaggedTemplate()) {
+                        expression = parseTaggedTemplateRest(expression, typeArguments);
+                        continue;
+                    }
+
                     const callExpr = <CallExpression>createNode(SyntaxKind.CallExpression, expression.pos);
                     callExpr.expression = expression;
                     callExpr.typeArguments = typeArguments;
@@ -4470,8 +4483,10 @@ namespace ts {
         function canFollowTypeArgumentsInExpression(): boolean {
             switch (token()) {
                 case SyntaxKind.OpenParenToken:                 // foo<x>(
-                // this case are the only case where this token can legally follow a type argument
-                // list.  So we definitely want to treat this as a type arg list.
+                case SyntaxKind.NoSubstitutionTemplateLiteral:  // foo<T> `...`
+                case SyntaxKind.TemplateHead:                   // foo<T> `...${100}...`
+                // these are the only tokens can legally follow a type argument
+                // list. So we definitely want to treat them as type arg lists.
 
                 case SyntaxKind.DotToken:                       // foo<x>.
                 case SyntaxKind.CloseParenToken:                // foo<x>)
@@ -4700,9 +4715,23 @@ namespace ts {
                 return finishNode(node);
             }
 
+            let expression: MemberExpression = parsePrimaryExpression();
+            let typeArguments;
+            while (true) {
+                expression = parseMemberExpressionRest(expression);
+                typeArguments = tryParse(parseTypeArgumentsInExpression);
+                if (isTemplateStartOfTaggedTemplate()) {
+                    Debug.assert(!!typeArguments,
+                        "Expected a type argument list; all plain tagged template starts should be consumed in 'parseMemberExpressionRest'");
+                    expression = parseTaggedTemplateRest(expression, typeArguments);
+                    typeArguments = undefined;
+                }
+                break;
+            }
+
             const node = <NewExpression>createNode(SyntaxKind.NewExpression, fullStart);
-            node.expression = parseMemberExpressionOrHigher();
-            node.typeArguments = tryParse(parseTypeArgumentsInExpression);
+            node.expression = expression;
+            node.typeArguments = typeArguments;
             if (node.typeArguments || token() === SyntaxKind.OpenParenToken) {
                 node.arguments = parseArgumentList();
             }
@@ -7649,7 +7678,7 @@ namespace ts {
     const tripleSlashXMLCommentStartRegEx = /^\/\/\/\s*<(\S+)\s.*?\/>/im;
     const singleLinePragmaRegEx = /^\/\/\/?\s*@(\S+)\s*(.*)\s*$/im;
     function extractPragmas(pragmas: PragmaPsuedoMapEntry[], range: CommentRange, text: string) {
-        const tripleSlash = tripleSlashXMLCommentStartRegEx.exec(text);
+        const tripleSlash = range.kind === SyntaxKind.SingleLineCommentTrivia && tripleSlashXMLCommentStartRegEx.exec(text);
         if (tripleSlash) {
             const name = tripleSlash[1].toLowerCase() as keyof PragmaPsuedoMap; // Technically unsafe cast, but we do it so the below check to make it safe typechecks
             const pragma = commentPragmas[name] as PragmaDefinition;
@@ -7686,15 +7715,17 @@ namespace ts {
             return;
         }
 
-        const singleLine = singleLinePragmaRegEx.exec(text);
+        const singleLine = range.kind === SyntaxKind.SingleLineCommentTrivia && singleLinePragmaRegEx.exec(text);
         if (singleLine) {
             return addPragmaForMatch(pragmas, range, PragmaKindFlags.SingleLine, singleLine);
         }
 
-        const multiLinePragmaRegEx = /\s*@(\S+)\s*(.*)\s*$/gim; // Defined inline since it uses the "g" flag, which keeps a persistent index (for iterating)
-        let multiLineMatch: RegExpExecArray;
-        while (multiLineMatch = multiLinePragmaRegEx.exec(text)) {
-            addPragmaForMatch(pragmas, range, PragmaKindFlags.MultiLine, multiLineMatch);
+        if (range.kind === SyntaxKind.MultiLineCommentTrivia) {
+            const multiLinePragmaRegEx = /\s*@(\S+)\s*(.*)\s*$/gim; // Defined inline since it uses the "g" flag, which keeps a persistent index (for iterating)
+            let multiLineMatch: RegExpExecArray;
+            while (multiLineMatch = multiLinePragmaRegEx.exec(text)) {
+                addPragmaForMatch(pragmas, range, PragmaKindFlags.MultiLine, multiLineMatch);
+            }
         }
     }
 
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 57c69b77bb9..54dede025b5 100755
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -1,7 +1,3 @@
-/// <reference path="sys.ts" />
-/// <reference path="emitter.ts" />
-/// <reference path="core.ts" />
-
 namespace ts {
     const ignoreDiagnosticCommentRegEx = /(^\s*$)|(^\s*\/\/\/?\s*(@ts-ignore)?)/;
 
@@ -577,7 +573,6 @@ namespace ts {
         const packageIdToSourceFile = createMap<SourceFile>();
         // Maps from a SourceFile's `.path` to the name of the package it was imported with.
         let sourceFileToPackageName = createMap<string>();
-        // See `sourceFileIsRedirectedTo`.
         let redirectTargetsSet = createMap<true>();
 
         const filesByName = createMap<SourceFile | undefined>();
@@ -627,9 +622,6 @@ namespace ts {
 
         Debug.assert(!!missingFilePaths);
 
-        // unconditionally set moduleResolutionCache to undefined to avoid unnecessary leaks
-        moduleResolutionCache = undefined;
-
         // Release any files we have acquired in the old program but are
         // not part of the new program.
         if (oldProgram && host.onReleaseOldSourceFile) {
@@ -675,7 +667,8 @@ namespace ts {
             sourceFileToPackageName,
             redirectTargetsSet,
             isEmittedFile,
-            getConfigFileParsingDiagnostics
+            getConfigFileParsingDiagnostics,
+            getResolvedModuleWithFailedLookupLocationsFromCache,
         };
 
         verifyCompilerOptions();
@@ -684,6 +677,10 @@ namespace ts {
 
         return program;
 
+        function getResolvedModuleWithFailedLookupLocationsFromCache(moduleName: string, containingFile: string): ResolvedModuleWithFailedLookupLocations {
+            return moduleResolutionCache && resolveModuleNameFromCache(moduleName, containingFile, moduleResolutionCache);
+        }
+
         function toPath(fileName: string): Path {
             return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
         }
@@ -1629,6 +1626,9 @@ namespace ts {
                     collectDynamicImportOrRequireCalls(node);
                 }
             }
+            if ((file.flags & NodeFlags.PossiblyContainsDynamicImport) || isJavaScriptFile) {
+                collectDynamicImportOrRequireCalls(file.endOfFileToken);
+            }
 
             file.imports = imports || emptyArray;
             file.moduleAugmentations = moduleAugmentations || emptyArray;
@@ -2009,7 +2009,8 @@ namespace ts {
                         && !options.noResolve
                         && i < file.imports.length
                         && !elideImport
-                        && !(isJsFile && !options.allowJs);
+                        && !(isJsFile && !options.allowJs)
+                        && (isInJavaScriptFile(file.imports[i]) || !(file.imports[i].flags & NodeFlags.JSDoc));
 
                     if (elideImport) {
                         modulesWithElidedImports.set(file.path, true);
diff --git a/src/compiler/resolutionCache.ts b/src/compiler/resolutionCache.ts
index 0946948f43d..35e056546c0 100644
--- a/src/compiler/resolutionCache.ts
+++ b/src/compiler/resolutionCache.ts
@@ -1,7 +1,3 @@
-/// <reference path="types.ts"/>
-/// <reference path="core.ts"/>
-/// <reference path="watchUtilities.ts"/>
-
 /*@internal*/
 namespace ts {
     /** This is the cache of module/typedirectives resolution that can be retained across program */
@@ -14,6 +10,7 @@ namespace ts {
 
         invalidateResolutionOfFile(filePath: Path): void;
         removeResolutionsOfFile(filePath: Path): void;
+        setFilesWithInvalidatedNonRelativeUnresolvedImports(filesWithUnresolvedImports: Map<ReadonlyArray<string>>): void;
         createHasInvalidatedResolution(forceAllFilesAsInvalidated?: boolean): HasInvalidatedResolution;
 
         startCachingPerDirectoryResolution(): void;
@@ -78,6 +75,7 @@ namespace ts {
     export function createResolutionCache(resolutionHost: ResolutionCacheHost, rootDirForResolution: string, logChangesWhenResolvingModule: boolean): ResolutionCache {
         let filesWithChangedSetOfUnresolvedImports: Path[] | undefined;
         let filesWithInvalidatedResolutions: Map<true> | undefined;
+        let filesWithInvalidatedNonRelativeUnresolvedImports: Map<ReadonlyArray<string>> | undefined;
         let allFilesHaveInvalidatedResolution = false;
 
         const getCurrentDirectory = memoize(() => resolutionHost.getCurrentDirectory());
@@ -126,6 +124,7 @@ namespace ts {
             resolveTypeReferenceDirectives,
             removeResolutionsOfFile,
             invalidateResolutionOfFile,
+            setFilesWithInvalidatedNonRelativeUnresolvedImports,
             createHasInvalidatedResolution,
             updateTypeRootsWatch,
             closeTypeRootsWatch,
@@ -169,6 +168,16 @@ namespace ts {
             return collected;
         }
 
+        function isFileWithInvalidatedNonRelativeUnresolvedImports(path: Path) {
+            if (!filesWithInvalidatedNonRelativeUnresolvedImports) {
+                return false;
+            }
+
+            // Invalidated if file has unresolved imports
+            const value = filesWithInvalidatedNonRelativeUnresolvedImports.get(path);
+            return value && !!value.length;
+        }
+
         function createHasInvalidatedResolution(forceAllFilesAsInvalidated?: boolean): HasInvalidatedResolution {
             if (allFilesHaveInvalidatedResolution || forceAllFilesAsInvalidated) {
                 // Any file asked would have invalidated resolution
@@ -177,7 +186,8 @@ namespace ts {
             }
             const collected = filesWithInvalidatedResolutions;
             filesWithInvalidatedResolutions = undefined;
-            return path => collected && collected.has(path);
+            return path => (collected && collected.has(path)) ||
+                isFileWithInvalidatedNonRelativeUnresolvedImports(path);
         }
 
         function clearPerDirectoryResolutions() {
@@ -188,6 +198,7 @@ namespace ts {
 
         function finishCachingPerDirectoryResolution() {
             allFilesHaveInvalidatedResolution = false;
+            filesWithInvalidatedNonRelativeUnresolvedImports = undefined;
             directoryWatchesOfFailedLookups.forEach((watcher, path) => {
                 if (watcher.refCount === 0) {
                     directoryWatchesOfFailedLookups.delete(path);
@@ -241,13 +252,15 @@ namespace ts {
 
             const resolvedModules: R[] = [];
             const compilerOptions = resolutionHost.getCompilationSettings();
-
+            const hasInvalidatedNonRelativeUnresolvedImport = logChanges && isFileWithInvalidatedNonRelativeUnresolvedImports(path);
             const seenNamesInFile = createMap<true>();
             for (const name of names) {
                 let resolution = resolutionsInFile.get(name);
                 // Resolution is valid if it is present and not invalidated
                 if (!seenNamesInFile.has(name) &&
-                    allFilesHaveInvalidatedResolution || !resolution || resolution.isInvalidated) {
+                    allFilesHaveInvalidatedResolution || !resolution || resolution.isInvalidated ||
+                    // If the name is unresolved import that was invalidated, recalculate
+                    (hasInvalidatedNonRelativeUnresolvedImport && !isExternalModuleNameRelative(name) && !getResolutionWithResolvedFileName(resolution))) {
                     const existingResolution = resolution;
                     const resolutionInDirectory = perDirectoryResolution.get(name);
                     if (resolutionInDirectory) {
@@ -288,7 +301,7 @@ namespace ts {
                 if (oldResolution === newResolution) {
                     return true;
                 }
-                if (!oldResolution || !newResolution || oldResolution.isInvalidated) {
+                if (!oldResolution || !newResolution) {
                     return false;
                 }
                 const oldResult = getResolutionWithResolvedFileName(oldResolution);
@@ -581,6 +594,11 @@ namespace ts {
             );
         }
 
+        function setFilesWithInvalidatedNonRelativeUnresolvedImports(filesMap: Map<ReadonlyArray<string>>) {
+            Debug.assert(filesWithInvalidatedNonRelativeUnresolvedImports === filesMap || filesWithInvalidatedNonRelativeUnresolvedImports === undefined);
+            filesWithInvalidatedNonRelativeUnresolvedImports = filesMap;
+        }
+
         function invalidateResolutionOfFailedLookupLocation(fileOrDirectoryPath: Path, isCreatingWatchedDirectory: boolean) {
             let isChangedFailedLookupLocation: (location: string) => boolean;
             if (isCreatingWatchedDirectory) {
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index 43320b453c4..f2a01d22c24 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -1,6 +1,3 @@
-/// <reference path="core.ts"/>
-/// <reference path="diagnosticInformationMap.generated.ts"/>
-
 namespace ts {
     export type ErrorCallback = (message: DiagnosticMessage, length: number) => void;
 
diff --git a/src/compiler/sourcemap.ts b/src/compiler/sourcemap.ts
index 2e81da35cfd..6251f1963fa 100644
--- a/src/compiler/sourcemap.ts
+++ b/src/compiler/sourcemap.ts
@@ -1,5 +1,3 @@
-/// <reference path="checker.ts"/>
-
 /* @internal */
 namespace ts {
     export interface SourceMapWriter {
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 8c2612155e4..be95e06eb46 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -1,5 +1,3 @@
-/// <reference path="core.ts"/>
-
 declare function setTimeout(handler: (...args: any[]) => void, timeout: number): any;
 declare function clearTimeout(handle: any): void;
 
@@ -430,6 +428,7 @@ namespace ts {
         newLine: string;
         useCaseSensitiveFileNames: boolean;
         write(s: string): void;
+        writeOutputIsTTY?(): boolean;
         readFile(path: string, encoding?: string): string | undefined;
         getFileSize?(path: string): number;
         writeFile(path: string, data: string, writeByteOrderMark?: boolean): void;
@@ -563,6 +562,9 @@ namespace ts {
                 write(s: string): void {
                     process.stdout.write(s);
                 },
+                writeOutputIsTTY() {
+                    return process.stdout.isTTY;
+                },
                 readFile,
                 writeFile,
                 watchFile: getWatchFile(),
diff --git a/src/compiler/transformer.ts b/src/compiler/transformer.ts
index c187176d069..8cadba453d8 100644
--- a/src/compiler/transformer.ts
+++ b/src/compiler/transformer.ts
@@ -1,18 +1,3 @@
-/// <reference path="visitor.ts" />
-/// <reference path="transformers/utilities.ts" />
-/// <reference path="transformers/ts.ts" />
-/// <reference path="transformers/jsx.ts" />
-/// <reference path="transformers/esnext.ts" />
-/// <reference path="transformers/es2017.ts" />
-/// <reference path="transformers/es2016.ts" />
-/// <reference path="transformers/es2015.ts" />
-/// <reference path="transformers/generators.ts" />
-/// <reference path="transformers/es5.ts" />
-/// <reference path="transformers/module/module.ts" />
-/// <reference path="transformers/module/system.ts" />
-/// <reference path="transformers/module/es2015.ts" />
-/// <reference path="transformers/declarations.ts" />
-
 /* @internal */
 namespace ts {
     function getModuleTransformer(moduleKind: ModuleKind): TransformerFactory<SourceFile> {
diff --git a/src/compiler/transformers/declarations.ts b/src/compiler/transformers/declarations.ts
index 7b6b5847753..67e4fa31cb2 100644
--- a/src/compiler/transformers/declarations.ts
+++ b/src/compiler/transformers/declarations.ts
@@ -1,7 +1,3 @@
-/// <reference path="../factory.ts" />
-/// <reference path="../visitor.ts" />
-/// <reference path="./declarations/diagnostics.ts" />
-
 /*@internal*/
 namespace ts {
     export function getDeclarationDiagnostics(host: EmitHost, resolver: EmitResolver, file: SourceFile | undefined): Diagnostic[] {
diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
index bafe43b0b15..35101d3be7f 100644
--- a/src/compiler/transformers/destructuring.ts
+++ b/src/compiler/transformers/destructuring.ts
@@ -1,6 +1,3 @@
-/// <reference path="../factory.ts" />
-/// <reference path="../visitor.ts" />
-
 /*@internal*/
 namespace ts {
     interface FlattenContext {
diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index 72068688f9d..0a607494bb5 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -1,7 +1,3 @@
-/// <reference path="../factory.ts" />
-/// <reference path="../visitor.ts" />
-/// <reference path="./destructuring.ts" />
-
 /*@internal*/
 namespace ts {
     const enum ES2015SubstitutionFlags {
diff --git a/src/compiler/transformers/es2016.ts b/src/compiler/transformers/es2016.ts
index a9468991776..22b2f11b612 100644
--- a/src/compiler/transformers/es2016.ts
+++ b/src/compiler/transformers/es2016.ts
@@ -1,6 +1,3 @@
-/// <reference path="../factory.ts" />
-/// <reference path="../visitor.ts" />
-
 /*@internal*/
 namespace ts {
     export function transformES2016(context: TransformationContext) {
diff --git a/src/compiler/transformers/es2017.ts b/src/compiler/transformers/es2017.ts
index f2a5aeb35d2..6689f83ed5b 100644
--- a/src/compiler/transformers/es2017.ts
+++ b/src/compiler/transformers/es2017.ts
@@ -1,6 +1,3 @@
-/// <reference path="../factory.ts" />
-/// <reference path="../visitor.ts" />
-
 /*@internal*/
 namespace ts {
     type SuperContainer = ClassDeclaration | MethodDeclaration | GetAccessorDeclaration | SetAccessorDeclaration | ConstructorDeclaration;
diff --git a/src/compiler/transformers/es5.ts b/src/compiler/transformers/es5.ts
index bc6ee13520f..92ecce6a15c 100644
--- a/src/compiler/transformers/es5.ts
+++ b/src/compiler/transformers/es5.ts
@@ -1,6 +1,3 @@
-/// <reference path="../factory.ts" />
-/// <reference path="../visitor.ts" />
-
 /*@internal*/
 namespace ts {
     /**
diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts
index 97fe93e508b..68861a5bb43 100644
--- a/src/compiler/transformers/esnext.ts
+++ b/src/compiler/transformers/esnext.ts
@@ -1,7 +1,3 @@
-/// <reference path="../factory.ts" />
-/// <reference path="../visitor.ts" />
-/// <reference path="es2017.ts" />
-
 /*@internal*/
 namespace ts {
     const enum ESNextSubstitutionFlags {
diff --git a/src/compiler/transformers/generators.ts b/src/compiler/transformers/generators.ts
index 82d8bc513f0..15f0d2d0f81 100644
--- a/src/compiler/transformers/generators.ts
+++ b/src/compiler/transformers/generators.ts
@@ -1,6 +1,3 @@
-/// <reference path="../factory.ts" />
-/// <reference path="../visitor.ts" />
-
 // Transforms generator functions into a compatible ES5 representation with similar runtime
 // semantics. This is accomplished by first transforming the body of each generator
 // function into an intermediate representation that is the compiled into a JavaScript
diff --git a/src/compiler/transformers/jsx.ts b/src/compiler/transformers/jsx.ts
index 07dc8f74db4..4acdf63b275 100644
--- a/src/compiler/transformers/jsx.ts
+++ b/src/compiler/transformers/jsx.ts
@@ -1,7 +1,3 @@
-/// <reference path="../factory.ts" />
-/// <reference path="../visitor.ts" />
-/// <reference path="./esnext.ts" />
-
 /*@internal*/
 namespace ts {
     export function transformJsx(context: TransformationContext) {
diff --git a/src/compiler/transformers/module/es2015.ts b/src/compiler/transformers/module/es2015.ts
index 4f218e4fdcf..a3315852632 100644
--- a/src/compiler/transformers/module/es2015.ts
+++ b/src/compiler/transformers/module/es2015.ts
@@ -1,6 +1,3 @@
-/// <reference path="../../factory.ts" />
-/// <reference path="../../visitor.ts" />
-
 /*@internal*/
 namespace ts {
     export function transformES2015Module(context: TransformationContext) {
diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
index 45d13357123..f9fb47f6a27 100644
--- a/src/compiler/transformers/module/module.ts
+++ b/src/compiler/transformers/module/module.ts
@@ -1,7 +1,3 @@
-/// <reference path="../../factory.ts" />
-/// <reference path="../../visitor.ts" />
-/// <reference path="../destructuring.ts" />
-
 /*@internal*/
 namespace ts {
     export function transformModule(context: TransformationContext) {
diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts
index ca55cb3a9d1..5cde69e2ef6 100644
--- a/src/compiler/transformers/module/system.ts
+++ b/src/compiler/transformers/module/system.ts
@@ -1,7 +1,3 @@
-/// <reference path="../../factory.ts" />
-/// <reference path="../../visitor.ts" />
-/// <reference path="../destructuring.ts" />
-
 /*@internal*/
 namespace ts {
     export function transformSystemModule(context: TransformationContext) {
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index f22d8f02870..f29829d4607 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -1,7 +1,3 @@
-/// <reference path="../factory.ts" />
-/// <reference path="../visitor.ts" />
-/// <reference path="./destructuring.ts" />
-
 /*@internal*/
 namespace ts {
     /**
@@ -506,6 +502,9 @@ namespace ts {
                 case SyntaxKind.NewExpression:
                     return visitNewExpression(<NewExpression>node);
 
+                case SyntaxKind.TaggedTemplateExpression:
+                    return visitTaggedTemplateExpression(<TaggedTemplateExpression>node);
+
                 case SyntaxKind.NonNullExpression:
                     // TypeScript non-null expressions are removed, but their subtrees are preserved.
                     return visitNonNullExpression(<NonNullExpression>node);
@@ -2551,6 +2550,14 @@ namespace ts {
                 visitNodes(node.arguments, visitor, isExpression));
         }
 
+        function visitTaggedTemplateExpression(node: TaggedTemplateExpression) {
+            return updateTaggedTemplate(
+                node,
+                visitNode(node.tag, visitor, isExpression),
+                /*typeArguments*/ undefined,
+                visitNode(node.template, visitor, isExpression));
+        }
+
         /**
          * Determines whether to emit an enum declaration.
          *
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
index 09b64701988..3c73eba86ef 100644
--- a/src/compiler/tsc.ts
+++ b/src/compiler/tsc.ts
@@ -1,7 +1,3 @@
-/// <reference path="program.ts"/>
-/// <reference path="watch.ts"/>
-/// <reference path="commandLineParser.ts"/>
-
 namespace ts {
     interface Statistic {
         name: string;
@@ -22,12 +18,19 @@ namespace ts {
     }
 
     let reportDiagnostic = createDiagnosticReporter(sys);
-    function udpateReportDiagnostic(options: CompilerOptions) {
-        if (options.pretty) {
+    function updateReportDiagnostic(options: CompilerOptions) {
+        if (shouldBePretty(options)) {
             reportDiagnostic = createDiagnosticReporter(sys, /*pretty*/ true);
         }
     }
 
+    function shouldBePretty(options: CompilerOptions) {
+        if (typeof options.pretty === "undefined") {
+            return !!sys.writeOutputIsTTY && sys.writeOutputIsTTY();
+        }
+        return options.pretty;
+    }
+
     function padLeft(s: string, length: number) {
         while (s.length < length) {
             s = " " + s;
@@ -111,7 +114,7 @@ namespace ts {
         const commandLineOptions = commandLine.options;
         if (configFileName) {
             const configParseResult = parseConfigFileWithSystem(configFileName, commandLineOptions, sys, reportDiagnostic);
-            udpateReportDiagnostic(configParseResult.options);
+            updateReportDiagnostic(configParseResult.options);
             if (isWatchSet(configParseResult.options)) {
                 reportWatchModeWithoutSysSupport();
                 createWatchOfConfigFile(configParseResult, commandLineOptions);
@@ -121,7 +124,7 @@ namespace ts {
             }
         }
         else {
-            udpateReportDiagnostic(commandLineOptions);
+            updateReportDiagnostic(commandLineOptions);
             if (isWatchSet(commandLineOptions)) {
                 reportWatchModeWithoutSysSupport();
                 createWatchOfFilesAndCompilerOptions(commandLine.fileNames, commandLineOptions);
@@ -163,7 +166,7 @@ namespace ts {
     }
 
     function createWatchStatusReporter(options: CompilerOptions) {
-        return ts.createWatchStatusReporter(sys, !!options.pretty);
+        return ts.createWatchStatusReporter(sys, shouldBePretty(options));
     }
 
     function createWatchOfConfigFile(configParseResult: ParsedCommandLine, optionsToExtend: CompilerOptions) {
diff --git a/src/compiler/tsconfig.json b/src/compiler/tsconfig.json
index 58626f2cdc1..46e5384434a 100644
--- a/src/compiler/tsconfig.json
+++ b/src/compiler/tsconfig.json
@@ -6,36 +6,38 @@
         "declaration": true
     },
     "files": [
-        "core.ts",
-        "performance.ts",
-        "sys.ts",
         "types.ts",
+        "performance.ts",
+        "core.ts",
+        "sys.ts",
+        "diagnosticInformationMap.generated.ts",
         "scanner.ts",
-        "parser.ts",
         "utilities.ts",
+        "parser.ts",
         "binder.ts",
         "symbolWalker.ts",
+        "moduleNameResolver.ts",
         "checker.ts",
         "factory.ts",
         "visitor.ts",
         "transformers/utilities.ts",
+        "transformers/destructuring.ts",
         "transformers/ts.ts",
-        "transformers/jsx.ts",
-        "transformers/esnext.ts",
         "transformers/es2017.ts",
+        "transformers/esnext.ts",
+        "transformers/jsx.ts",
         "transformers/es2016.ts",
         "transformers/es2015.ts",
         "transformers/es5.ts",
         "transformers/generators.ts",
-        "transformers/destructuring.ts",
         "transformers/module/module.ts",
         "transformers/module/system.ts",
         "transformers/module/es2015.ts",
         "transformers/declarations/diagnostics.ts",
         "transformers/declarations.ts",
         "transformer.ts",
-        "comments.ts",
         "sourcemap.ts",
+        "comments.ts",
         "emitter.ts",
         "watchUtilities.ts",
         "program.ts",
@@ -44,7 +46,6 @@
         "resolutionCache.ts",
         "watch.ts",
         "commandLineParser.ts",
-        "tsc.ts",
-        "diagnosticInformationMap.generated.ts"
+        "tsc.ts"
     ]
 }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 42cf1325551..c678c4dab93 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -886,6 +886,7 @@ namespace ts {
 
     export interface PropertyDeclaration extends ClassElement, JSDocContainer {
         kind: SyntaxKind.PropertyDeclaration;
+        parent: ClassLikeDeclaration;
         name: PropertyName;
         questionToken?: QuestionToken;      // Present for use with reporting a grammar error
         exclamationToken?: ExclamationToken;
@@ -1691,7 +1692,7 @@ namespace ts {
     export interface ElementAccessExpression extends MemberExpression {
         kind: SyntaxKind.ElementAccessExpression;
         expression: LeftHandSideExpression;
-        argumentExpression?: Expression;
+        argumentExpression: Expression;
     }
 
     export interface SuperElementAccessExpression extends ElementAccessExpression {
@@ -1733,6 +1734,7 @@ namespace ts {
     export interface TaggedTemplateExpression extends MemberExpression {
         kind: SyntaxKind.TaggedTemplateExpression;
         tag: LeftHandSideExpression;
+        typeArguments?: NodeArray<TypeNode>;
         template: TemplateLiteral;
     }
 
@@ -1898,7 +1900,7 @@ namespace ts {
         kind: SyntaxKind.DebuggerStatement;
     }
 
-    export interface MissingDeclaration extends DeclarationStatement, ClassElement, ObjectLiteralElement, TypeElement {
+    export interface MissingDeclaration extends DeclarationStatement {
         kind: SyntaxKind.MissingDeclaration;
         name?: Identifier;
     }
@@ -2337,7 +2339,7 @@ namespace ts {
     }
 
     export interface JSDocTag extends Node {
-        parent: JSDoc;
+        parent: JSDoc | JSDocTypeLiteral;
         atToken: AtToken;
         tagName: Identifier;
         comment: string | undefined;
@@ -2534,7 +2536,7 @@ namespace ts {
         /**
          * If two source files are for the same version of the same package, one will redirect to the other.
          * (See `createRedirectSourceFile` in program.ts.)
-         * The redirect will have this set. The other will not have anything set, but see Program#sourceFileIsRedirectedTo.
+         * The redirect will have this set. The redirected-to source file will be in `redirectTargetsSet`.
          */
         /* @internal */ redirectInfo?: RedirectInfo | undefined;
 
@@ -2730,6 +2732,8 @@ namespace ts {
         /* @internal */ redirectTargetsSet: Map<true>;
         /** Is the file emitted file */
         /* @internal */ isEmittedFile(file: string): boolean;
+
+        /* @internal */ getResolvedModuleWithFailedLookupLocationsFromCache(moduleName: string, containingFile: string): ResolvedModuleWithFailedLookupLocations | undefined;
     }
 
     /* @internal */
@@ -3003,6 +3007,13 @@ namespace ts {
          * Others are added in computeSuggestionDiagnostics.
          */
         /* @internal */ getSuggestionDiagnostics(file: SourceFile): ReadonlyArray<Diagnostic>;
+
+        /**
+         * Depending on the operation performed, it may be appropriate to throw away the checker
+         * if the cancellation token is triggered. Typically, if it is used for error checking
+         * and the operation is cancelled, then it should be discarded, otherwise it is safe to keep.
+         */
+        runWithCancellationToken<T>(token: CancellationToken, cb: (checker: TypeChecker) => T): T;
     }
 
     /* @internal */
@@ -3199,7 +3210,8 @@ namespace ts {
     export type AnyValidImportOrReExport =
         | (ImportDeclaration | ExportDeclaration) & { moduleSpecifier: StringLiteral }
         | ImportEqualsDeclaration & { moduleReference: ExternalModuleReference & { expression: StringLiteral } }
-        | RequireOrImportCall;
+        | RequireOrImportCall
+        | ImportTypeNode & { argument: LiteralType };
 
     /* @internal */
     export type RequireOrImportCall = CallExpression & { arguments: [StringLiteralLike] };
@@ -3379,6 +3391,7 @@ namespace ts {
         /* @internal */ mergeId?: number;       // Merge id (used to look up merged symbol)
         /* @internal */ parent?: Symbol;        // Parent symbol
         /* @internal */ exportSymbol?: Symbol;  // Exported symbol associated with this symbol
+        /* @internal */ nameType?: Type;        // Type associated with a late-bound symbol
         /* @internal */ constEnumOnlyModule?: boolean; // True if module contains only const enums or other modules with only const enums
         /* @internal */ isReferenced?: SymbolFlags; // True if the symbol is referenced elsewhere. Keeps track of the meaning of a reference in case a symbol is both a type parameter and parameter.
         /* @internal */ isReplaceableByMethod?: boolean; // Can this Javascript class property be replaced by a method symbol?
@@ -3413,7 +3426,6 @@ namespace ts {
         enumKind?: EnumKind;                // Enum declaration classification
         originatingImport?: ImportDeclaration | ImportCall; // Import declaration which produced the symbol, present if the symbol is marked as uncallable but had call signatures in `resolveESModuleSymbol`
         lateSymbol?: Symbol;                // Late-bound symbol for a computed property
-        nameType?: Type;                    // Type associate with a late-bound or mapped type property symbol's name
     }
 
     /* @internal */
@@ -3610,7 +3622,7 @@ namespace ts {
         Intrinsic = Any | String | Number | Boolean | BooleanLiteral | ESSymbol | Void | Undefined | Null | Never | NonPrimitive,
         /* @internal */
         Primitive = String | Number | Boolean | Enum | EnumLiteral | ESSymbol | Void | Undefined | Null | Literal | UniqueESSymbol,
-        StringLike = String | StringLiteral | Index,
+        StringLike = String | StringLiteral,
         NumberLike = Number | NumberLiteral | Enum,
         BooleanLike = Boolean | BooleanLiteral,
         EnumLike = Enum | EnumLiteral,
@@ -3767,7 +3779,7 @@ namespace ts {
         /* @internal */
         resolvedIndexType: IndexType;
         /* @internal */
-        resolvedDeclaredIndexType: IndexType;
+        resolvedStringIndexType: IndexType;
         /* @internal */
         resolvedBaseConstraint: Type;
         /* @internal */
@@ -3856,7 +3868,7 @@ namespace ts {
         /* @internal */
         resolvedIndexType?: IndexType;
         /* @internal */
-        resolvedDeclaredIndexType?: IndexType;
+        resolvedStringIndexType?: IndexType;
     }
 
     // Type parameters (TypeFlags.TypeParameter)
@@ -3888,9 +3900,9 @@ namespace ts {
 
     // keyof T types (TypeFlags.Index)
     export interface IndexType extends InstantiableType {
-        /* @internal */
-        isDeclaredType?: boolean;
         type: InstantiableType | UnionOrIntersectionType;
+        /* @internal */
+        stringsOnly: boolean;
     }
 
     export interface ConditionalRoot {
@@ -4049,10 +4061,10 @@ namespace ts {
 
     /* @internal */
     export interface WideningContext {
-        parent?: WideningContext;            // Parent context
-        propertyName?: __String;             // Name of property in parent
-        siblings?: Type[];                   // Types of siblings
-        resolvedPropertyNames?: __String[];  // Property names occurring in sibling object literals
+        parent?: WideningContext;       // Parent context
+        propertyName?: __String;        // Name of property in parent
+        siblings?: Type[];              // Types of siblings
+        resolvedProperties?: Symbol[];  // Properties occurring in sibling object literals
     }
 
     /* @internal */
@@ -4083,7 +4095,7 @@ namespace ts {
         category: DiagnosticCategory;
         code: number;
         message: string;
-        unused?: {};
+        reportsUnnecessary?: {};
     }
 
     /**
@@ -4167,6 +4179,7 @@ namespace ts {
         inlineSources?: boolean;
         isolatedModules?: boolean;
         jsx?: JsxEmit;
+        keyofStringsOnly?: boolean;
         lib?: string[];
         /*@internal*/listEmittedFiles?: boolean;
         /*@internal*/listFiles?: boolean;
@@ -4200,7 +4213,7 @@ namespace ts {
         preserveSymlinks?: boolean;
         /* @internal */ preserveWatchOutput?: boolean;
         project?: string;
-        /* @internal */ pretty?: DiagnosticStyle;
+        /* @internal */ pretty?: boolean;
         reactNamespace?: string;
         jsxFactory?: string;
         removeComments?: boolean;
@@ -4298,12 +4311,6 @@ namespace ts {
         JSX,
     }
 
-    /* @internal */
-    export const enum DiagnosticStyle {
-        Simple,
-        Pretty,
-    }
-
     /** Either a parsed command line or a parsed tsconfig.json */
     export interface ParsedCommandLine {
         options: CompilerOptions;
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index a73efb55eef..c5cb19e876a 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1,5 +1,3 @@
-/// <reference path="sys.ts" />
-
 /* @internal */
 namespace ts {
     export const resolvingEmptyArray: never[] = [] as never[];
@@ -1712,8 +1710,10 @@ namespace ts {
                 return (node.parent as ExternalModuleReference).parent as AnyValidImportOrReExport;
             case SyntaxKind.CallExpression:
                 return node.parent as AnyValidImportOrReExport;
+            case SyntaxKind.LiteralType:
+                return cast(node.parent.parent, isImportTypeNode) as ImportTypeNode & { argument: LiteralType };
             default:
-                return Debug.fail(Debug.showSyntaxKind(node));
+                return Debug.fail(Debug.showSyntaxKind(node.parent));
         }
     }
 
@@ -1818,10 +1818,8 @@ namespace ts {
 
         function getJSDocCommentsAndTagsWorker(node: Node): void {
             const parent = node.parent;
-            if (parent &&
-                (parent.kind === SyntaxKind.PropertyAssignment ||
-                 parent.kind === SyntaxKind.PropertyDeclaration ||
-                 getNestedModuleDeclaration(parent))) {
+            if (!parent) return;
+            if (parent.kind === SyntaxKind.PropertyAssignment || parent.kind === SyntaxKind.PropertyDeclaration || getNestedModuleDeclaration(parent)) {
                 getJSDocCommentsAndTagsWorker(parent);
             }
             // Try to recognize this pattern when node is initializer of variable declaration and JSDoc comments are on containing variable statement.
@@ -1830,16 +1828,18 @@ namespace ts {
             //   * @returns {number}
             //   */
             // var x = function(name) { return name.length; }
-            if (parent && parent.parent &&
+            if (parent.parent &&
                 (getSingleVariableOfVariableStatement(parent.parent) === node || getSourceOfAssignment(parent.parent))) {
                 getJSDocCommentsAndTagsWorker(parent.parent);
             }
-            if (parent && parent.parent && parent.parent.parent &&
-                (getSingleInitializerOfVariableStatementOrPropertyDeclaration(parent.parent.parent) === node || getSourceOfDefaultedAssignment(parent.parent.parent))) {
+            if (parent.parent && parent.parent.parent &&
+                (getSingleVariableOfVariableStatement(parent.parent.parent) ||
+                    getSingleInitializerOfVariableStatementOrPropertyDeclaration(parent.parent.parent) === node ||
+                    getSourceOfDefaultedAssignment(parent.parent.parent))) {
                 getJSDocCommentsAndTagsWorker(parent.parent.parent);
             }
             if (isBinaryExpression(node) && getSpecialPropertyAssignmentKind(node) !== SpecialPropertyAssignmentKind.None ||
-                parent && isBinaryExpression(parent) && getSpecialPropertyAssignmentKind(parent) !== SpecialPropertyAssignmentKind.None ||
+                isBinaryExpression(parent) && getSpecialPropertyAssignmentKind(parent) !== SpecialPropertyAssignmentKind.None ||
                 node.kind === SyntaxKind.PropertyAccessExpression && node.parent && node.parent.kind === SyntaxKind.ExpressionStatement) {
                 getJSDocCommentsAndTagsWorker(parent);
             }
@@ -1888,6 +1888,9 @@ namespace ts {
     }
 
     export function getJSDocHost(node: JSDocTag): HasJSDoc {
+        while (node.parent.kind === SyntaxKind.JSDocTypeLiteral) {
+            node = node.parent.parent.parent as JSDocParameterTag;
+        }
         Debug.assert(node.parent!.kind === SyntaxKind.JSDocComment);
         return node.parent!.parent!;
     }
@@ -2137,11 +2140,13 @@ namespace ts {
             node.kind === SyntaxKind.NamespaceImport ||
             node.kind === SyntaxKind.ImportSpecifier ||
             node.kind === SyntaxKind.ExportSpecifier ||
-            node.kind === SyntaxKind.ExportAssignment && exportAssignmentIsAlias(<ExportAssignment>node);
+            node.kind === SyntaxKind.ExportAssignment && exportAssignmentIsAlias(<ExportAssignment>node) ||
+            isBinaryExpression(node) && getSpecialPropertyAssignmentKind(node) === SpecialPropertyAssignmentKind.ModuleExports;
     }
 
-    export function exportAssignmentIsAlias(node: ExportAssignment): boolean {
-        return isEntityNameExpression(node.expression);
+    export function exportAssignmentIsAlias(node: ExportAssignment | BinaryExpression): boolean {
+        const e = isExportAssignment(node) ? node.expression : node.right;
+        return isEntityNameExpression(e) || isClassExpression(e);
     }
 
     export function getClassExtendsHeritageClauseElement(node: ClassLikeDeclaration | InterfaceDeclaration) {
@@ -2933,11 +2938,7 @@ namespace ts {
     }
 
     export function getFirstConstructorWithBody(node: ClassLikeDeclaration): ConstructorDeclaration {
-        return forEach(node.members, member => {
-            if (member.kind === SyntaxKind.Constructor && nodeIsPresent((<ConstructorDeclaration>member).body)) {
-                return <ConstructorDeclaration>member;
-            }
-        });
+        return find(node.members, (member): member is ConstructorDeclaration => isConstructorDeclaration(member) && nodeIsPresent(member.body));
     }
 
     function getSetAccessorValueParameter(accessor: SetAccessorDeclaration): ParameterDeclaration | undefined {
@@ -3039,6 +3040,10 @@ namespace ts {
         return (node as HasType).type || (isInJavaScriptFile(node) ? getJSDocType(node) : undefined);
     }
 
+    export function getTypeAnnotationNode(node: Node): TypeNode | undefined {
+        return (node as HasType).type;
+    }
+
     /**
      * Gets the effective return type annotation of a signature. If the node was parsed in a
      * JavaScript file, gets the return type annotation from JSDoc.
@@ -3051,11 +3056,11 @@ namespace ts {
      * Gets the effective type parameters. If the node was parsed in a
      * JavaScript file, gets the type parameters from the `@template` tag from JSDoc.
      */
-    export function getEffectiveTypeParameterDeclarations(node: DeclarationWithTypeParameters): ReadonlyArray<TypeParameterDeclaration> | undefined {
+    export function getEffectiveTypeParameterDeclarations(node: DeclarationWithTypeParameters) {
         return node.typeParameters || (isInJavaScriptFile(node) ? getJSDocTypeParameterDeclarations(node) : undefined);
     }
 
-    export function getJSDocTypeParameterDeclarations(node: DeclarationWithTypeParameters): ReadonlyArray<TypeParameterDeclaration> {
+    export function getJSDocTypeParameterDeclarations(node: DeclarationWithTypeParameters) {
         const templateTag = getJSDocTemplateTag(node);
         return templateTag && templateTag.typeParameters;
     }
@@ -4273,8 +4278,9 @@ namespace ts {
         }
     }
 
-    export function isParameterPropertyDeclaration(node: Node): boolean {
-        return hasModifier(node, ModifierFlags.ParameterPropertyModifier) && node.parent.kind === SyntaxKind.Constructor && isClassLike(node.parent.parent);
+    export type ParameterPropertyDeclaration = ParameterDeclaration & { parent: ConstructorDeclaration, name: Identifier };
+    export function isParameterPropertyDeclaration(node: Node): node is ParameterPropertyDeclaration {
+        return hasModifier(node, ModifierFlags.ParameterPropertyModifier) && node.parent.kind === SyntaxKind.Constructor;
     }
 
     export function isEmptyBindingPattern(node: BindingName): node is BindingPattern {
@@ -4632,11 +4638,21 @@ namespace ts {
      * parameters by name and binding patterns do not have a name.
      */
     export function getJSDocParameterTags(param: ParameterDeclaration): ReadonlyArray<JSDocParameterTag> {
-        if (param.name && isIdentifier(param.name)) {
-            const name = param.name.escapedText;
-            return getJSDocTags(param.parent).filter((tag): tag is JSDocParameterTag => isJSDocParameterTag(tag) && isIdentifier(tag.name) && tag.name.escapedText === name);
+        if (param.name) {
+            if (isIdentifier(param.name)) {
+                const name = param.name.escapedText;
+                return getJSDocTags(param.parent).filter((tag): tag is JSDocParameterTag => isJSDocParameterTag(tag) && isIdentifier(tag.name) && tag.name.escapedText === name);
+            }
+            else {
+                const i = param.parent.parameters.indexOf(param);
+                Debug.assert(i > -1, "Parameters should always be in their parents' parameter list");
+                const paramTags = getJSDocTags(param.parent).filter(isJSDocParameterTag);
+                if (i < paramTags.length) {
+                    return [paramTags[i]];
+                }
+            }
         }
-        // a binding pattern doesn't have a name, so it's not possible to match it a JSDoc parameter, which is identified by name
+        // return empty array for: out-of-order binding patterns and JSDoc function syntax, which has un-named parameters
         return emptyArray;
     }
 
@@ -4913,6 +4929,10 @@ namespace ts {
         return node.kind === SyntaxKind.LiteralType;
     }
 
+    export function isImportTypeNode(node: Node): node is ImportTypeNode {
+        return node.kind === SyntaxKind.ImportType;
+    }
+
     // Binding patterns
 
     export function isObjectBindingPattern(node: Node): node is ObjectBindingPattern {
@@ -5593,8 +5613,7 @@ namespace ts {
             || kind === SyntaxKind.GetAccessor
             || kind === SyntaxKind.SetAccessor
             || kind === SyntaxKind.IndexSignature
-            || kind === SyntaxKind.SemicolonClassElement
-            || kind === SyntaxKind.MissingDeclaration;
+            || kind === SyntaxKind.SemicolonClassElement;
     }
 
     export function isClassLike(node: Node): node is ClassLikeDeclaration {
@@ -5625,8 +5644,11 @@ namespace ts {
             || kind === SyntaxKind.CallSignature
             || kind === SyntaxKind.PropertySignature
             || kind === SyntaxKind.MethodSignature
-            || kind === SyntaxKind.IndexSignature
-            || kind === SyntaxKind.MissingDeclaration;
+            || kind === SyntaxKind.IndexSignature;
+    }
+
+    export function isClassOrTypeElement(node: Node): node is ClassElement | TypeElement {
+        return isTypeElement(node) || isClassElement(node);
     }
 
     export function isObjectLiteralElementLike(node: Node): node is ObjectLiteralElementLike {
@@ -5636,8 +5658,7 @@ namespace ts {
             || kind === SyntaxKind.SpreadAssignment
             || kind === SyntaxKind.MethodDeclaration
             || kind === SyntaxKind.GetAccessor
-            || kind === SyntaxKind.SetAccessor
-            || kind === SyntaxKind.MissingDeclaration;
+            || kind === SyntaxKind.SetAccessor;
     }
 
     // Type
@@ -6311,4 +6332,9 @@ namespace ts {
     export function isStringLiteralLike(node: Node): node is StringLiteralLike {
         return node.kind === SyntaxKind.StringLiteral || node.kind === SyntaxKind.NoSubstitutionTemplateLiteral;
     }
+
+    /** @internal */
+    export function isNamedImportsOrExports(node: Node): node is NamedImportsOrExports {
+        return node.kind === SyntaxKind.NamedImports || node.kind === SyntaxKind.NamedExports;
+    }
 }
diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts
index 8d8e47a8f4c..284d870caa1 100644
--- a/src/compiler/visitor.ts
+++ b/src/compiler/visitor.ts
@@ -1,7 +1,3 @@
-/// <reference path="checker.ts" />
-/// <reference path="factory.ts" />
-/// <reference path="utilities.ts" />
-
 namespace ts {
     const isTypeNodeOrTypeParameterDeclaration = or(isTypeNode, isTypeParameterDeclaration);
 
@@ -482,6 +478,7 @@ namespace ts {
             case SyntaxKind.TaggedTemplateExpression:
                 return updateTaggedTemplate(<TaggedTemplateExpression>node,
                     visitNode((<TaggedTemplateExpression>node).tag, visitor, isExpression),
+                    visitNodes((<TaggedTemplateExpression>node).typeArguments, visitor, isExpression),
                     visitNode((<TaggedTemplateExpression>node).template, visitor, isTemplateLiteral));
 
             case SyntaxKind.TypeAssertionExpression:
diff --git a/src/compiler/watch.ts b/src/compiler/watch.ts
index f53f01e3eb2..f0bb151b814 100644
--- a/src/compiler/watch.ts
+++ b/src/compiler/watch.ts
@@ -1,7 +1,3 @@
-/// <reference path="program.ts" />
-/// <reference path="builder.ts" />
-/// <reference path="resolutionCache.ts"/>
-
 /*@internal*/
 namespace ts {
     const sysFormatDiagnosticsHost: FormatDiagnosticsHost = sys ? {
@@ -33,19 +29,36 @@ namespace ts {
 
     /** @internal */
     export const nonClearingMessageCodes: number[] = [
-        Diagnostics.Compilation_complete_Watching_for_file_changes.code,
-        Diagnostics.Found_1_error.code,
-        Diagnostics.Found_0_errors.code
+        Diagnostics.Found_1_error_Watching_for_file_changes.code,
+        Diagnostics.Found_0_errors_Watching_for_file_changes.code
     ];
 
-    function clearScreenIfNotWatchingForFileChanges(system: System, diagnostic: Diagnostic, options: CompilerOptions) {
+    /**
+     * @returns Whether the screen was cleared.
+     */
+    function clearScreenIfNotWatchingForFileChanges(system: System, diagnostic: Diagnostic, options: CompilerOptions): boolean {
         if (system.clearScreen &&
             !options.preserveWatchOutput &&
             !options.extendedDiagnostics &&
             !options.diagnostics &&
             !contains(nonClearingMessageCodes, diagnostic.code)) {
             system.clearScreen();
+            return true;
         }
+
+        return false;
+    }
+
+    /** @internal */
+    export const screenStartingMessageCodes: number[] = [
+        Diagnostics.Starting_compilation_in_watch_mode.code,
+        Diagnostics.File_change_detected_Starting_incremental_compilation.code,
+    ];
+
+    function getPlainDiagnosticFollowingNewLines(diagnostic: Diagnostic, newLine: string): string {
+        return contains(screenStartingMessageCodes, diagnostic.code)
+            ? newLine + newLine
+            : newLine;
     }
 
     /**
@@ -56,13 +69,19 @@ namespace ts {
             (diagnostic, newLine, options) => {
                 clearScreenIfNotWatchingForFileChanges(system, diagnostic, options);
                 let output = `[${formatColorAndReset(new Date().toLocaleTimeString(), ForegroundColorEscapeSequences.Grey)}] `;
-                output += `${flattenDiagnosticMessageText(diagnostic.messageText, system.newLine)}${newLine + newLine + newLine}`;
+                output += `${flattenDiagnosticMessageText(diagnostic.messageText, system.newLine)}${newLine + newLine}`;
                 system.write(output);
             } :
             (diagnostic, newLine, options) => {
-                clearScreenIfNotWatchingForFileChanges(system, diagnostic, options);
-                let output = new Date().toLocaleTimeString() + " - ";
-                output += `${flattenDiagnosticMessageText(diagnostic.messageText, system.newLine)}${newLine + newLine + newLine}`;
+                let output = "";
+
+                if (!clearScreenIfNotWatchingForFileChanges(system, diagnostic, options)) {
+                    output += newLine;
+                }
+
+                output += `${new Date().toLocaleTimeString()} - `;
+                output += `${flattenDiagnosticMessageText(diagnostic.messageText, system.newLine)}${getPlainDiagnosticFollowingNewLines(diagnostic, newLine)}`;
+
                 system.write(output);
             };
     }
@@ -235,10 +254,10 @@ namespace ts {
 
             const reportSummary = (errorCount: number) => {
                 if (errorCount === 1) {
-                    onWatchStatusChange(createCompilerDiagnostic(Diagnostics.Found_1_error, errorCount), newLine, compilerOptions);
+                    onWatchStatusChange(createCompilerDiagnostic(Diagnostics.Found_1_error_Watching_for_file_changes, errorCount), newLine, compilerOptions);
                 }
                 else {
-                    onWatchStatusChange(createCompilerDiagnostic(Diagnostics.Found_0_errors, errorCount, errorCount), newLine, compilerOptions);
+                    onWatchStatusChange(createCompilerDiagnostic(Diagnostics.Found_0_errors_Watching_for_file_changes, errorCount, errorCount), newLine, compilerOptions);
                 }
             };
 
@@ -648,7 +667,7 @@ namespace ts {
             if (host.afterProgramCreate) {
                 host.afterProgramCreate(builderProgram);
             }
-            reportWatchDiagnostic(Diagnostics.Compilation_complete_Watching_for_file_changes);
+
             return builderProgram;
         }
 
diff --git a/src/compiler/watchUtilities.ts b/src/compiler/watchUtilities.ts
index 12ed9f855df..4fa9b28e162 100644
--- a/src/compiler/watchUtilities.ts
+++ b/src/compiler/watchUtilities.ts
@@ -1,5 +1,3 @@
-/// <reference path="core.ts" />
-
 /* @internal */
 namespace ts {
     /**
diff --git a/src/harness/externalCompileRunner.ts b/src/harness/externalCompileRunner.ts
index 1f945cfcc9c..3d07c69af85 100644
--- a/src/harness/externalCompileRunner.ts
+++ b/src/harness/externalCompileRunner.ts
@@ -66,7 +66,7 @@ abstract class ExternalCompileRunnerBase extends RunnerBase {
                     if (fs.existsSync(path.join(cwd, "node_modules"))) {
                         require("del").sync(path.join(cwd, "node_modules"), { force: true });
                     }
-                    const install = cp.spawnSync(`npm`, ["i"], { cwd, timeout: timeout / 2, shell: true, stdio }); // NPM shouldn't take the entire timeout - if it takes a long time, it should be terminated and we should log the failure
+                    const install = cp.spawnSync(`npm`, ["i", "--ignore-scripts"], { cwd, timeout: timeout / 2, shell: true, stdio }); // NPM shouldn't take the entire timeout - if it takes a long time, it should be terminated and we should log the failure
                     if (install.status !== 0) throw new Error(`NPM Install for ${directoryName} failed: ${install.stderr.toString()}`);
                 }
                 const args = [path.join(__dirname, "tsc.js")];
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index 8c71a385d58..7dfff7dd189 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -276,14 +276,10 @@ namespace FourSlash {
             if (configFileName) {
                 const baseDir = ts.normalizePath(ts.getDirectoryPath(configFileName));
                 const host = new Utils.MockParseConfigHost(baseDir, /*ignoreCase*/ false, this.inputFiles);
-
-                const configJsonObj = ts.parseConfigFileTextToJson(configFileName, this.inputFiles.get(configFileName));
-                assert.isTrue(configJsonObj.config !== undefined);
-
-                compilationOptions = ts.parseJsonConfigFileContent(configJsonObj.config, host, baseDir, compilationOptions, configFileName).options;
+                const jsonSourceFile = ts.parseJsonText(configFileName, this.inputFiles.get(configFileName));
+                compilationOptions = ts.parseJsonSourceFileConfigFileContent(jsonSourceFile, host, baseDir, compilationOptions, configFileName).options;
             }
 
-
             if (compilationOptions.typeRoots) {
                 compilationOptions.typeRoots = compilationOptions.typeRoots.map(p => ts.getNormalizedAbsolutePath(p, this.basePath));
             }
@@ -842,6 +838,7 @@ namespace FourSlash {
 
             const actualCompletions = this.getCompletionListAtCaret(options);
             if (!actualCompletions) {
+                if (expected === undefined) return;
                 this.raiseError(`No completions at position '${this.currentCaretPosition}'.`);
             }
 
@@ -1081,8 +1078,20 @@ namespace FourSlash {
             }
         }
 
+        private verifyDocumentHighlightsRespectFilesList(files: ReadonlyArray<string>): void {
+            const startFile = this.activeFile.fileName;
+            for (const fileName of files) {
+                const searchFileNames = startFile === fileName ? [startFile] : [startFile, fileName];
+                const highlights = this.getDocumentHighlightsAtCurrentPosition(searchFileNames);
+                if (!highlights.every(dh => ts.contains(searchFileNames, dh.fileName))) {
+                    this.raiseError(`When asking for document highlights only in files ${searchFileNames}, got document highlights in ${unique(highlights, dh => dh.fileName)}`);
+                }
+            }
+        }
+
         public verifyReferencesOf(range: Range, references: Range[]) {
             this.goToRangeStart(range);
+            this.verifyDocumentHighlightsRespectFilesList(unique(references, e => e.fileName));
             this.verifyReferencesAre(references);
         }
 
@@ -1094,7 +1103,7 @@ namespace FourSlash {
             }
         }
 
-        public verifyReferenceGroups(starts: string | string[] | Range | Range[], parts: FourSlashInterface.ReferenceGroup[]): void {
+        public verifyReferenceGroups(starts: string | string[] | Range | Range[], parts: FourSlashInterface.ReferenceGroup[] | undefined): void {
             interface ReferenceGroupJson {
                 definition: string | { text: string, range: ts.TextSpan };
                 references: ts.ReferenceEntry[];
@@ -1128,6 +1137,10 @@ namespace FourSlash {
                     };
                 });
                 this.assertObjectsEqual(fullActual, fullExpected);
+
+                if (parts) {
+                    this.verifyDocumentHighlightsRespectFilesList(unique(ts.flatMap(parts, p => p.ranges), r => r.fileName));
+                }
             }
         }
 
@@ -2087,14 +2100,11 @@ Actual: ${stringify(fullActual)}`);
                 this.raiseError("verifyRangesInImplementationList failed - expected to find at least one implementation location but got 0");
             }
 
-            for (let i = 0; i < implementations.length; i++) {
-                for (let j = 0; j < implementations.length; j++) {
-                    if (i !== j && implementationsAreEqual(implementations[i], implementations[j])) {
-                        const { textSpan, fileName } = implementations[i];
-                        const end = textSpan.start + textSpan.length;
-                        this.raiseError(`Duplicate implementations returned for range (${textSpan.start}, ${end}) in ${fileName}`);
-                    }
-                }
+            const duplicate = findDuplicatedElement(implementations, implementationsAreEqual);
+            if (duplicate) {
+                const { textSpan, fileName } = duplicate;
+                const end = textSpan.start + textSpan.length;
+                this.raiseError(`Duplicate implementations returned for range (${textSpan.start}, ${end}) in ${fileName}`);
             }
 
             const ranges = this.getRanges();
@@ -2409,14 +2419,7 @@ Actual: ${stringify(fullActual)}`);
         public applyCodeActionFromCompletion(markerName: string, options: FourSlashInterface.VerifyCompletionActionOptions) {
             this.goToMarker(markerName);
 
-            const actualCompletion = this.getCompletionListAtCaret({ ...ts.defaultPreferences, includeCompletionsForModuleExports: true }).entries.find(e =>
-                e.name === options.name && e.source === options.source);
-
-            if (!actualCompletion.hasAction) {
-                this.raiseError(`Completion for ${options.name} does not have an associated action.`);
-            }
-
-            const details = this.getCompletionEntryDetails(options.name, actualCompletion.source, options.preferences);
+            const details = this.getCompletionEntryDetails(options.name, options.source, options.preferences);
             if (details.codeActions.length !== 1) {
                 this.raiseError(`Expected one code action, got ${details.codeActions.length}`);
             }
@@ -2894,6 +2897,7 @@ Actual: ${stringify(fullActual)}`);
         }
 
         private verifyDocumentHighlights(expectedRanges: Range[], fileNames: ReadonlyArray<string> = [this.activeFile.fileName]) {
+            fileNames = ts.map(fileNames, ts.normalizePath);
             const documentHighlights = this.getDocumentHighlightsAtCurrentPosition(fileNames) || [];
 
             for (const dh of documentHighlights) {
@@ -2903,7 +2907,7 @@ Actual: ${stringify(fullActual)}`);
             }
 
             for (const fileName of fileNames) {
-                const expectedRangesInFile = expectedRanges.filter(r => r.fileName === fileName);
+                const expectedRangesInFile = expectedRanges.filter(r => ts.normalizePath(r.fileName) === fileName);
                 const highlights = ts.find(documentHighlights, dh => dh.fileName === fileName);
                 const spansInFile = highlights ? highlights.highlightSpans.sort((s1, s2) => s1.textSpan.start - s2.textSpan.start) : [];
 
@@ -3203,14 +3207,14 @@ Actual: ${stringify(fullActual)}`);
                 }
             }
             else if (ts.isString(indexOrName)) {
-                let name = indexOrName;
+                let name = ts.normalizePath(indexOrName);
 
                 // names are stored in the compiler with this relative path, this allows people to use goTo.file on just the fileName
                 name = name.indexOf("/") === -1 ? (this.basePath + "/" + name) : name;
 
                 const availableNames: string[] = [];
                 const result = ts.forEach(this.testData.files, file => {
-                    const fn = file.fileName;
+                    const fn = ts.normalizePath(file.fileName);
                     if (fn) {
                         if (fn === name) {
                             return file;
@@ -3265,6 +3269,15 @@ Actual: ${stringify(fullActual)}`);
         private static textSpansEqual(a: ts.TextSpan, b: ts.TextSpan) {
             return a && b && a.start === b.start && a.length === b.length;
         }
+
+        public getEditsForFileRename(options: FourSlashInterface.GetEditsForFileRenameOptions): void {
+            const changes = this.languageService.getEditsForFileRename(options.oldPath, options.newPath, this.formatCodeSettings);
+            this.applyChanges(changes);
+            for (const fileName in options.newFileContents) {
+                this.openFile(fileName);
+                this.verifyCurrentFileContent(options.newFileContents[fileName]);
+            }
+        }
     }
 
     export function runFourSlashTest(basePath: string, testType: FourSlashTestType, fileName: string) {
@@ -3739,6 +3752,16 @@ ${code}
     function stripWhitespace(s: string): string {
         return s.replace(/\s/g, "");
     }
+
+    function findDuplicatedElement<T>(a: ReadonlyArray<T>, equal: (a: T, b: T) => boolean): T {
+        for (let i = 0; i < a.length; i++) {
+            for (let j = i + 1; j < a.length; j++) {
+                if (equal(a[i], a[j])) {
+                    return a[i];
+                }
+            }
+        }
+    }
 }
 
 namespace FourSlashInterface {
@@ -4346,6 +4369,10 @@ namespace FourSlashInterface {
         public allRangesAppearInImplementationList(markerName: string) {
             this.state.verifyRangesInImplementationList(markerName);
         }
+
+        public getEditsForFileRename(options: GetEditsForFileRenameOptions) {
+            this.state.getEditsForFileRename(options);
+        }
     }
 
     export class Edit {
@@ -4629,10 +4656,12 @@ namespace FourSlashInterface {
 
     export type ExpectedCompletionEntry = string | { name: string, insertText?: string, replacementSpan?: FourSlash.Range };
     export interface CompletionsAtOptions extends Partial<ts.UserPreferences> {
+        triggerCharacter?: string;
         isNewIdentifierLocation?: boolean;
     }
 
     export interface VerifyCompletionListContainsOptions extends ts.UserPreferences {
+        triggerCharacter?: string;
         sourceDisplay: string;
         isRecommended?: true;
         insertText?: string;
@@ -4686,4 +4715,10 @@ namespace FourSlashInterface {
         range?: FourSlash.Range;
         code: number;
     }
+
+    export interface GetEditsForFileRenameOptions {
+        readonly oldPath: string;
+        readonly newPath: string;
+        readonly newFileContents: { readonly [fileName: string]: string };
+    }
 }
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
index 9e6978f2a15..9fe26ed51c3 100644
--- a/src/harness/harness.ts
+++ b/src/harness/harness.ts
@@ -304,14 +304,13 @@ namespace Utils {
                 o.containsParseError = true;
             }
 
-            ts.forEach(Object.getOwnPropertyNames(n), propertyName => {
+            for (const propertyName of Object.getOwnPropertyNames(n) as ReadonlyArray<keyof ts.SourceFile | keyof ts.Identifier>) {
                 switch (propertyName) {
                     case "parent":
                     case "symbol":
                     case "locals":
                     case "localSymbol":
                     case "kind":
-                    case "semanticDiagnostics":
                     case "id":
                     case "nodeCount":
                     case "symbolCount":
@@ -334,7 +333,6 @@ namespace Utils {
                         }
                         break;
 
-                    case "referenceDiagnostics":
                     case "parseDiagnostics":
                         o[propertyName] = convertDiagnostics((<any>n)[propertyName]);
                         break;
@@ -355,9 +353,7 @@ namespace Utils {
                     default:
                         o[propertyName] = (<any>n)[propertyName];
                 }
-
-                return undefined;
-            });
+            }
 
             return o;
         }
diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
index 17788f6251d..0063a4730f1 100644
--- a/src/harness/harnessLanguageService.ts
+++ b/src/harness/harnessLanguageService.ts
@@ -528,6 +528,9 @@ namespace Harness.LanguageService {
         organizeImports(_scope: ts.OrganizeImportsScope, _formatOptions: ts.FormatCodeSettings): ReadonlyArray<ts.FileTextChanges> {
             throw new Error("Not supported on the shim.");
         }
+        getEditsForFileRename(): ReadonlyArray<ts.FileTextChanges> {
+            throw new Error("Not supported on the shim.");
+        }
         getEmitOutput(fileName: string): ts.EmitOutput {
             return unwrapJSONCallResult(this.shim.getEmitOutput(fileName));
         }
diff --git a/src/harness/tsconfig.json b/src/harness/tsconfig.json
index fe4b066c5e7..a4ad8cb3797 100644
--- a/src/harness/tsconfig.json
+++ b/src/harness/tsconfig.json
@@ -13,132 +13,146 @@
         ]
     },
     "files": [
-        "../compiler/core.ts",
-        "../compiler/performance.ts",
-        "../compiler/sys.ts",
         "../compiler/types.ts",
+        "../compiler/performance.ts",
+        "../compiler/core.ts",
+        "../compiler/sys.ts",
+        "../compiler/diagnosticInformationMap.generated.ts",
         "../compiler/scanner.ts",
-        "../compiler/parser.ts",
         "../compiler/utilities.ts",
+        "../compiler/parser.ts",
         "../compiler/binder.ts",
         "../compiler/symbolWalker.ts",
+        "../compiler/moduleNameResolver.ts",
         "../compiler/checker.ts",
         "../compiler/factory.ts",
         "../compiler/visitor.ts",
         "../compiler/transformers/utilities.ts",
+        "../compiler/transformers/destructuring.ts",
         "../compiler/transformers/ts.ts",
-        "../compiler/transformers/jsx.ts",
-        "../compiler/transformers/esnext.ts",
         "../compiler/transformers/es2017.ts",
+        "../compiler/transformers/esnext.ts",
+        "../compiler/transformers/jsx.ts",
         "../compiler/transformers/es2016.ts",
         "../compiler/transformers/es2015.ts",
         "../compiler/transformers/es5.ts",
         "../compiler/transformers/generators.ts",
-        "../compiler/transformers/es5.ts",
-        "../compiler/transformers/destructuring.ts",
         "../compiler/transformers/module/module.ts",
         "../compiler/transformers/module/system.ts",
         "../compiler/transformers/module/es2015.ts",
         "../compiler/transformers/declarations/diagnostics.ts",
         "../compiler/transformers/declarations.ts",
         "../compiler/transformer.ts",
-        "../compiler/comments.ts",
         "../compiler/sourcemap.ts",
+        "../compiler/comments.ts",
         "../compiler/emitter.ts",
+        "../compiler/watchUtilities.ts",
         "../compiler/program.ts",
+        "../compiler/builderState.ts",
         "../compiler/builder.ts",
+        "../compiler/resolutionCache.ts",
+        "../compiler/watch.ts",
         "../compiler/commandLineParser.ts",
-        "../compiler/diagnosticInformationMap.generated.ts",
-        "../services/breakpoints.ts",
-        "../services/navigateTo.ts",
-        "../services/navigationBar.ts",
-        "../services/outliningElementsCollector.ts",
-        "../services/patternMatcher.ts",
+
+        "../services/types.ts",
+        "../services/utilities.ts",
+        "../services/classifier.ts",
         "../services/pathCompletions.ts",
         "../services/completions.ts",
-        "../services/services.ts",
-        "../services/shims.ts",
-        "../services/signatureHelp.ts",
-        "../services/utilities.ts",
+        "../services/documentHighlights.ts",
+        "../services/documentRegistry.ts",
+        "../services/importTracker.ts",
+        "../services/findAllReferences.ts",
+        "../services/goToDefinition.ts",
+        "../services/jsDoc.ts",
+        "../services/semver.ts",
         "../services/jsTyping.ts",
-        "../services/formatting/formatting.ts",
+        "../services/navigateTo.ts",
+        "../services/navigationBar.ts",
+        "../services/organizeImports.ts",
+        "../services/getEditsForFileRename.ts",
+        "../services/outliningElementsCollector.ts",
+        "../services/patternMatcher.ts",
+        "../services/preProcess.ts",
+        "../services/rename.ts",
+        "../services/signatureHelp.ts",
+        "../services/suggestionDiagnostics.ts",
+        "../services/symbolDisplay.ts",
+        "../services/transpile.ts",
         "../services/formatting/formattingContext.ts",
         "../services/formatting/formattingScanner.ts",
         "../services/formatting/rule.ts",
         "../services/formatting/rules.ts",
         "../services/formatting/rulesMap.ts",
+        "../services/formatting/formatting.ts",
         "../services/formatting/smartIndenter.ts",
+        "../services/textChanges.ts",
         "../services/codeFixProvider.ts",
-        "../services/codefixes/fixes.ts",
-        "../services/codefixes/helpers.ts",
+        "../services/refactorProvider.ts",
+        "../services/codefixes/addMissingInvocationForDecorator.ts",
+        "../services/codefixes/annotateWithTypeFromJSDoc.ts",
+        "../services/codefixes/convertFunctionToEs6Class.ts",
+        "../services/codefixes/convertToEs6Module.ts",
+        "../services/codefixes/correctQualifiedNameToIndexedAccessType.ts",
+        "../services/codefixes/fixClassIncorrectlyImplementsInterface.ts",
         "../services/codefixes/importFixes.ts",
+        "../services/codefixes/fixSpelling.ts",
+        "../services/codefixes/fixAddMissingMember.ts",
+        "../services/codefixes/fixCannotFindModule.ts",
+        "../services/codefixes/fixClassDoesntImplementInheritedAbstractMember.ts",
+        "../services/codefixes/fixClassSuperMustPrecedeThisAccess.ts",
+        "../services/codefixes/fixConstructorForDerivedNeedSuperCall.ts",
+        "../services/codefixes/fixExtendsInterfaceBecomesImplements.ts",
+        "../services/codefixes/fixForgottenThisPropertyAccess.ts",
         "../services/codefixes/fixUnusedIdentifier.ts",
+        "../services/codefixes/fixJSDocTypes.ts",
+        "../services/codefixes/fixAwaitInSyncFunction.ts",
         "../services/codefixes/disableJsDiagnostics.ts",
+        "../services/codefixes/helpers.ts",
+        "../services/codefixes/inferFromUsage.ts",
+        "../services/codefixes/fixInvalidImportSyntax.ts",
+        "../services/codefixes/fixStrictClassInitialization.ts",
+        "../services/codefixes/useDefaultImport.ts",
+        "../services/refactors/extractSymbol.ts",
+        "../services/refactors/generateGetAccessorAndSetAccessor.ts",
+        "../services/sourcemaps.ts",
+        "../services/services.ts",
+        "../services/breakpoints.ts",
+        "../services/transform.ts",
+        "../services/shims.ts",
+
+        "../server/typingsInstaller/typingsInstaller.ts",
+
+        "../server/types.ts",
+        "../server/shared.ts",
+        "../server/utilities.ts",
+        "../server/protocol.ts",
+        "../server/scriptInfo.ts",
+        "../server/typingsCache.ts",
+        "../server/project.ts",
+        "../server/editorServices.ts",
+        "../server/session.ts",
+        "../server/scriptVersionCache.ts",
 
-        "harness.ts",
         "sourceMapRecorder.ts",
-        "harnessLanguageService.ts",
-        "fourslash.ts",
         "runnerbase.ts",
-        "compilerRunner.ts",
-        "typeWriter.ts",
+        "virtualFileSystem.ts",
+        "harness.ts",
+        "virtualFileSystemWithWatch.ts",
+        "harnessLanguageService.ts",
         "fourslashRunner.ts",
+        "fourslash.ts",
+        "typeWriter.ts",
+        "compilerRunner.ts",
         "projectsRunner.ts",
         "loggedIO.ts",
         "rwcRunner.ts",
         "externalCompileRunner.ts",
         "test262Runner.ts",
-        "./parallel/shared.ts",
-        "./parallel/host.ts",
-        "./parallel/worker.ts",
-        "runner.ts",
-        "virtualFileSystemWithWatch.ts",
-        "../server/protocol.ts",
-        "../server/session.ts",
-        "../server/client.ts",
-        "../server/editorServices.ts",
-        "./unittests/base64.ts",
-        "./unittests/incrementalParser.ts",
-        "./unittests/jsDocParsing.ts",
-        "./unittests/services/colorization.ts",
-        "./unittests/services/documentRegistry.ts",
-        "./unittests/services/preProcessFile.ts",
-        "./unittests/services/patternMatcher.ts",
-        "./unittests/session.ts",
-        "./unittests/symbolWalker.ts",
-        "./unittests/versionCache.ts",
-        "./unittests/convertToBase64.ts",
-        "./unittests/transpile.ts",
-        "./unittests/reuseProgramStructure.ts",
-        "./unittests/moduleResolution.ts",
-        "./unittests/tsconfigParsing.ts",
-        "./unittests/asserts.ts",
-        "./unittests/builder.ts",
-        "./unittests/commandLineParsing.ts",
-        "./unittests/configurationExtension.ts",
-        "./unittests/convertCompilerOptionsFromJson.ts",
-        "./unittests/convertTypeAcquisitionFromJson.ts",
-        "./unittests/tsserverProjectSystem.ts",
-        "./unittests/tscWatchMode.ts",
-        "./unittests/matchFiles.ts",
-        "./unittests/organizeImports.ts",
-        "./unittests/initializeTSConfig.ts",
-        "./unittests/compileOnSave.ts",
-        "./unittests/typingsInstaller.ts",
-        "./unittests/projectErrors.ts",
-        "./unittests/printer.ts",
-        "./unittests/transform.ts",
-        "./unittests/customTransforms.ts",
-        "./unittests/extractConstants.ts",
-        "./unittests/extractFunctions.ts",
-        "./unittests/extractRanges.ts",
-        "./unittests/extractTestHelpers.ts",
-        "./unittests/textChanges.ts",
-        "./unittests/telemetry.ts",
-        "./unittests/languageService.ts",
-        "./unittests/programMissingFiles.ts",
-        "./unittests/programNoParseFalsyFileNames.ts",
-        "./unittests/publicApi.ts",
-        "./unittests/hostNewLineSupport.ts"
-    ]
+        "parallel/host.ts",
+        "parallel/worker.ts",
+        "parallel/shared.ts",
+        "runner.ts"
+    ],
+    "include": ["unittests/**.ts"]
 }
diff --git a/src/harness/unittests/cancellableLanguageServiceOperations.ts b/src/harness/unittests/cancellableLanguageServiceOperations.ts
new file mode 100644
index 00000000000..7ae85ce2cba
--- /dev/null
+++ b/src/harness/unittests/cancellableLanguageServiceOperations.ts
@@ -0,0 +1,95 @@
+/// <reference path="..\harness.ts" />
+
+namespace ts {
+    describe("cancellableLanguageServiceOperations", () => {
+        const file = `
+        function foo(): void;
+        function foo<T>(x: T): T;
+        function foo<T>(x?: T): T | void {}
+        foo(f);
+        `;
+        it("can cancel signature help mid-request", () => {
+            verifyOperationCancelledAfter(file, 4, service => // Two calls are top-level in services, one is the root type, and the second should be for the parameter type
+                service.getSignatureHelpItems("file.ts", file.lastIndexOf("f")),
+                r => assert.exists(r.items[0])
+            );
+        });
+
+        it("can cancel find all references mid-request", () => {
+            verifyOperationCancelledAfter(file, 3, service => // Two calls are top-level in services, one is the root type
+                service.findReferences("file.ts", file.lastIndexOf("o")),
+                r => assert.exists(r[0].definition)
+            );
+        });
+
+        it("can cancel quick info mid-request", () => {
+            verifyOperationCancelledAfter(file, 1, service => // The LS doesn't do any top-level checks on the token for quickinfo, so the first check is within the checker
+                service.getQuickInfoAtPosition("file.ts", file.lastIndexOf("o")),
+                r => assert.exists(r.displayParts)
+            );
+        });
+
+        it("can cancel completion entry details mid-request", () => {
+            const options: FormatCodeSettings = {
+                indentSize: 4,
+                tabSize: 4,
+                newLineCharacter: "\n",
+                convertTabsToSpaces: true,
+                indentStyle: IndentStyle.Smart,
+                insertSpaceAfterConstructor: false,
+                insertSpaceAfterCommaDelimiter: true,
+                insertSpaceAfterSemicolonInForStatements: true,
+                insertSpaceBeforeAndAfterBinaryOperators: true,
+                insertSpaceAfterKeywordsInControlFlowStatements: true,
+                insertSpaceAfterFunctionKeywordForAnonymousFunctions: false,
+                insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: false,
+                insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
+                insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces: true,
+                insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: false,
+                insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces: false,
+                insertSpaceBeforeFunctionParenthesis: false,
+                placeOpenBraceOnNewLineForFunctions: false,
+                placeOpenBraceOnNewLineForControlBlocks: false,
+            };
+            verifyOperationCancelledAfter(file, 1, service => // The LS doesn't do any top-level checks on the token for completion entry details, so the first check is within the checker
+                service.getCompletionEntryDetails("file.ts", file.lastIndexOf("f"), "foo", options, /*content*/ undefined, {}),
+                r => assert.exists(r.displayParts)
+            );
+        });
+    });
+
+    function verifyOperationCancelledAfter<T>(content: string, cancelAfter: number, operation: (service: LanguageService) => T, validator: (arg: T) => void) {
+        let checks = 0;
+        const token: HostCancellationToken = {
+            isCancellationRequested() {
+                checks++;
+                const result = checks >= cancelAfter;
+                if (result) {
+                    checks = -Infinity; // Cancel just once, then disable cancellation, effectively
+                }
+                return result;
+            }
+        };
+        const adapter = new Harness.LanguageService.NativeLanguageServiceAdapter(token);
+        const host = adapter.getHost();
+        host.addScript("file.ts", content, /*isRootFile*/ true);
+        const service = adapter.getLanguageService();
+        assertCancelled(() => operation(service));
+        validator(operation(service));
+    }
+
+    /**
+     * We don't just use `assert.throws` because it doesn't validate instances for thrown objects which do not inherit from `Error`
+     */
+    function assertCancelled(cb: () => void) {
+        let caught: any;
+        try {
+            cb();
+        }
+        catch (e) {
+            caught = e;
+        }
+        assert.exists(caught, "Expected operation to be cancelled, but was not");
+        assert.instanceOf(caught, OperationCanceledException);
+    }
+}
\ No newline at end of file
diff --git a/src/harness/unittests/organizeImports.ts b/src/harness/unittests/organizeImports.ts
index 3de5588af8e..7d496b97d99 100644
--- a/src/harness/unittests/organizeImports.ts
+++ b/src/harness/unittests/organizeImports.ts
@@ -247,6 +247,24 @@ import D from "lib";
                 },
                 libFile);
 
+            testOrganizeImports("Unused_false_positive_shorthand_assignment",
+            {
+                    path: "/test.ts",
+                    content: `
+import { x } from "a";
+const o = { x };
+`
+                });
+
+            testOrganizeImports("Unused_false_positive_export_shorthand",
+            {
+                    path: "/test.ts",
+                    content: `
+import { x } from "a";
+export { x };
+`
+                });
+
             testOrganizeImports("MoveToTop",
                 {
                     path: "/test.ts",
diff --git a/src/harness/unittests/services/patternMatcher.ts b/src/harness/unittests/services/patternMatcher.ts
index a3e2d1d5cff..64de3557da4 100644
--- a/src/harness/unittests/services/patternMatcher.ts
+++ b/src/harness/unittests/services/patternMatcher.ts
@@ -95,376 +95,245 @@ describe("PatternMatcher", () => {
 
     describe("SingleWordPattern", () => {
         it("PreferCaseSensitiveExact", () => {
-            const match = getFirstMatch("Foo", "Foo");
-
-            assert.equal(ts.PatternMatchKind.exact, match.kind);
-            assert.equal(true, match.isCaseSensitive);
+            assertSegmentMatch("Foo", "Foo", { kind: ts.PatternMatchKind.exact, isCaseSensitive: true });
         });
 
         it("PreferCaseSensitiveExactInsensitive", () => {
-            const match = getFirstMatch("foo", "Foo");
-
-            assert.equal(ts.PatternMatchKind.exact, match.kind);
-            assert.equal(false, match.isCaseSensitive);
+            assertSegmentMatch("foo", "Foo", { kind: ts.PatternMatchKind.exact, isCaseSensitive: false });
         });
 
         it("PreferCaseSensitivePrefix", () => {
-            const match = getFirstMatch("Foo", "Fo");
-
-            assert.equal(ts.PatternMatchKind.prefix, match.kind);
-            assert.equal(true, match.isCaseSensitive);
+            assertSegmentMatch("Foo", "Fo", { kind: ts.PatternMatchKind.prefix, isCaseSensitive: true });
         });
 
         it("PreferCaseSensitivePrefixCaseInsensitive", () => {
-            const match = getFirstMatch("Foo", "fo");
-
-            assert.equal(ts.PatternMatchKind.prefix, match.kind);
-            assert.equal(false, match.isCaseSensitive);
+            assertSegmentMatch("Foo", "fo", { kind: ts.PatternMatchKind.prefix, isCaseSensitive: false });
         });
 
         it("PreferCaseSensitiveCamelCaseMatchSimple", () => {
-            const match = getFirstMatch("FogBar", "FB");
-
-            assert.equal(ts.PatternMatchKind.camelCase, match.kind);
-            assert.equal(true, match.isCaseSensitive);
+            assertSegmentMatch("FogBar", "FB", { kind: ts.PatternMatchKind.camelCase, isCaseSensitive: true });
         });
 
         it("PreferCaseSensitiveCamelCaseMatchPartialPattern", () => {
-            const match = getFirstMatch("FogBar", "FoB");
-
-            assert.equal(ts.PatternMatchKind.camelCase, match.kind);
-            assert.equal(true, match.isCaseSensitive);
+            assertSegmentMatch("FogBar", "FoB", { kind: ts.PatternMatchKind.camelCase, isCaseSensitive: true });
         });
 
         it("PreferCaseSensitiveCamelCaseMatchToLongPattern1", () => {
-            const match = getFirstMatch("FogBar", "FBB");
-
-            assert.isTrue(match === undefined);
+            assertSegmentMatch("FogBar", "FBB", undefined);
         });
 
         it("PreferCaseSensitiveCamelCaseMatchToLongPattern2", () => {
-            const match = getFirstMatch("FogBar", "FoooB");
-
-            assert.isTrue(match === undefined);
+            assertSegmentMatch("FogBar", "FoooB", undefined);
         });
 
         it("CamelCaseMatchPartiallyUnmatched", () => {
-            const match = getFirstMatch("FogBarBaz", "FZ");
-
-            assert.isTrue(match === undefined);
+            assertSegmentMatch("FogBarBaz", "FZ", undefined);
         });
 
         it("CamelCaseMatchCompletelyUnmatched", () => {
-            const match = getFirstMatch("FogBarBaz", "ZZ");
-
-            assert.isTrue(match === undefined);
+            assertSegmentMatch("FogBarBaz", "ZZ", undefined);
         });
 
         it("TwoUppercaseCharacters", () => {
-            const match = getFirstMatch("SimpleUIElement", "SiUI");
-
-            assert.equal(ts.PatternMatchKind.camelCase, match.kind);
-            assert.equal(true, match.isCaseSensitive);
+            assertSegmentMatch("SimpleUIElement", "SiUI", { kind: ts.PatternMatchKind.camelCase, isCaseSensitive: true });
         });
 
         it("PreferCaseSensitiveLowercasePattern", () => {
-            const match = getFirstMatch("FogBar", "b");
-
-            assert.equal(ts.PatternMatchKind.substring, match.kind);
-            assert.equal(false, match.isCaseSensitive);
+            assertSegmentMatch("FogBar", "b", { kind: ts.PatternMatchKind.substring, isCaseSensitive: false });
         });
 
         it("PreferCaseSensitiveLowercasePattern2", () => {
-            const match = getFirstMatch("FogBar", "fB");
-
-            assert.equal(ts.PatternMatchKind.camelCase, match.kind);
-            assert.equal(false, match.isCaseSensitive);
+            assertSegmentMatch("FogBar", "fB", { kind: ts.PatternMatchKind.camelCase, isCaseSensitive: false });
         });
 
         it("PreferCaseSensitiveTryUnderscoredName", () => {
-            const match = getFirstMatch("_fogBar", "_fB");
-
-            assert.equal(ts.PatternMatchKind.camelCase, match.kind);
-            assert.equal(true, match.isCaseSensitive);
+            assertSegmentMatch("_fogBar", "_fB", { kind: ts.PatternMatchKind.camelCase, isCaseSensitive: true });
         });
 
         it("PreferCaseSensitiveTryUnderscoredName2", () => {
-            const match = getFirstMatch("_fogBar", "fB");
-
-            assert.equal(ts.PatternMatchKind.camelCase, match.kind);
-            assert.equal(true, match.isCaseSensitive);
+            assertSegmentMatch("_fogBar", "fB", { kind: ts.PatternMatchKind.camelCase, isCaseSensitive: true });
         });
 
         it("PreferCaseSensitiveTryUnderscoredNameInsensitive", () => {
-            const match = getFirstMatch("_FogBar", "_fB");
-
-            assert.equal(ts.PatternMatchKind.camelCase, match.kind);
-            assert.equal(false, match.isCaseSensitive);
+            assertSegmentMatch("_FogBar", "_fB", { kind: ts.PatternMatchKind.camelCase, isCaseSensitive: false });
         });
 
         it("PreferCaseSensitiveMiddleUnderscore", () => {
-            const match = getFirstMatch("Fog_Bar", "FB");
-
-            assert.equal(ts.PatternMatchKind.camelCase, match.kind);
-            assert.equal(true, match.isCaseSensitive);
+            assertSegmentMatch("Fog_Bar", "FB", { kind: ts.PatternMatchKind.camelCase, isCaseSensitive: true });
         });
 
         it("PreferCaseSensitiveMiddleUnderscore2", () => {
-            const match = getFirstMatch("Fog_Bar", "F_B");
-
-            assert.equal(ts.PatternMatchKind.camelCase, match.kind);
-            assert.equal(true, match.isCaseSensitive);
+            assertSegmentMatch("Fog_Bar", "F_B", { kind: ts.PatternMatchKind.camelCase, isCaseSensitive: true });
         });
 
         it("PreferCaseSensitiveMiddleUnderscore3", () => {
-            const match = getFirstMatch("Fog_Bar", "F__B");
-
-            assert.isTrue(undefined === match);
+            assertSegmentMatch("Fog_Bar", "F__B", undefined);
         });
 
         it("PreferCaseSensitiveMiddleUnderscore4", () => {
-            const match = getFirstMatch("Fog_Bar", "f_B");
-
-            assert.equal(ts.PatternMatchKind.camelCase, match.kind);
-            assert.equal(false, match.isCaseSensitive);
+            assertSegmentMatch("Fog_Bar", "f_B", { kind: ts.PatternMatchKind.camelCase, isCaseSensitive: false });
         });
 
         it("PreferCaseSensitiveMiddleUnderscore5", () => {
-            const match = getFirstMatch("Fog_Bar", "F_b");
-
-            assert.equal(ts.PatternMatchKind.camelCase, match.kind);
-            assert.equal(false, match.isCaseSensitive);
+            assertSegmentMatch("Fog_Bar", "F_b", { kind: ts.PatternMatchKind.camelCase, isCaseSensitive: false });
         });
 
         it("AllLowerPattern1", () => {
-            const match = getFirstMatch("FogBarChangedEventArgs", "changedeventargs");
-
-            assert.isTrue(undefined !== match);
+            assertSegmentMatch("FogBarChangedEventArgs", "changedeventargs", { kind: ts.PatternMatchKind.substring, isCaseSensitive: false });
         });
 
         it("AllLowerPattern2", () => {
-            const match = getFirstMatch("FogBarChangedEventArgs", "changedeventarrrgh");
-
-            assert.isTrue(undefined === match);
+            assertSegmentMatch("FogBarChangedEventArgs", "changedeventarrrgh", undefined);
         });
 
         it("AllLowerPattern3", () => {
-            const match = getFirstMatch("ABCDEFGH", "bcd");
-
-            assert.isTrue(undefined !== match);
+            assertSegmentMatch("ABCDEFGH", "bcd", { kind: ts.PatternMatchKind.substring, isCaseSensitive: false });
         });
 
         it("AllLowerPattern4", () => {
-            const match = getFirstMatch("AbcdefghijEfgHij", "efghij");
-
-            assert.isTrue(undefined === match);
+            assertSegmentMatch("AbcdefghijEfgHij", "efghij", undefined);
         });
     });
 
     describe("MultiWordPattern", () => {
         it("ExactWithLowercase", () => {
-            const matches = getAllMatches("AddMetadataReference", "addmetadatareference");
-
-            assertContainsKind(ts.PatternMatchKind.exact, matches);
+            assertSegmentMatch("AddMetadataReference", "addmetadatareference", { kind: ts.PatternMatchKind.exact, isCaseSensitive: false });
         });
 
         it("SingleLowercasedSearchWord1", () => {
-            const matches = getAllMatches("AddMetadataReference", "add");
-
-            assertContainsKind(ts.PatternMatchKind.prefix, matches);
+            assertSegmentMatch("AddMetadataReference", "add", { kind: ts.PatternMatchKind.prefix, isCaseSensitive: false });
         });
 
         it("SingleLowercasedSearchWord2", () => {
-            const matches = getAllMatches("AddMetadataReference", "metadata");
-
-            assertContainsKind(ts.PatternMatchKind.substring, matches);
+            assertSegmentMatch("AddMetadataReference", "metadata", { kind: ts.PatternMatchKind.substring, isCaseSensitive: false });
         });
 
         it("SingleUppercaseSearchWord1", () => {
-            const matches = getAllMatches("AddMetadataReference", "Add");
-
-            assertContainsKind(ts.PatternMatchKind.prefix, matches);
+            assertSegmentMatch("AddMetadataReference", "Add", { kind: ts.PatternMatchKind.prefix, isCaseSensitive: true });
         });
 
         it("SingleUppercaseSearchWord2", () => {
-            const matches = getAllMatches("AddMetadataReference", "Metadata");
-
-            assertContainsKind(ts.PatternMatchKind.substring, matches);
+            assertSegmentMatch("AddMetadataReference", "Metadata", { kind: ts.PatternMatchKind.substring, isCaseSensitive: true });
         });
 
         it("SingleUppercaseSearchLetter1", () => {
-            const matches = getAllMatches("AddMetadataReference", "A");
-
-            assertContainsKind(ts.PatternMatchKind.prefix, matches);
+            assertSegmentMatch("AddMetadataReference", "A", { kind: ts.PatternMatchKind.prefix, isCaseSensitive: true });
         });
 
         it("SingleUppercaseSearchLetter2", () => {
-            const matches = getAllMatches("AddMetadataReference", "M");
-
-            assertContainsKind(ts.PatternMatchKind.substring, matches);
+            assertSegmentMatch("AddMetadataReference", "M", { kind: ts.PatternMatchKind.substring, isCaseSensitive: true });
         });
 
-        it("TwoLowercaseWords", () => {
-            const matches = getAllMatches("AddMetadataReference", "add metadata");
-
-            assertContainsKind(ts.PatternMatchKind.prefix, matches);
-            assertContainsKind(ts.PatternMatchKind.substring, matches);
+        it("TwoLowercaseWords0", () => {
+            assertSegmentMatch("AddMetadataReference", "add metadata", { kind: ts.PatternMatchKind.prefix, isCaseSensitive: false });
         });
 
-        it("TwoLowercaseWords", () => {
-            const matches = getAllMatches("AddMetadataReference", "A M");
-
-            assertContainsKind(ts.PatternMatchKind.prefix, matches);
-            assertContainsKind(ts.PatternMatchKind.substring, matches);
+        it("TwoLowercaseWords1", () => {
+            assertSegmentMatch("AddMetadataReference", "A M", { kind: ts.PatternMatchKind.prefix, isCaseSensitive: true });
         });
 
-        it("TwoLowercaseWords", () => {
-            const matches = getAllMatches("AddMetadataReference", "AM");
-
-            assertContainsKind(ts.PatternMatchKind.camelCase, matches);
+        it("TwoLowercaseWords2", () => {
+            assertSegmentMatch("AddMetadataReference", "AM", { kind: ts.PatternMatchKind.camelCase, isCaseSensitive: true });
         });
 
-        it("TwoLowercaseWords", () => {
-            const matches = getAllMatches("AddMetadataReference", "ref Metadata");
-
-            assertArrayEquals(ts.map(matches, m => m.kind), [ts.PatternMatchKind.substring, ts.PatternMatchKind.substring]);
+        it("TwoLowercaseWords3", () => {
+            assertSegmentMatch("AddMetadataReference", "ref Metadata", { kind: ts.PatternMatchKind.substring, isCaseSensitive: true });
         });
 
-        it("TwoLowercaseWords", () => {
-            const matches = getAllMatches("AddMetadataReference", "ref M");
-
-            assertArrayEquals(ts.map(matches, m => m.kind), [ts.PatternMatchKind.substring, ts.PatternMatchKind.substring]);
+        it("TwoLowercaseWords4", () => {
+            assertSegmentMatch("AddMetadataReference", "ref M", { kind: ts.PatternMatchKind.substring, isCaseSensitive: true });
         });
 
         it("MixedCamelCase", () => {
-            const matches = getAllMatches("AddMetadataReference", "AMRe");
-
-            assertContainsKind(ts.PatternMatchKind.camelCase, matches);
+            assertSegmentMatch("AddMetadataReference", "AMRe", { kind: ts.PatternMatchKind.camelCase, isCaseSensitive: true });
         });
 
         it("BlankPattern", () => {
-            const matches = getAllMatches("AddMetadataReference", "");
-
-            assert.isTrue(matches === undefined);
+            assertInvalidPattern("");
         });
 
         it("WhitespaceOnlyPattern", () => {
-            const matches = getAllMatches("AddMetadataReference", " ");
-
-            assert.isTrue(matches === undefined);
+            assertInvalidPattern(" ");
         });
 
         it("EachWordSeparately1", () => {
-            const matches = getAllMatches("AddMetadataReference", "add Meta");
-
-            assertContainsKind(ts.PatternMatchKind.prefix, matches);
-            assertContainsKind(ts.PatternMatchKind.substring, matches);
+            assertSegmentMatch("AddMetadataReference", "add Meta", { kind: ts.PatternMatchKind.prefix, isCaseSensitive: false });
         });
 
         it("EachWordSeparately2", () => {
-            const matches = getAllMatches("AddMetadataReference", "Add meta");
-
-            assertContainsKind(ts.PatternMatchKind.prefix, matches);
-            assertContainsKind(ts.PatternMatchKind.substring, matches);
+            assertSegmentMatch("AddMetadataReference", "Add meta", { kind: ts.PatternMatchKind.prefix, isCaseSensitive: true });
         });
 
         it("EachWordSeparately3", () => {
-            const matches = getAllMatches("AddMetadataReference", "Add Meta");
-
-            assertContainsKind(ts.PatternMatchKind.prefix, matches);
-            assertContainsKind(ts.PatternMatchKind.substring, matches);
+            assertSegmentMatch("AddMetadataReference", "Add Meta", { kind: ts.PatternMatchKind.prefix, isCaseSensitive: true });
         });
 
         it("MixedCasing", () => {
-            const matches = getAllMatches("AddMetadataReference", "mEta");
-
-            assert.isTrue(matches === undefined);
+            assertSegmentMatch("AddMetadataReference", "mEta", undefined);
         });
 
         it("MixedCasing2", () => {
-            const matches = getAllMatches("AddMetadataReference", "Data");
-
-            assert.isTrue(matches === undefined);
+            assertSegmentMatch("AddMetadataReference", "Data", undefined);
         });
 
         it("AsteriskSplit", () => {
-            const matches = getAllMatches("GetKeyWord", "K*W");
-
-            assertArrayEquals(ts.map(matches, m => m.kind), [ts.PatternMatchKind.substring, ts.PatternMatchKind.substring]);
+            assertSegmentMatch("GetKeyWord", "K*W", { kind: ts.PatternMatchKind.substring, isCaseSensitive: true });
         });
 
         it("LowercaseSubstring1", () => {
-            const matches = getAllMatches("Operator", "a");
-
-            assert.isTrue(matches === undefined);
+            assertSegmentMatch("Operator", "a", undefined);
         });
 
         it("LowercaseSubstring2", () => {
-            const matches = getAllMatches("FooAttribute", "a");
-            assertContainsKind(ts.PatternMatchKind.substring, matches);
-            assert.isFalse(matches[0].isCaseSensitive);
+            assertSegmentMatch("FooAttribute", "a", { kind: ts.PatternMatchKind.substring, isCaseSensitive: false });
         });
     });
 
     describe("DottedPattern", () => {
         it("DottedPattern1", () => {
-            const match = getFirstMatchForDottedPattern("Foo.Bar.Baz", "Quux", "B.Q");
-
-            assert.equal(ts.PatternMatchKind.prefix, match.kind);
-            assert.equal(true, match.isCaseSensitive);
+            assertFullMatch("Foo.Bar.Baz", "Quux", "B.Q", { kind: ts.PatternMatchKind.prefix, isCaseSensitive: true });
         });
 
         it("DottedPattern2", () => {
-            const match = getFirstMatchForDottedPattern("Foo.Bar.Baz", "Quux", "C.Q");
-            assert.isTrue(match === undefined);
+            assertFullMatch("Foo.Bar.Baz", "Quux", "C.Q", undefined);
         });
 
         it("DottedPattern3", () => {
-            const match = getFirstMatchForDottedPattern("Foo.Bar.Baz", "Quux", "B.B.Q");
-            assert.equal(ts.PatternMatchKind.prefix, match.kind);
-            assert.equal(true, match.isCaseSensitive);
+            assertFullMatch("Foo.Bar.Baz", "Quux", "B.B.Q", { kind: ts.PatternMatchKind.prefix, isCaseSensitive: true });
         });
 
         it("DottedPattern4", () => {
-            const match = getFirstMatchForDottedPattern("Foo.Bar.Baz", "Quux", "Baz.Quux");
-            assert.equal(ts.PatternMatchKind.exact, match.kind);
-            assert.equal(true, match.isCaseSensitive);
+            assertFullMatch("Foo.Bar.Baz", "Quux", "Baz.Quux", { kind: ts.PatternMatchKind.exact, isCaseSensitive: true });
         });
 
         it("DottedPattern5", () => {
-            const match = getFirstMatchForDottedPattern("Foo.Bar.Baz", "Quux", "F.B.B.Quux");
-            assert.equal(ts.PatternMatchKind.exact, match.kind);
-            assert.equal(true, match.isCaseSensitive);
+            assertFullMatch("Foo.Bar.Baz", "Quux", "F.B.B.Quux", { kind: ts.PatternMatchKind.prefix, isCaseSensitive: true });
         });
 
         it("DottedPattern6", () => {
-            const match = getFirstMatchForDottedPattern("Foo.Bar.Baz", "Quux", "F.F.B.B.Quux");
-            assert.isTrue(match === undefined);
+            assertFullMatch("Foo.Bar.Baz", "Quux", "F.F.B.B.Quux", undefined);
         });
 
         it("DottedPattern7", () => {
-            let match = getFirstMatch("UIElement", "UIElement");
-            match = getFirstMatch("GetKeyword", "UIElement");
-            assert.isTrue(match === undefined);
+            assertSegmentMatch("UIElement", "UIElement", { kind: ts.PatternMatchKind.exact, isCaseSensitive: true });
+            assertSegmentMatch("GetKeyword", "UIElement", undefined);
         });
     });
 
-    function getFirstMatch(candidate: string, pattern: string): ts.PatternMatch {
-        const matches = ts.createPatternMatcher(pattern).getMatchesForLastSegmentOfPattern(candidate);
-        return matches ? matches[0] : undefined;
+    function assertSegmentMatch(candidate: string, pattern: string, expected: ts.PatternMatch | undefined): void {
+        assert.deepEqual(ts.createPatternMatcher(pattern).getMatchForLastSegmentOfPattern(candidate), expected);
     }
 
-    function getAllMatches(candidate: string, pattern: string): ts.PatternMatch[] {
-        return ts.createPatternMatcher(pattern).getMatchesForLastSegmentOfPattern(candidate);
+    function assertInvalidPattern(pattern: string) {
+        assert.equal(ts.createPatternMatcher(pattern), undefined);
     }
 
-    function getFirstMatchForDottedPattern(dottedContainer: string, candidate: string, pattern: string): ts.PatternMatch {
-        const matches = ts.createPatternMatcher(pattern).getMatches(dottedContainer.split("."), candidate);
-        return matches ? matches[0] : undefined;
+    function assertFullMatch(dottedContainer: string, candidate: string, pattern: string, expected: ts.PatternMatch | undefined): void {
+        assert.deepEqual(ts.createPatternMatcher(pattern).getFullMatch(dottedContainer.split("."), candidate), expected);
     }
 
     function spanListToSubstrings(identifier: string, spans: ts.TextSpan[]) {
-        return ts.map(spans, s => identifier.substr(s.start, s.length));
+        return spans.map(s => identifier.substr(s.start, s.length));
     }
 
     function breakIntoCharacterSpans(identifier: string) {
@@ -474,23 +343,12 @@ describe("PatternMatcher", () => {
     function breakIntoWordSpans(identifier: string) {
         return spanListToSubstrings(identifier, ts.breakIntoWordSpans(identifier));
     }
-    function assertArrayEquals<T>(array1: T[], array2: T[]) {
-        assert.equal(array1.length, array2.length);
-
-        for (let i = 0; i < array1.length; i++) {
-            assert.equal(array1[i], array2[i]);
-        }
-    }
 
     function verifyBreakIntoCharacterSpans(original: string, ...parts: string[]): void {
-        assertArrayEquals(parts, breakIntoCharacterSpans(original));
+        assert.deepEqual(parts, breakIntoCharacterSpans(original));
     }
 
     function verifyBreakIntoWordSpans(original: string, ...parts: string[]): void {
-        assertArrayEquals(parts, breakIntoWordSpans(original));
-    }
-
-    function assertContainsKind(kind: ts.PatternMatchKind, results: ts.PatternMatch[]) {
-        assert.isTrue(ts.forEach(results, r => r.kind === kind));
+        assert.deepEqual(parts, breakIntoWordSpans(original));
     }
 });
diff --git a/src/harness/unittests/services/preProcessFile.ts b/src/harness/unittests/services/preProcessFile.ts
index 1e13bc3e345..76b1e4f05a6 100644
--- a/src/harness/unittests/services/preProcessFile.ts
+++ b/src/harness/unittests/services/preProcessFile.ts
@@ -59,6 +59,32 @@ describe("PreProcessFile:", () => {
                 });
         }),
 
+        it("Do not return reference path of non-imports", () => {
+            test("Quill.import('delta');",
+                /*readImportFile*/ true,
+                /*detectJavaScriptImports*/ false,
+                {
+                    referencedFiles: <ts.FileReference[]>[],
+                    importedFiles: <ts.FileReference[]>[],
+                    typeReferenceDirectives: [],
+                    ambientExternalModules: undefined,
+                    isLibFile: false
+                });
+        }),
+
+        it("Do not return reference path of nested non-imports", () => {
+            test("a.b.import('c');",
+                /*readImportFile*/ true,
+                /*detectJavaScriptImports*/ false,
+                {
+                    referencedFiles: <ts.FileReference[]>[],
+                    importedFiles: <ts.FileReference[]>[],
+                    typeReferenceDirectives: [],
+                    ambientExternalModules: undefined,
+                    isLibFile: false
+                });
+        }),
+
         it("Correctly return imported files", () => {
             test("import i1 = require(\"r1.ts\"); import i2 =require(\"r2.ts\"); import i3= require(\"r3.ts\"); import i4=require(\"r4.ts\"); import i5 = require  (\"r5.ts\");",
                 /*readImportFile*/ true,
diff --git a/src/harness/unittests/session.ts b/src/harness/unittests/session.ts
index a892d28808c..25df6f72ea6 100644
--- a/src/harness/unittests/session.ts
+++ b/src/harness/unittests/session.ts
@@ -263,6 +263,8 @@ namespace ts.server {
                 CommandNames.GetEditsForRefactorFull,
                 CommandNames.OrganizeImports,
                 CommandNames.OrganizeImportsFull,
+                CommandNames.GetEditsForFileRename,
+                CommandNames.GetEditsForFileRenameFull,
             ];
 
             it("should not throw when commands are executed with invalid arguments", () => {
diff --git a/src/harness/unittests/tscWatchMode.ts b/src/harness/unittests/tscWatchMode.ts
index 99bad3e3091..44565c0ddbe 100644
--- a/src/harness/unittests/tscWatchMode.ts
+++ b/src/harness/unittests/tscWatchMode.ts
@@ -124,14 +124,17 @@ namespace ts.tscWatch {
         }
 
         function getWatchDiagnosticWithoutDate(diagnostic: Diagnostic) {
-            return ` - ${flattenDiagnosticMessageText(diagnostic.messageText, host.newLine)}${host.newLine + host.newLine + host.newLine}`;
+            const newLines = contains(screenStartingMessageCodes, diagnostic.code)
+                ? `${host.newLine}${host.newLine}`
+                : host.newLine;
+            return ` - ${flattenDiagnosticMessageText(diagnostic.messageText, host.newLine)}${newLines}`;
         }
     }
 
     function createErrorsFoundCompilerDiagnostic(errors: ReadonlyArray<Diagnostic>) {
         return errors.length === 1
-            ? createCompilerDiagnostic(Diagnostics.Found_1_error)
-            : createCompilerDiagnostic(Diagnostics.Found_0_errors, errors.length);
+            ? createCompilerDiagnostic(Diagnostics.Found_1_error_Watching_for_file_changes)
+            : createCompilerDiagnostic(Diagnostics.Found_0_errors_Watching_for_file_changes, errors.length);
     }
 
     function checkOutputErrorsInitial(host: WatchedSystem, errors: ReadonlyArray<Diagnostic>, disableConsoleClears?: boolean, logsBeforeErrors?: string[]) {
@@ -142,8 +145,7 @@ namespace ts.tscWatch {
             logsBeforeErrors,
             errors,
             disableConsoleClears,
-            createErrorsFoundCompilerDiagnostic(errors),
-            createCompilerDiagnostic(Diagnostics.Compilation_complete_Watching_for_file_changes));
+            createErrorsFoundCompilerDiagnostic(errors));
     }
 
     function checkOutputErrorsIncremental(host: WatchedSystem, errors: ReadonlyArray<Diagnostic>, disableConsoleClears?: boolean, logsBeforeWatchDiagnostic?: string[], logsBeforeErrors?: string[]) {
@@ -154,8 +156,7 @@ namespace ts.tscWatch {
             logsBeforeErrors,
             errors,
             disableConsoleClears,
-            createErrorsFoundCompilerDiagnostic(errors),
-            createCompilerDiagnostic(Diagnostics.Compilation_complete_Watching_for_file_changes));
+            createErrorsFoundCompilerDiagnostic(errors));
     }
 
     function checkOutputErrorsIncrementalWithExit(host: WatchedSystem, errors: ReadonlyArray<Diagnostic>, expectedExitCode: ExitStatus, disableConsoleClears?: boolean, logsBeforeWatchDiagnostic?: string[], logsBeforeErrors?: string[]) {
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index 8170c663b1f..1c0dd0beb5c 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -13,7 +13,9 @@ namespace ts.projectSystem {
     export import checkArray = TestFSWithWatch.checkArray;
     export import libFile = TestFSWithWatch.libFile;
     export import checkWatchedFiles = TestFSWithWatch.checkWatchedFiles;
-    import checkWatchedDirectories = TestFSWithWatch.checkWatchedDirectories;
+    export import checkWatchedFilesDetailed = TestFSWithWatch.checkWatchedFilesDetailed;
+    export import checkWatchedDirectories = TestFSWithWatch.checkWatchedDirectories;
+    export import checkWatchedDirectoriesDetailed = TestFSWithWatch.checkWatchedDirectoriesDetailed;
     import safeList = TestFSWithWatch.safeList;
 
     export const customTypesMap = {
@@ -478,6 +480,10 @@ namespace ts.projectSystem {
         checkNthEvent(session, server.toEvent(eventName, diagnostics), 0, isMostRecent);
     }
 
+    function createDiagnostic(start: protocol.Location, end: protocol.Location, message: DiagnosticMessage, args: ReadonlyArray<string> = [], category = diagnosticCategoryName(message), reportsUnnecessary?: {}): protocol.Diagnostic {
+        return { start, end, text: formatStringFromArgs(message.message, args), code: message.code, category, reportsUnnecessary, source: undefined };
+    }
+
     function checkCompleteEvent(session: TestSession, numberOfCurrentEvents: number, expectedSequenceId: number, isMostRecent = true): void {
         checkNthEvent(session, server.toEvent("requestCompleted", { request_seq: expectedSequenceId }), numberOfCurrentEvents - 1, isMostRecent);
     }
@@ -494,7 +500,7 @@ namespace ts.projectSystem {
 
     function checkNthEvent(session: TestSession, expectedEvent: protocol.Event, index: number, isMostRecent: boolean) {
         const events = session.events;
-        assert.deepEqual(events[index], expectedEvent);
+        assert.deepEqual(events[index], expectedEvent, `Expected ${JSON.stringify(expectedEvent)} at ${index} in ${JSON.stringify(events)}`);
 
         const outputs = session.host.getOutput();
         assert.equal(outputs[index], server.formatMessage(expectedEvent, nullLogger, Utils.byteLength, session.host.newLine));
@@ -3331,6 +3337,89 @@ namespace ts.projectSystem {
             checkCompleteEvent(session, 1, expectedSequenceId);
             session.clearMessages();
         });
+
+        it("Reports errors correctly when file referenced by inferred project root, is opened right after closing the root file", () => {
+            const projectRoot = "/user/username/projects/myproject";
+            const app: FileOrFolder = {
+                path: `${projectRoot}/src/client/app.js`,
+                content: ""
+            };
+            const serverUtilities: FileOrFolder = {
+                path: `${projectRoot}/src/server/utilities.js`,
+                content: `function getHostName() { return "hello"; } export { getHostName };`
+            };
+            const backendTest: FileOrFolder = {
+                path: `${projectRoot}/test/backend/index.js`,
+                content: `import { getHostName } from '../../src/server/utilities';export default getHostName;`
+            };
+            const files = [libFile, app, serverUtilities, backendTest];
+            const host = createServerHost(files);
+            const session = createSession(host, { useInferredProjectPerProjectRoot: true, canUseEvents: true });
+            session.executeCommandSeq<protocol.OpenRequest>({
+                command: protocol.CommandTypes.Open,
+                arguments: {
+                    file: app.path,
+                    projectRootPath: projectRoot
+                }
+            });
+            const service = session.getProjectService();
+            checkNumberOfProjects(service, { inferredProjects: 1 });
+            const project = service.inferredProjects[0];
+            checkProjectActualFiles(project, [libFile.path, app.path]);
+            session.executeCommandSeq<protocol.OpenRequest>({
+                command: protocol.CommandTypes.Open,
+                arguments: {
+                    file: backendTest.path,
+                    projectRootPath: projectRoot
+                }
+            });
+            checkNumberOfProjects(service, { inferredProjects: 1 });
+            checkProjectActualFiles(project, files.map(f => f.path));
+            checkErrors([backendTest.path, app.path]);
+            session.executeCommandSeq<protocol.CloseRequest>({
+                command: protocol.CommandTypes.Close,
+                arguments: {
+                    file: backendTest.path
+                }
+            });
+            session.executeCommandSeq<protocol.OpenRequest>({
+                command: protocol.CommandTypes.Open,
+                arguments: {
+                    file: serverUtilities.path,
+                    projectRootPath: projectRoot
+                }
+            });
+            checkErrors([serverUtilities.path, app.path]);
+
+            function checkErrors(openFiles: [string, string]) {
+                const expectedSequenceId = session.getNextSeq();
+                session.executeCommandSeq<protocol.GeterrRequest>({
+                    command: protocol.CommandTypes.Geterr,
+                    arguments: {
+                        delay: 0,
+                        files: openFiles
+                    }
+                });
+
+                for (const openFile of openFiles) {
+                    session.clearMessages();
+                    host.checkTimeoutQueueLength(3);
+                    host.runQueuedTimeoutCallbacks(host.getNextTimeoutId() - 1);
+
+                    checkErrorMessage(session, "syntaxDiag", { file: openFile, diagnostics: [] });
+                    session.clearMessages();
+
+                    host.runQueuedImmediateCallbacks();
+                    checkErrorMessage(session, "semanticDiag", { file: openFile, diagnostics: [] });
+                    session.clearMessages();
+
+                    host.runQueuedImmediateCallbacks(1);
+                    checkErrorMessage(session, "suggestionDiag", { file: openFile, diagnostics: [] });
+                }
+                checkCompleteEvent(session, 2, expectedSequenceId);
+                session.clearMessages();
+            }
+        });
     });
 
     describe("tsserverProjectSystem autoDiscovery", () => {
@@ -4131,10 +4220,10 @@ namespace ts.projectSystem {
             checkErrorMessage(session, "semanticDiag", { file: file1.path, diagnostics: [] });
         });
 
-        it("info diagnostics", () => {
+        it("suggestion diagnostics", () => {
             const file: FileOrFolder = {
                 path: "/a.js",
-                content: 'require("b")',
+                content: "function f(p) {}",
             };
 
             const host = createServerHost([file]);
@@ -4177,13 +4266,64 @@ namespace ts.projectSystem {
             checkErrorMessage(session, "suggestionDiag", {
                 file: file.path,
                 diagnostics: [
-                    createDiagnostic({ line: 1, offset: 1 }, { line: 1, offset: 13 }, Diagnostics.File_is_a_CommonJS_module_it_may_be_converted_to_an_ES6_module)
+                    createDiagnostic({ line: 1, offset: 12 }, { line: 1, offset: 13 }, Diagnostics._0_is_declared_but_its_value_is_never_read, ["p"], "suggestion", /*reportsUnnecssary*/ true)
                 ],
             });
             checkCompleteEvent(session, 2, expectedSequenceId);
             session.clearMessages();
         });
 
+        it("disable suggestion diagnostics", () => {
+            const file: FileOrFolder = {
+                path: "/a.js",
+                content: 'require("b")',
+            };
+
+            const host = createServerHost([file]);
+            const session = createSession(host, { canUseEvents: true });
+            const service = session.getProjectService();
+
+            session.executeCommandSeq<protocol.OpenRequest>({
+                command: server.CommandNames.Open,
+                arguments: { file: file.path, fileContent: file.content },
+            });
+
+            session.executeCommandSeq<protocol.ConfigureRequest>({
+                command: server.CommandNames.Configure,
+                arguments: {
+                    preferences: { disableSuggestions: true }
+                },
+            });
+
+            checkNumberOfProjects(service, { inferredProjects: 1 });
+            session.clearMessages();
+            const expectedSequenceId = session.getNextSeq();
+            host.checkTimeoutQueueLengthAndRun(2);
+
+            checkProjectUpdatedInBackgroundEvent(session, [file.path]);
+            session.clearMessages();
+
+            session.executeCommandSeq<protocol.GeterrRequest>({
+                command: server.CommandNames.Geterr,
+                arguments: {
+                    delay: 0,
+                    files: [file.path],
+                }
+            });
+
+            host.checkTimeoutQueueLengthAndRun(1);
+
+            checkErrorMessage(session, "syntaxDiag", { file: file.path, diagnostics: [] }, /*isMostRecent*/ true);
+            session.clearMessages();
+
+            host.runQueuedImmediateCallbacks(1);
+
+            checkErrorMessage(session, "semanticDiag", { file: file.path, diagnostics: [] });
+            // No suggestion event, we're done.
+            checkCompleteEvent(session, 2, expectedSequenceId);
+            session.clearMessages();
+        });
+
         it("suppressed diagnostic events", () => {
             const file: FileOrFolder = {
                 path: "/a.ts",
@@ -4240,10 +4380,6 @@ namespace ts.projectSystem {
 
             session.clearMessages();
         });
-
-        function createDiagnostic(start: protocol.Location, end: protocol.Location, message: DiagnosticMessage, args: ReadonlyArray<string> = []): protocol.Diagnostic {
-            return { start, end, text: formatStringFromArgs(message.message, args), code: message.code, category: diagnosticCategoryName(message), source: undefined };
-        }
     });
 
     describe("tsserverProjectSystem Configure file diagnostics events", () => {
@@ -7243,7 +7379,6 @@ namespace ts.projectSystem {
             const host = createServerHost(files);
             const session = createSession(host);
             const projectService = session.getProjectService();
-            debugger;
             session.executeCommandSeq<protocol.OpenRequest>({
                 command: protocol.CommandTypes.Open,
                 arguments: {
@@ -7771,8 +7906,8 @@ namespace ts.projectSystem {
 
                 checkWatchedDirectories(host, emptyArray, /*recursive*/ true);
 
-                TestFSWithWatch.checkMultiMapKeyCount("watchedFiles", host.watchedFiles, expectedWatchedFiles);
-                TestFSWithWatch.checkMultiMapKeyCount("watchedDirectories", host.watchedDirectories, expectedWatchedDirectories);
+                checkWatchedFilesDetailed(host, expectedWatchedFiles);
+                checkWatchedDirectoriesDetailed(host, expectedWatchedDirectories, /*recursive*/ false);
                 checkProjectActualFiles(project, fileNames);
             }
         }
diff --git a/src/harness/unittests/typingsInstaller.ts b/src/harness/unittests/typingsInstaller.ts
index 9b874b2aca6..a8c7d4895d1 100644
--- a/src/harness/unittests/typingsInstaller.ts
+++ b/src/harness/unittests/typingsInstaller.ts
@@ -141,7 +141,19 @@ namespace ts.projectSystem {
             checkNumberOfProjects(projectService, { configuredProjects: 1 });
             const p = configuredProjectAt(projectService, 0);
             checkProjectActualFiles(p, [file1.path, tsconfig.path]);
-            checkWatchedFiles(host, [tsconfig.path, libFile.path, packageJson.path, "/a/b/bower_components", "/a/b/node_modules"]);
+
+            const expectedWatchedFiles = createMap<number>();
+            expectedWatchedFiles.set(tsconfig.path, 1); // tsserver
+            expectedWatchedFiles.set(libFile.path, 1); // tsserver
+            expectedWatchedFiles.set(packageJson.path, 1); // typing installer
+            checkWatchedFilesDetailed(host, expectedWatchedFiles);
+
+            checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
+
+            const expectedWatchedDirectoriesRecursive = createMap<number>();
+            expectedWatchedDirectoriesRecursive.set("/a/b", 2); // TypingInstaller and wild card
+            expectedWatchedDirectoriesRecursive.set("/a/b/node_modules/@types", 1); // type root watch
+            checkWatchedDirectoriesDetailed(host, expectedWatchedDirectoriesRecursive, /*recursive*/ true);
 
             installer.installAll(/*expectedCount*/ 1);
 
@@ -149,7 +161,9 @@ namespace ts.projectSystem {
             host.checkTimeoutQueueLengthAndRun(2);
             checkProjectActualFiles(p, [file1.path, jquery.path, tsconfig.path]);
             // should not watch jquery
-            checkWatchedFiles(host, [tsconfig.path, libFile.path, packageJson.path, "/a/b/bower_components", "/a/b/node_modules"]);
+            checkWatchedFilesDetailed(host, expectedWatchedFiles);
+            checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
+            checkWatchedDirectoriesDetailed(host, expectedWatchedDirectoriesRecursive, /*recursive*/ true);
         });
 
         it("inferred project (typings installed)", () => {
@@ -827,7 +841,17 @@ namespace ts.projectSystem {
             checkNumberOfProjects(projectService, { configuredProjects: 1 });
             const p = configuredProjectAt(projectService, 0);
             checkProjectActualFiles(p, [app.path, jsconfig.path]);
-            checkWatchedFiles(host, [jsconfig.path, "/bower_components", "/node_modules", libFile.path]);
+
+            const watchedFilesExpected = createMap<number>();
+            watchedFilesExpected.set(jsconfig.path, 1); // project files
+            watchedFilesExpected.set(libFile.path, 1); // project files
+            checkWatchedFilesDetailed(host, watchedFilesExpected);
+
+            checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
+
+            const watchedRecursiveDirectoriesExpected = createMap<number>();
+            watchedRecursiveDirectoriesExpected.set("/", 2); // wild card + type installer
+            checkWatchedDirectoriesDetailed(host, watchedRecursiveDirectoriesExpected, /*recursive*/ true);
 
             installer.installAll(/*expectedCount*/ 1);
 
@@ -999,14 +1023,14 @@ namespace ts.projectSystem {
             proj.updateGraph();
 
             assert.deepEqual(
-                proj.getCachedUnresolvedImportsPerFile_TestOnly().get(<Path>f1.path),
+                proj.cachedUnresolvedImportsPerFile.get(<Path>f1.path),
                 ["foo", "foo", "foo", "@bar/router", "@bar/common", "@bar/common"]
             );
 
             installer.installAll(/*expectedCount*/ 1);
         });
 
-        it("should recompute resolutions after typings are installed", () => {
+        it("cached unresolved typings are not recomputed if program structure did not change", () => {
             const host = createServerHost([]);
             const session = createSession(host);
             const f = {
@@ -1029,7 +1053,7 @@ namespace ts.projectSystem {
             const projectService = session.getProjectService();
             checkNumberOfProjects(projectService, { inferredProjects: 1 });
             const proj = projectService.inferredProjects[0];
-            const version1 = proj.getCachedUnresolvedImportsPerFile_TestOnly().getVersion();
+            const version1 = proj.lastCachedUnresolvedImportsList;
 
             // make a change that should not affect the structure of the program
             const changeRequest: server.protocol.ChangeRequest = {
@@ -1047,8 +1071,8 @@ namespace ts.projectSystem {
             };
             session.executeCommand(changeRequest);
             host.checkTimeoutQueueLengthAndRun(2); // This enqueues the updategraph and refresh inferred projects
-            const version2 = proj.getCachedUnresolvedImportsPerFile_TestOnly().getVersion();
-            assert.notEqual(version1, version2, "set of unresolved imports should change");
+            const version2 = proj.lastCachedUnresolvedImportsList;
+            assert.strictEqual(version1, version2, "set of unresolved imports should change");
         });
 
         it("expired cache entry (inferred project, should install typings)", () => {
@@ -1593,4 +1617,103 @@ namespace ts.projectSystem {
             checkProjectActualFiles(projectService.inferredProjects[0], [f1.path]);
         });
     });
+
+    describe("typing installer's npm installation command", () => {
+        const npmPath = "npm", tsVersion = "2.9.0-dev.20180410";
+        const packageNames = ["@types/graphql@ts2.8", "@types/highlight.js@ts2.8", "@types/jest@ts2.8", "@types/mini-css-extract-plugin@ts2.8", "@types/mongoose@ts2.8", "@types/pg@ts2.8", "@types/webpack-bundle-analyzer@ts2.8", "@types/enhanced-resolve@ts2.8", "@types/eslint-plugin-prettier@ts2.8", "@types/friendly-errors-webpack-plugin@ts2.8", "@types/hammerjs@ts2.8", "@types/history@ts2.8", "@types/image-size@ts2.8", "@types/js-cookie@ts2.8", "@types/koa-compress@ts2.8", "@types/less@ts2.8", "@types/material-ui@ts2.8", "@types/mysql@ts2.8", "@types/nodemailer@ts2.8", "@types/prettier@ts2.8", "@types/query-string@ts2.8", "@types/react-places-autocomplete@ts2.8", "@types/react-router@ts2.8", "@types/react-router-config@ts2.8", "@types/react-select@ts2.8", "@types/react-transition-group@ts2.8", "@types/redux-form@ts2.8", "@types/abbrev@ts2.8", "@types/accepts@ts2.8", "@types/acorn@ts2.8", "@types/ansi-regex@ts2.8", "@types/ansi-styles@ts2.8", "@types/anymatch@ts2.8", "@types/apollo-codegen@ts2.8", "@types/are-we-there-yet@ts2.8", "@types/argparse@ts2.8", "@types/arr-union@ts2.8", "@types/array-find-index@ts2.8", "@types/array-uniq@ts2.8", "@types/array-unique@ts2.8", "@types/arrify@ts2.8", "@types/assert-plus@ts2.8", "@types/async@ts2.8", "@types/autoprefixer@ts2.8", "@types/aws4@ts2.8", "@types/babel-code-frame@ts2.8", "@types/babel-generator@ts2.8", "@types/babel-plugin-syntax-jsx@ts2.8", "@types/babel-template@ts2.8", "@types/babel-traverse@ts2.8", "@types/babel-types@ts2.8", "@types/babylon@ts2.8", "@types/base64-js@ts2.8", "@types/basic-auth@ts2.8", "@types/big.js@ts2.8", "@types/bl@ts2.8", "@types/bluebird@ts2.8", "@types/body-parser@ts2.8", "@types/bonjour@ts2.8", "@types/boom@ts2.8", "@types/brace-expansion@ts2.8", "@types/braces@ts2.8", "@types/brorand@ts2.8", "@types/browser-resolve@ts2.8", "@types/bson@ts2.8", "@types/buffer-equal@ts2.8", "@types/builtin-modules@ts2.8", "@types/bytes@ts2.8", "@types/callsites@ts2.8", "@types/camelcase@ts2.8", "@types/camelcase-keys@ts2.8", "@types/caseless@ts2.8", "@types/change-emitter@ts2.8", "@types/check-types@ts2.8", "@types/cheerio@ts2.8", "@types/chokidar@ts2.8", "@types/chownr@ts2.8", "@types/circular-json@ts2.8", "@types/classnames@ts2.8", "@types/clean-css@ts2.8", "@types/clone@ts2.8", "@types/co-body@ts2.8", "@types/color@ts2.8", "@types/color-convert@ts2.8", "@types/color-name@ts2.8", "@types/color-string@ts2.8", "@types/colors@ts2.8", "@types/combined-stream@ts2.8", "@types/common-tags@ts2.8", "@types/component-emitter@ts2.8", "@types/compressible@ts2.8", "@types/compression@ts2.8", "@types/concat-stream@ts2.8", "@types/connect-history-api-fallback@ts2.8", "@types/content-disposition@ts2.8", "@types/content-type@ts2.8", "@types/convert-source-map@ts2.8", "@types/cookie@ts2.8", "@types/cookie-signature@ts2.8", "@types/cookies@ts2.8", "@types/core-js@ts2.8", "@types/cosmiconfig@ts2.8", "@types/create-react-class@ts2.8", "@types/cross-spawn@ts2.8", "@types/cryptiles@ts2.8", "@types/css-modules-require-hook@ts2.8", "@types/dargs@ts2.8", "@types/dateformat@ts2.8", "@types/debug@ts2.8", "@types/decamelize@ts2.8", "@types/decompress@ts2.8", "@types/decompress-response@ts2.8", "@types/deep-equal@ts2.8", "@types/deep-extend@ts2.8", "@types/deepmerge@ts2.8", "@types/defined@ts2.8", "@types/del@ts2.8", "@types/depd@ts2.8", "@types/destroy@ts2.8", "@types/detect-indent@ts2.8", "@types/detect-newline@ts2.8", "@types/diff@ts2.8", "@types/doctrine@ts2.8", "@types/download@ts2.8", "@types/draft-js@ts2.8", "@types/duplexer2@ts2.8", "@types/duplexer3@ts2.8", "@types/duplexify@ts2.8", "@types/ejs@ts2.8", "@types/end-of-stream@ts2.8", "@types/entities@ts2.8", "@types/escape-html@ts2.8", "@types/escape-string-regexp@ts2.8", "@types/escodegen@ts2.8", "@types/eslint-scope@ts2.8", "@types/eslint-visitor-keys@ts2.8", "@types/esprima@ts2.8", "@types/estraverse@ts2.8", "@types/etag@ts2.8", "@types/events@ts2.8", "@types/execa@ts2.8", "@types/exenv@ts2.8", "@types/exit@ts2.8", "@types/exit-hook@ts2.8", "@types/expect@ts2.8", "@types/express@ts2.8", "@types/express-graphql@ts2.8", "@types/extend@ts2.8", "@types/extract-zip@ts2.8", "@types/fancy-log@ts2.8", "@types/fast-diff@ts2.8", "@types/fast-levenshtein@ts2.8", "@types/figures@ts2.8", "@types/file-type@ts2.8", "@types/filenamify@ts2.8", "@types/filesize@ts2.8", "@types/finalhandler@ts2.8", "@types/find-root@ts2.8", "@types/find-up@ts2.8", "@types/findup-sync@ts2.8", "@types/forever-agent@ts2.8", "@types/form-data@ts2.8", "@types/forwarded@ts2.8", "@types/fresh@ts2.8", "@types/from2@ts2.8", "@types/fs-extra@ts2.8", "@types/get-caller-file@ts2.8", "@types/get-stdin@ts2.8", "@types/get-stream@ts2.8", "@types/get-value@ts2.8", "@types/glob-base@ts2.8", "@types/glob-parent@ts2.8", "@types/glob-stream@ts2.8", "@types/globby@ts2.8", "@types/globule@ts2.8", "@types/got@ts2.8", "@types/graceful-fs@ts2.8", "@types/gulp-rename@ts2.8", "@types/gulp-sourcemaps@ts2.8", "@types/gulp-util@ts2.8", "@types/gzip-size@ts2.8", "@types/handlebars@ts2.8", "@types/has-ansi@ts2.8", "@types/hasha@ts2.8", "@types/he@ts2.8", "@types/hoek@ts2.8", "@types/html-entities@ts2.8", "@types/html-minifier@ts2.8", "@types/htmlparser2@ts2.8", "@types/http-assert@ts2.8", "@types/http-errors@ts2.8", "@types/http-proxy@ts2.8", "@types/http-proxy-middleware@ts2.8", "@types/indent-string@ts2.8", "@types/inflected@ts2.8", "@types/inherits@ts2.8", "@types/ini@ts2.8", "@types/inline-style-prefixer@ts2.8", "@types/inquirer@ts2.8", "@types/internal-ip@ts2.8", "@types/into-stream@ts2.8", "@types/invariant@ts2.8", "@types/ip@ts2.8", "@types/ip-regex@ts2.8", "@types/is-absolute-url@ts2.8", "@types/is-binary-path@ts2.8", "@types/is-finite@ts2.8", "@types/is-glob@ts2.8", "@types/is-my-json-valid@ts2.8", "@types/is-number@ts2.8", "@types/is-object@ts2.8", "@types/is-path-cwd@ts2.8", "@types/is-path-in-cwd@ts2.8", "@types/is-promise@ts2.8", "@types/is-scoped@ts2.8", "@types/is-stream@ts2.8", "@types/is-svg@ts2.8", "@types/is-url@ts2.8", "@types/is-windows@ts2.8", "@types/istanbul-lib-coverage@ts2.8", "@types/istanbul-lib-hook@ts2.8", "@types/istanbul-lib-instrument@ts2.8", "@types/istanbul-lib-report@ts2.8", "@types/istanbul-lib-source-maps@ts2.8", "@types/istanbul-reports@ts2.8", "@types/jest-diff@ts2.8", "@types/jest-docblock@ts2.8", "@types/jest-get-type@ts2.8", "@types/jest-matcher-utils@ts2.8", "@types/jest-validate@ts2.8", "@types/jpeg-js@ts2.8", "@types/js-base64@ts2.8", "@types/js-string-escape@ts2.8", "@types/js-yaml@ts2.8", "@types/jsbn@ts2.8", "@types/jsdom@ts2.8", "@types/jsesc@ts2.8", "@types/json-parse-better-errors@ts2.8", "@types/json-schema@ts2.8", "@types/json-stable-stringify@ts2.8", "@types/json-stringify-safe@ts2.8", "@types/json5@ts2.8", "@types/jsonfile@ts2.8", "@types/jsontoxml@ts2.8", "@types/jss@ts2.8", "@types/keygrip@ts2.8", "@types/keymirror@ts2.8", "@types/keyv@ts2.8", "@types/klaw@ts2.8", "@types/koa-send@ts2.8", "@types/leven@ts2.8", "@types/listr@ts2.8", "@types/load-json-file@ts2.8", "@types/loader-runner@ts2.8", "@types/loader-utils@ts2.8", "@types/locate-path@ts2.8", "@types/lodash-es@ts2.8", "@types/lodash.assign@ts2.8", "@types/lodash.camelcase@ts2.8", "@types/lodash.clonedeep@ts2.8", "@types/lodash.debounce@ts2.8", "@types/lodash.escape@ts2.8", "@types/lodash.flowright@ts2.8", "@types/lodash.get@ts2.8", "@types/lodash.isarguments@ts2.8", "@types/lodash.isarray@ts2.8", "@types/lodash.isequal@ts2.8", "@types/lodash.isobject@ts2.8", "@types/lodash.isstring@ts2.8", "@types/lodash.keys@ts2.8", "@types/lodash.memoize@ts2.8", "@types/lodash.merge@ts2.8", "@types/lodash.mergewith@ts2.8", "@types/lodash.pick@ts2.8", "@types/lodash.sortby@ts2.8", "@types/lodash.tail@ts2.8", "@types/lodash.template@ts2.8", "@types/lodash.throttle@ts2.8", "@types/lodash.unescape@ts2.8", "@types/lodash.uniq@ts2.8", "@types/log-symbols@ts2.8", "@types/log-update@ts2.8", "@types/loglevel@ts2.8", "@types/loud-rejection@ts2.8", "@types/lru-cache@ts2.8", "@types/make-dir@ts2.8", "@types/map-obj@ts2.8", "@types/media-typer@ts2.8", "@types/mem@ts2.8", "@types/mem-fs@ts2.8", "@types/memory-fs@ts2.8", "@types/meow@ts2.8", "@types/merge-descriptors@ts2.8", "@types/merge-stream@ts2.8", "@types/methods@ts2.8", "@types/micromatch@ts2.8", "@types/mime@ts2.8", "@types/mime-db@ts2.8", "@types/mime-types@ts2.8", "@types/minimatch@ts2.8", "@types/minimist@ts2.8", "@types/minipass@ts2.8", "@types/mkdirp@ts2.8", "@types/mongodb@ts2.8", "@types/morgan@ts2.8", "@types/move-concurrently@ts2.8", "@types/ms@ts2.8", "@types/msgpack-lite@ts2.8", "@types/multimatch@ts2.8", "@types/mz@ts2.8", "@types/negotiator@ts2.8", "@types/node-dir@ts2.8", "@types/node-fetch@ts2.8", "@types/node-forge@ts2.8", "@types/node-int64@ts2.8", "@types/node-ipc@ts2.8", "@types/node-notifier@ts2.8", "@types/nomnom@ts2.8", "@types/nopt@ts2.8", "@types/normalize-package-data@ts2.8", "@types/normalize-url@ts2.8", "@types/number-is-nan@ts2.8", "@types/object-assign@ts2.8", "@types/on-finished@ts2.8", "@types/on-headers@ts2.8", "@types/once@ts2.8", "@types/onetime@ts2.8", "@types/opener@ts2.8", "@types/opn@ts2.8", "@types/optimist@ts2.8", "@types/ora@ts2.8", "@types/os-homedir@ts2.8", "@types/os-locale@ts2.8", "@types/os-tmpdir@ts2.8", "@types/p-cancelable@ts2.8", "@types/p-each-series@ts2.8", "@types/p-event@ts2.8", "@types/p-lazy@ts2.8", "@types/p-limit@ts2.8", "@types/p-locate@ts2.8", "@types/p-map@ts2.8", "@types/p-map-series@ts2.8", "@types/p-reduce@ts2.8", "@types/p-timeout@ts2.8", "@types/p-try@ts2.8", "@types/pako@ts2.8", "@types/parse-glob@ts2.8", "@types/parse-json@ts2.8", "@types/parseurl@ts2.8", "@types/path-exists@ts2.8", "@types/path-is-absolute@ts2.8", "@types/path-parse@ts2.8", "@types/pg-pool@ts2.8", "@types/pg-types@ts2.8", "@types/pify@ts2.8", "@types/pixelmatch@ts2.8", "@types/pkg-dir@ts2.8", "@types/pluralize@ts2.8", "@types/pngjs@ts2.8", "@types/prelude-ls@ts2.8", "@types/pretty-bytes@ts2.8", "@types/pretty-format@ts2.8", "@types/progress@ts2.8", "@types/promise-retry@ts2.8", "@types/proxy-addr@ts2.8", "@types/pump@ts2.8", "@types/q@ts2.8", "@types/qs@ts2.8", "@types/range-parser@ts2.8", "@types/rc@ts2.8", "@types/rc-select@ts2.8", "@types/rc-slider@ts2.8", "@types/rc-tooltip@ts2.8", "@types/rc-tree@ts2.8", "@types/react-event-listener@ts2.8", "@types/react-side-effect@ts2.8", "@types/react-slick@ts2.8", "@types/read-chunk@ts2.8", "@types/read-pkg@ts2.8", "@types/read-pkg-up@ts2.8", "@types/recompose@ts2.8", "@types/recursive-readdir@ts2.8", "@types/relateurl@ts2.8", "@types/replace-ext@ts2.8", "@types/request@ts2.8", "@types/request-promise-native@ts2.8", "@types/require-directory@ts2.8", "@types/require-from-string@ts2.8", "@types/require-relative@ts2.8", "@types/resolve@ts2.8", "@types/resolve-from@ts2.8", "@types/retry@ts2.8", "@types/rx@ts2.8", "@types/rx-lite@ts2.8", "@types/rx-lite-aggregates@ts2.8", "@types/safe-regex@ts2.8", "@types/sane@ts2.8", "@types/sass-graph@ts2.8", "@types/sax@ts2.8", "@types/scriptjs@ts2.8", "@types/semver@ts2.8", "@types/send@ts2.8", "@types/serialize-javascript@ts2.8", "@types/serve-index@ts2.8", "@types/serve-static@ts2.8", "@types/set-value@ts2.8", "@types/shallowequal@ts2.8", "@types/shelljs@ts2.8", "@types/sockjs@ts2.8", "@types/sockjs-client@ts2.8", "@types/source-list-map@ts2.8", "@types/source-map-support@ts2.8", "@types/spdx-correct@ts2.8", "@types/spdy@ts2.8", "@types/split@ts2.8", "@types/sprintf@ts2.8", "@types/sprintf-js@ts2.8", "@types/sqlstring@ts2.8", "@types/sshpk@ts2.8", "@types/stack-utils@ts2.8", "@types/stat-mode@ts2.8", "@types/statuses@ts2.8", "@types/strict-uri-encode@ts2.8", "@types/string-template@ts2.8", "@types/strip-ansi@ts2.8", "@types/strip-bom@ts2.8", "@types/strip-json-comments@ts2.8", "@types/supports-color@ts2.8", "@types/svg2png@ts2.8", "@types/svgo@ts2.8", "@types/table@ts2.8", "@types/tapable@ts2.8", "@types/tar@ts2.8", "@types/temp@ts2.8", "@types/tempfile@ts2.8", "@types/through@ts2.8", "@types/through2@ts2.8", "@types/tinycolor2@ts2.8", "@types/tmp@ts2.8", "@types/to-absolute-glob@ts2.8", "@types/tough-cookie@ts2.8", "@types/trim@ts2.8", "@types/tryer@ts2.8", "@types/type-check@ts2.8", "@types/type-is@ts2.8", "@types/ua-parser-js@ts2.8", "@types/uglify-js@ts2.8", "@types/uglifyjs-webpack-plugin@ts2.8", "@types/underscore@ts2.8", "@types/uniq@ts2.8", "@types/uniqid@ts2.8", "@types/untildify@ts2.8", "@types/urijs@ts2.8", "@types/url-join@ts2.8", "@types/url-parse@ts2.8", "@types/url-regex@ts2.8", "@types/user-home@ts2.8", "@types/util-deprecate@ts2.8", "@types/util.promisify@ts2.8", "@types/utils-merge@ts2.8", "@types/uuid@ts2.8", "@types/vali-date@ts2.8", "@types/vary@ts2.8", "@types/verror@ts2.8", "@types/vinyl@ts2.8", "@types/vinyl-fs@ts2.8", "@types/warning@ts2.8", "@types/watch@ts2.8", "@types/watchpack@ts2.8", "@types/webpack-dev-middleware@ts2.8", "@types/webpack-sources@ts2.8", "@types/which@ts2.8", "@types/window-size@ts2.8", "@types/wrap-ansi@ts2.8", "@types/write-file-atomic@ts2.8", "@types/ws@ts2.8", "@types/xml2js@ts2.8", "@types/xmlbuilder@ts2.8", "@types/xtend@ts2.8", "@types/yallist@ts2.8", "@types/yargs@ts2.8", "@types/yauzl@ts2.8", "@types/yeoman-generator@ts2.8", "@types/zen-observable@ts2.8", "@types/react-content-loader@ts2.8"];
+        const expectedCommands = [
+            TI.getNpmCommandForInstallation(npmPath, tsVersion, packageNames, packageNames.length).command,
+            TI.getNpmCommandForInstallation(npmPath, tsVersion, packageNames, packageNames.length - Math.ceil(packageNames.length / 2)).command
+        ];
+        it("works when the command is too long to install all packages at once", () => {
+            const commands: string[] = [];
+            const hasError = TI.installNpmPackages(npmPath, tsVersion, packageNames, command => {
+                commands.push(command);
+                return false;
+            });
+            assert.isFalse(hasError);
+            assert.deepEqual(commands, expectedCommands, "commands");
+        });
+
+        it("installs remaining packages when one of the partial command fails", () => {
+            const commands: string[] = [];
+            const hasError = TI.installNpmPackages(npmPath, tsVersion, packageNames, command => {
+                commands.push(command);
+                return commands.length === 1;
+            });
+            assert.isTrue(hasError);
+            assert.deepEqual(commands, expectedCommands, "commands");
+        });
+    });
+
+    describe("recomputing resolutions of unresolved imports", () => {
+        const globalTypingsCacheLocation = "/tmp";
+        const appPath = "/a/b/app.js" as Path;
+        const foooPath = "/a/b/node_modules/fooo/index.d.ts";
+        function verifyResolvedModuleOfFooo(project: server.Project) {
+            const foooResolution = project.getLanguageService().getProgram().getSourceFileByPath(appPath).resolvedModules.get("fooo");
+            assert.equal(foooResolution.resolvedFileName, foooPath);
+            return foooResolution;
+        }
+
+        function verifyUnresolvedImportResolutions(appContents: string, typingNames: string[], typingFiles: FileOrFolder[]) {
+            const app: FileOrFolder = {
+                path: appPath,
+                content: `${appContents}import * as x from "fooo";`
+            };
+            const fooo: FileOrFolder = {
+                path: foooPath,
+                content: `export var x: string;`
+            };
+            const host = createServerHost([app, fooo]);
+            const installer = new (class extends Installer {
+                constructor() {
+                    super(host, { globalTypingsCacheLocation, typesRegistry: createTypesRegistry("foo") });
+                }
+                installWorker(_requestId: number, _args: string[], _cwd: string, cb: TI.RequestCompletedAction) {
+                    executeCommand(this, host, typingNames, typingFiles, cb);
+                }
+            })();
+            const projectService = createProjectService(host, { typingsInstaller: installer });
+            projectService.openClientFile(app.path);
+            projectService.checkNumberOfProjects({ inferredProjects: 1 });
+
+            const proj = projectService.inferredProjects[0];
+            checkProjectActualFiles(proj, [app.path, fooo.path]);
+            const foooResolution1 = verifyResolvedModuleOfFooo(proj);
+
+            installer.installAll(/*expectedCount*/ 1);
+            host.checkTimeoutQueueLengthAndRun(2);
+            checkProjectActualFiles(proj, typingFiles.map(f => f.path).concat(app.path, fooo.path));
+            const foooResolution2 = verifyResolvedModuleOfFooo(proj);
+            assert.strictEqual(foooResolution1, foooResolution2);
+        }
+
+        it("correctly invalidate the resolutions with typing names", () => {
+            verifyUnresolvedImportResolutions('import * as a from "foo";', ["foo"], [{
+                path: `${globalTypingsCacheLocation}/node_modules/foo/index.d.ts`,
+                content: "export function a(): void;"
+            }]);
+        });
+
+        it("correctly invalidate the resolutions with typing names that are trimmed", () => {
+            const fooAA: FileOrFolder = {
+                path: `${globalTypingsCacheLocation}/node_modules/foo/a/a.d.ts`,
+                content: "export function a (): void;"
+            };
+            const fooAB: FileOrFolder = {
+                path: `${globalTypingsCacheLocation}/node_modules/foo/a/b.d.ts`,
+                content: "export function b (): void;"
+            };
+            const fooAC: FileOrFolder = {
+                path: `${globalTypingsCacheLocation}/node_modules/foo/a/c.d.ts`,
+                content: "export function c (): void;"
+            };
+            verifyUnresolvedImportResolutions(`
+                    import * as a from "foo/a/a";
+                    import * as b from "foo/a/b";
+                    import * as c from "foo/a/c";
+            `, ["foo"], [fooAA, fooAB, fooAC]);
+        });
+    });
 }
diff --git a/src/harness/virtualFileSystem.ts b/src/harness/virtualFileSystem.ts
index 16267a092fc..698f99616ca 100644
--- a/src/harness/virtualFileSystem.ts
+++ b/src/harness/virtualFileSystem.ts
@@ -125,7 +125,7 @@ namespace Utils {
 
         addFile(path: string, content?: Harness.LanguageService.ScriptInfo) {
             const absolutePath = ts.normalizePath(ts.getNormalizedAbsolutePath(path, this.currentDirectory));
-            const fileName = ts.getBaseFileName(path);
+            const fileName = ts.getBaseFileName(absolutePath);
             const directoryPath = ts.getDirectoryPath(absolutePath);
             const directory = this.addDirectory(directoryPath);
             return directory ? directory.addFile(fileName, content) : undefined;
diff --git a/src/harness/virtualFileSystemWithWatch.ts b/src/harness/virtualFileSystemWithWatch.ts
index 71b7da2ed14..3756f435d43 100644
--- a/src/harness/virtualFileSystemWithWatch.ts
+++ b/src/harness/virtualFileSystemWithWatch.ts
@@ -179,10 +179,18 @@ interface Array<T> {}`
         checkMapKeys("watchedFiles", host.watchedFiles, expectedFiles);
     }
 
-    export function checkWatchedDirectories(host: TestServerHost, expectedDirectories: string[], recursive = false) {
+    export function checkWatchedFilesDetailed(host: TestServerHost, expectedFiles: Map<number>) {
+        checkMultiMapKeyCount("watchedFiles", host.watchedFiles, expectedFiles);
+    }
+
+    export function checkWatchedDirectories(host: TestServerHost, expectedDirectories: string[], recursive: boolean) {
         checkMapKeys(`watchedDirectories${recursive ? " recursive" : ""}`, recursive ? host.watchedDirectoriesRecursive : host.watchedDirectories, expectedDirectories);
     }
 
+    export function checkWatchedDirectoriesDetailed(host: TestServerHost, expectedDirectories: Map<number>, recursive: boolean) {
+        checkMultiMapKeyCount(`watchedDirectories${recursive ? " recursive" : ""}`, recursive ? host.watchedDirectoriesRecursive : host.watchedDirectories, expectedDirectories);
+    }
+
     export function checkOutputContains(host: TestServerHost, expected: ReadonlyArray<string>) {
         const mapExpected = arrayToSet(expected);
         const mapSeen = createMap<true>();
diff --git a/src/lib/es2015.core.d.ts b/src/lib/es2015.core.d.ts
index 68be040c29d..cfb300c784d 100644
--- a/src/lib/es2015.core.d.ts
+++ b/src/lib/es2015.core.d.ts
@@ -1,5 +1,3 @@
-declare type PropertyKey = string | number | symbol;
-
 interface Array<T> {
     /**
      * Returns the value of the first element in the array where predicate is true, and undefined
@@ -258,20 +256,6 @@ interface NumberConstructor {
     parseInt(string: string, radix?: number): number;
 }
 
-interface Object {
-    /**
-     * Determines whether an object has a property with the specified name.
-     * @param v A property name.
-     */
-    hasOwnProperty(v: PropertyKey): boolean;
-
-    /**
-     * Determines whether a specified property is enumerable.
-     * @param v A property name.
-     */
-    propertyIsEnumerable(v: PropertyKey): boolean;
-}
-
 interface ObjectConstructor {
     /**
      * Copy the values of all of the enumerable own properties from one or more source objects to a
@@ -327,25 +311,6 @@ interface ObjectConstructor {
      * @param proto The value of the new prototype or null.
      */
     setPrototypeOf(o: any, proto: object | null): any;
-
-    /**
-     * Gets the own property descriptor of the specified object.
-     * An own property descriptor is one that is defined directly on the object and is not
-     * inherited from the object's prototype.
-     * @param o Object that contains the property.
-     * @param p Name of the property.
-     */
-    getOwnPropertyDescriptor(o: any, propertyKey: PropertyKey): PropertyDescriptor | undefined;
-
-    /**
-     * Adds a property to an object, or modifies attributes of an existing property.
-     * @param o Object on which to add or modify the property. This can be a native JavaScript
-     * object (that is, a user-defined object or a built in object) or a DOM object.
-     * @param p The property name.
-     * @param attributes Descriptor for the property. It can be for a data property or an accessor
-     *  property.
-     */
-    defineProperty(o: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): any;
 }
 
 interface ReadonlyArray<T> {
diff --git a/src/lib/es2015.promise.d.ts b/src/lib/es2015.promise.d.ts
index ab33531191f..14602c0b5ed 100644
--- a/src/lib/es2015.promise.d.ts
+++ b/src/lib/es2015.promise.d.ts
@@ -177,14 +177,7 @@ interface PromiseConstructor {
      * @param reason The reason the promise was rejected.
      * @returns A new rejected Promise.
      */
-    reject(reason: any): Promise<never>;
-
-    /**
-     * Creates a new rejected promise for the provided reason.
-     * @param reason The reason the promise was rejected.
-     * @returns A new rejected Promise.
-     */
-    reject<T>(reason: any): Promise<T>;
+    reject<T = never>(reason?: any): Promise<T>;
 
     /**
      * Creates a new resolved promise for the provided value.
diff --git a/src/lib/es5.d.ts b/src/lib/es5.d.ts
index 55c184f672f..0f1782ef3e6 100644
--- a/src/lib/es5.d.ts
+++ b/src/lib/es5.d.ts
@@ -74,6 +74,8 @@ declare function escape(string: string): string;
   */
 declare function unescape(string: string): string;
 
+declare type PropertyKey = string | number | symbol;
+
 interface PropertyDescriptor {
     configurable?: boolean;
     enumerable?: boolean;
@@ -104,7 +106,7 @@ interface Object {
       * Determines whether an object has a property with the specified name.
       * @param v A property name.
       */
-    hasOwnProperty(v: string): boolean;
+    hasOwnProperty(v: PropertyKey): boolean;
 
     /**
       * Determines whether an object exists in another object's prototype chain.
@@ -116,7 +118,7 @@ interface Object {
       * Determines whether a specified property is enumerable.
       * @param v A property name.
       */
-    propertyIsEnumerable(v: string): boolean;
+    propertyIsEnumerable(v: PropertyKey): boolean;
 }
 
 interface ObjectConstructor {
@@ -139,7 +141,7 @@ interface ObjectConstructor {
       * @param o Object that contains the property.
       * @param p Name of the property.
     */
-    getOwnPropertyDescriptor(o: any, p: string): PropertyDescriptor | undefined;
+    getOwnPropertyDescriptor(o: any, p: PropertyKey): PropertyDescriptor | undefined;
 
     /**
       * Returns the names of the own properties of an object. The own properties of an object are those that are defined directly
@@ -167,7 +169,7 @@ interface ObjectConstructor {
       * @param p The property name.
       * @param attributes Descriptor for the property. It can be for a data property or an accessor property.
       */
-    defineProperty(o: any, p: string, attributes: PropertyDescriptor & ThisType<any>): any;
+    defineProperty(o: any, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>): any;
 
     /**
       * Adds one or more properties to an object, and/or modifies attributes of existing properties.
@@ -1349,7 +1351,7 @@ type Pick<T, K extends keyof T> = {
 /**
  * Construct a type with a set of properties K of type T
  */
-type Record<K extends string, T> = {
+type Record<K extends keyof any, T> = {
     [P in K]: T;
 };
 
diff --git a/src/loc/lcl/chs/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/chs/diagnosticMessages/diagnosticMessages.generated.json.lcl
index 962956e5bbf..546572f66c2 100644
--- a/src/loc/lcl/chs/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/chs/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -903,6 +903,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Add_0_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Add '{0}.' to unresolved variable]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[将“{0}.”添加到未解析的变量]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Add_all_missing_async_modifiers_95041" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add all missing 'async' modifiers]]></Val>
@@ -999,27 +1008,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
+      <Item ItemId=";Add_qualifier_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to all unresolved variables matching a member name]]></Val>
+          <Val><![CDATA[Add qualifier to all unresolved variables matching a member name]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[将 "this." 添加到匹配成员名称的所有未解析变量]]></Val>
+            <Val><![CDATA[将限定符添加到匹配成员名称的所有未解析变量]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to unresolved variable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[向未解析的变量添加 "this."]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Add 'this.' to unresolved variable.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Add_to_all_uncalled_decorators_95044" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add '()' to all uncalled decorators]]></Val>
@@ -2388,15 +2385,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Compilation_complete_Watching_for_file_changes_6042" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Compilation complete. Watching for file changes.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[编译完成。查看文件更改。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Compile_the_project_given_the_path_to_its_configuration_file_or_to_a_folder_with_a_tsconfig_json_6020" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Compile the project given the path to its configuration file, or to a folder with a 'tsconfig.json'.]]></Val>
@@ -3771,17 +3759,20 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Found_0_errors_6194" ItemType="0" PsrId="306" Leaf="true">
+      <Item ItemId=";Found_0_errors_Watching_for_file_changes_6194" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Found {0} errors.]]></Val>
+          <Val><![CDATA[Found {0} errors. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[找到 {0} 个错误。注意文件更改。]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Found_1_error_6193" ItemType="0" PsrId="306" Leaf="true">
+      <Item ItemId=";Found_1_error_Watching_for_file_changes_6193" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Found 1 error.]]></Val>
+          <Val><![CDATA[Found 1 error. Watching for file changes.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找到 1 个错误。]]></Val>
+            <Val><![CDATA[找到 1 个错误。注意文件更改。]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -3894,6 +3885,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Generate_get_and_set_accessors_95046" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Generate 'get' and 'set' accessors]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[生成 "get" 和 "set" 访问器]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Generates a sourcemap for each corresponding '.d.ts' file.]]></Val>
@@ -6006,6 +6006,9 @@
       <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await_2570" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you forget to use 'await'?]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[类型“{1}”上不存在属性“{0}”。是否忘记使用 "await"?]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -6501,6 +6504,12 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Resolve_keyof_to_string_valued_property_names_only_no_numbers_or_symbols_6195" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Resolve 'keyof' to string valued property names only (no numbers or symbols).]]></Val>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Resolving_from_node_modules_folder_6118" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Resolving from node_modules folder...]]></Val>
diff --git a/src/loc/lcl/cht/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/cht/diagnosticMessages/diagnosticMessages.generated.json.lcl
index 8c72ca29d98..f6f14d4a402 100644
--- a/src/loc/lcl/cht/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/cht/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -642,6 +642,9 @@
       <Item ItemId=";A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma_1013" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[A rest parameter or binding pattern may not have a trailing comma.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[REST 參數或繫結模式的結尾不得為逗點。]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -900,21 +903,39 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Add_0_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Add '{0}.' to unresolved variable]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[對未解析的變數新增 '{0}.']]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Add_all_missing_async_modifiers_95041" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add all missing 'async' modifiers]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[新增缺少的所有 'async' 修飾詞]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
       <Item ItemId=";Add_all_missing_members_95022" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add all missing members]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[新增遺漏的所有成員]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
       <Item ItemId=";Add_all_missing_super_calls_95039" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add all missing super calls]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[新增缺少的所有 super 呼叫]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -939,6 +960,9 @@
       <Item ItemId=";Add_definite_assignment_assertions_to_all_uninitialized_properties_95028" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add definite assignment assertions to all uninitialized properties]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[為所有未初始化的屬性新增明確的指派判斷提示]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -966,6 +990,9 @@
       <Item ItemId=";Add_initializers_to_all_uninitialized_properties_95027" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add initializers to all uninitialized properties]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[為所有未初始化的屬性新增初始設定式]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -981,39 +1008,39 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
+      <Item ItemId=";Add_qualifier_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to all unresolved variables matching a member name]]></Val>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";Add_this_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to unresolved variable]]></Val>
+          <Val><![CDATA[Add qualifier to all unresolved variables matching a member name]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[將 'this' 新增至未解析的變數]]></Val>
+            <Val><![CDATA[對所有比對成員名稱的未解析變數新增限定詞]]></Val>
           </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Add 'this.' to unresolved variable.]]></Val>
-          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>
       <Item ItemId=";Add_to_all_uncalled_decorators_95044" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add '()' to all uncalled decorators]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[為所有未呼叫的裝飾項目新增 '()']]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
       <Item ItemId=";Add_ts_ignore_to_all_error_messages_95042" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add '@ts-ignore' to all error messages]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[為所有錯誤訊息新增 '@ts-ignore']]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
       <Item ItemId=";Add_undefined_type_to_all_uninitialized_properties_95029" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add undefined type to all uninitialized properties]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[為所有未初始化的屬性新增未定義的類型]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -1524,6 +1551,9 @@
       <Item ItemId=";Annotate_everything_with_types_from_JSDoc_95043" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Annotate everything with types from JSDoc]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[標註具備 JSDoc 之類型的所有項目 ]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -2151,18 +2181,27 @@
       <Item ItemId=";Change_all_extended_interfaces_to_implements_95038" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Change all extended interfaces to 'implements']]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[將所有延伸介面變更為 'implements']]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
       <Item ItemId=";Change_all_jsdoc_style_types_to_TypeScript_95030" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Change all jsdoc-style types to TypeScript]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[將所有 jsdoc 樣式的類型變更為 TypeScript]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
       <Item ItemId=";Change_all_jsdoc_style_types_to_TypeScript_and_add_undefined_to_nullable_types_95031" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Change all jsdoc-style types to TypeScript (and add '| undefined' to nullable types)]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[將所有 jsdoc 樣式的類型變更為 TypeScript (並為 null 類型新增 '| undefined')]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -2346,15 +2385,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Compilation_complete_Watching_for_file_changes_6042" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Compilation complete. Watching for file changes.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[編譯完成。正在等候檔案變更。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Compile_the_project_given_the_path_to_its_configuration_file_or_to_a_folder_with_a_tsconfig_json_6020" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Compile the project given the path to its configuration file, or to a folder with a 'tsconfig.json'.]]></Val>
@@ -2475,12 +2505,18 @@
       <Item ItemId=";Convert_all_constructor_functions_to_classes_95045" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Convert all constructor functions to classes]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[將所有建構函式轉換為類別]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
       <Item ItemId=";Convert_all_to_default_imports_95035" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Convert all to default imports]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[全部轉換為預設匯入]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -2664,6 +2700,9 @@
       <Item ItemId=";Delete_all_unused_declarations_95024" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Delete all unused declarations]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[刪除所有未使用的宣告]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -3714,6 +3753,27 @@
       <Item ItemId=";Fix_all_detected_spelling_errors_95026" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Fix all detected spelling errors]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[修正偵測到的所有拼字錯誤]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";Found_0_errors_Watching_for_file_changes_6194" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Found {0} errors. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[找到 {0} 個錯誤。正在監看檔案變更。]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";Found_1_error_Watching_for_file_changes_6193" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Found 1 error. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[找到 1 個錯誤。正在監看檔案變更。]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -3825,6 +3885,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Generate_get_and_set_accessors_95046" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Generate 'get' and 'set' accessors]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[產生 'get' 與 'set' 存取子]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Generates a sourcemap for each corresponding '.d.ts' file.]]></Val>
@@ -4032,12 +4101,18 @@
       <Item ItemId=";Implement_all_inherited_abstract_classes_95040" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Implement all inherited abstract classes]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[實作所有繼承的抽象類別]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
       <Item ItemId=";Implement_all_unimplemented_interfaces_95032" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Implement all unimplemented interfaces]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[實作所有未實作的介面]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -4239,6 +4314,9 @@
       <Item ItemId=";Infer_all_types_from_usage_95023" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Infer all types from usage]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[從用法推斷所有類型]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -4356,6 +4434,9 @@
       <Item ItemId=";Install_all_missing_types_packages_95033" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Install all missing types packages]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[安裝缺少的所有類型套件]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -4851,6 +4932,9 @@
       <Item ItemId=";Make_all_super_calls_the_first_statement_in_their_constructor_95036" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Make all 'super()' calls the first statement in their constructor]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[在其建構函式的第一個陳述式中呼叫所有的 'super()']]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -4950,12 +5034,18 @@
       <Item ItemId=";Module_0_does_not_refer_to_a_type_but_is_used_as_a_type_here_1340" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Module '{0}' does not refer to a type, but is used as a type here.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[模組 '{0}' 未參考任何類型，但在此用為類型。]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
       <Item ItemId=";Module_0_does_not_refer_to_a_value_but_is_used_as_a_value_here_1339" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Module '{0}' does not refer to a value, but is used as a value here.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[模組 '{0}' 未參考任何值，但在此用為值。]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -5853,6 +5943,9 @@
       <Item ItemId=";Prefix_all_unused_declarations_with_where_possible_95025" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Prefix all unused declarations with '_' where possible]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[若可行，為所有未使用的宣告加上前置詞 '_']]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -5910,6 +6003,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await_2570" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you forget to use 'await'?]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[類型 '{1}' 不存在屬性 '{0}'。是否忘記要使用 'await'?]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_mean_2_2551" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you mean '{2}'?]]></Val>
@@ -6402,6 +6504,12 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Resolve_keyof_to_string_valued_property_names_only_no_numbers_or_symbols_6195" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Resolve 'keyof' to string valued property names only (no numbers or symbols).]]></Val>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Resolving_from_node_modules_folder_6118" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Resolving from node_modules folder...]]></Val>
@@ -6756,6 +6864,9 @@
       <Item ItemId=";Rewrite_all_as_indexed_access_types_95034" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Rewrite all as indexed access types]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[將全部重寫為經過編製索引的存取類型]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -7500,6 +7611,9 @@
       <Item ItemId=";The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter_but_2407" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter, but here has type '{0}'.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA['for...in' 陳述式的右方必須是類型 'any'、物件類型或型別參數，但此處為類型 '{0}'。]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -7821,6 +7935,9 @@
       <Item ItemId=";Type_0_is_not_an_array_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators_2568" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Type '{0}' is not an array type. Use compiler option '--downlevelIteration' to allow iterating of iterators.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[類型 '{0}' 不是陣列類型。請使用編譯器選項 '-downlevelIteration' 允許逐一查看迭代器。]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -7836,6 +7953,9 @@
       <Item ItemId=";Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterati_2569" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Type '{0}' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[類型 '{0}' 不是陣列類型或字串類型。請使用編譯器選項 '-downlevelIteration' 允許逐一查看迭代器。]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -7896,12 +8016,18 @@
       <Item ItemId=";Type_0_must_have_a_Symbol_asyncIterator_method_that_returns_an_async_iterator_2504" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Type '{0}' must have a '[Symbol.asyncIterator]5D;()' method that returns an async iterator.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[類型 '{0}' 必須具備會傳回非同步迭代器的 '[Symbol.asyncIterator]5D;()' 方法。]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
       <Item ItemId=";Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Type '{0}' must have a '[Symbol.iterator]5D;()' method that returns an iterator.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[類型 '{0}' 必須具備會傳回迭代器的 '[Symbol.iterator]5D;()' 方法。]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -7986,6 +8112,9 @@
       <Item ItemId=";Type_arguments_cannot_be_used_here_1342" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Type arguments cannot be used here.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[此處不得使用型別引數。]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
diff --git a/src/loc/lcl/csy/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/csy/diagnosticMessages/diagnosticMessages.generated.json.lcl
index 6f458cd9d3e..203d2c22ab9 100644
--- a/src/loc/lcl/csy/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/csy/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -912,6 +912,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Add_0_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Add '{0}.' to unresolved variable]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Přidat {0}. k nerozpoznané proměnné]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Add_all_missing_async_modifiers_95041" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add all missing 'async' modifiers]]></Val>
@@ -1008,27 +1017,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
+      <Item ItemId=";Add_qualifier_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to all unresolved variables matching a member name]]></Val>
+          <Val><![CDATA[Add qualifier to all unresolved variables matching a member name]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Přidat this. do všech nerozpoznaných proměnných odpovídajících názvu členu]]></Val>
+            <Val><![CDATA[Přidat kvalifikátor do všech nerozpoznaných proměnných odpovídajících názvu členu]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to unresolved variable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Přidat k nerozpoznané proměnné this.]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Add 'this.' to unresolved variable.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Add_to_all_uncalled_decorators_95044" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add '()' to all uncalled decorators]]></Val>
@@ -2397,15 +2394,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Compilation_complete_Watching_for_file_changes_6042" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Compilation complete. Watching for file changes.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Kompilace je hotová. Sledují se změny souborů.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Compile_the_project_given_the_path_to_its_configuration_file_or_to_a_folder_with_a_tsconfig_json_6020" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Compile the project given the path to its configuration file, or to a folder with a 'tsconfig.json'.]]></Val>
@@ -3780,6 +3768,24 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Found_0_errors_Watching_for_file_changes_6194" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Found {0} errors. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Byl nalezen tento počet chyb: {0}. Sledují se změny souborů.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";Found_1_error_Watching_for_file_changes_6193" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Found 1 error. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Byla nalezena 1 chyba. Sledují se změny souborů.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Found_package_json_at_0_6099" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Found 'package.json' at '{0}'.]]></Val>
@@ -3888,6 +3894,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Generate_get_and_set_accessors_95046" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Generate 'get' and 'set' accessors]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Generovat přístupové objekty get a set]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Generates a sourcemap for each corresponding '.d.ts' file.]]></Val>
@@ -5997,6 +6012,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await_2570" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you forget to use 'await'?]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Vlastnost {0} v typu {1} neexistuje. Nezapomněli jste použít await?]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_mean_2_2551" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you mean '{2}'?]]></Val>
diff --git a/src/loc/lcl/deu/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/deu/diagnosticMessages/diagnosticMessages.generated.json.lcl
index e5a04125bd7..a2fd58ac665 100644
--- a/src/loc/lcl/deu/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/deu/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -900,6 +900,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Add_0_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Add '{0}.' to unresolved variable]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Der nicht aufgelösten Variablen "{0}." hinzufügen]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Add_all_missing_async_modifiers_95041" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add all missing 'async' modifiers]]></Val>
@@ -996,27 +1005,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
+      <Item ItemId=";Add_qualifier_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to all unresolved variables matching a member name]]></Val>
+          <Val><![CDATA[Add qualifier to all unresolved variables matching a member name]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Allen nicht aufgelösten Variablen, die einem Membernamen entsprechen, "this." hinzufügen]]></Val>
+            <Val><![CDATA[Allen nicht aufgelösten Variablen, die einem Membernamen entsprechen, Qualifizierer hinzufügen]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to unresolved variable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Der nicht aufgelösten Variablen "this." hinzufügen]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Add 'this.' to unresolved variable.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Add_to_all_uncalled_decorators_95044" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add '()' to all uncalled decorators]]></Val>
@@ -2385,15 +2382,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Compilation_complete_Watching_for_file_changes_6042" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Compilation complete. Watching for file changes.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Die Kompilierung wurde abgeschlossen. Dateiänderungen werden überprüft.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Compile_the_project_given_the_path_to_its_configuration_file_or_to_a_folder_with_a_tsconfig_json_6020" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Compile the project given the path to its configuration file, or to a folder with a 'tsconfig.json'.]]></Val>
@@ -3768,6 +3756,24 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Found_0_errors_Watching_for_file_changes_6194" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Found {0} errors. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[{0} Fehler gefunden. Es wird auf Dateiänderungen überwacht.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";Found_1_error_Watching_for_file_changes_6193" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Found 1 error. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[1 Fehler gefunden. Es wird auf Dateiänderungen überwacht.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Found_package_json_at_0_6099" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Found 'package.json' at '{0}'.]]></Val>
@@ -3876,6 +3882,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Generate_get_and_set_accessors_95046" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Generate 'get' and 'set' accessors]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[GET- und SET-Accessoren generieren]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Generates a sourcemap for each corresponding '.d.ts' file.]]></Val>
@@ -5982,6 +5997,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await_2570" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you forget to use 'await'?]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Die Eigenschaft "{0}" ist im Typ "{1}" nicht vorhanden. Haben Sie "await" nicht verwendet?]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_mean_2_2551" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you mean '{2}'?]]></Val>
@@ -6474,6 +6498,12 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Resolve_keyof_to_string_valued_property_names_only_no_numbers_or_symbols_6195" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Resolve 'keyof' to string valued property names only (no numbers or symbols).]]></Val>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Resolving_from_node_modules_folder_6118" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Resolving from node_modules folder...]]></Val>
diff --git a/src/loc/lcl/esn/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/esn/diagnosticMessages/diagnosticMessages.generated.json.lcl
index f46e427ce62..f1cec4555ac 100644
--- a/src/loc/lcl/esn/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/esn/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -912,6 +912,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Add_0_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Add '{0}.' to unresolved variable]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Agregar "{0}." a una variable no resuelta]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Add_all_missing_async_modifiers_95041" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add all missing 'async' modifiers]]></Val>
@@ -1008,27 +1017,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
+      <Item ItemId=";Add_qualifier_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to all unresolved variables matching a member name]]></Val>
+          <Val><![CDATA[Add qualifier to all unresolved variables matching a member name]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Agregar "this." a todas las variables no resueltas que coincidan con un nombre de miembro]]></Val>
+            <Val><![CDATA[Agregar un calificador a todas las variables no resueltas que coincidan con un nombre de miembro]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to unresolved variable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Agregar "this." a una variable no resuelta]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Add 'this.' to unresolved variable.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Add_to_all_uncalled_decorators_95044" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add '()' to all uncalled decorators]]></Val>
@@ -2397,15 +2394,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Compilation_complete_Watching_for_file_changes_6042" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Compilation complete. Watching for file changes.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Compilación completada. Supervisando los cambios del archivo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Compile_the_project_given_the_path_to_its_configuration_file_or_to_a_folder_with_a_tsconfig_json_6020" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Compile the project given the path to its configuration file, or to a folder with a 'tsconfig.json'.]]></Val>
@@ -3780,6 +3768,24 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Found_0_errors_Watching_for_file_changes_6194" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Found {0} errors. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Se encontraron {0} errores. Supervisando los cambios del archivo.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";Found_1_error_Watching_for_file_changes_6193" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Found 1 error. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Se encontró un error. Supervisando los cambios del archivo.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Found_package_json_at_0_6099" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Found 'package.json' at '{0}'.]]></Val>
@@ -3888,6 +3894,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Generate_get_and_set_accessors_95046" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Generate 'get' and 'set' accessors]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Generar los descriptores de acceso "get" y "set"]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Generates a sourcemap for each corresponding '.d.ts' file.]]></Val>
@@ -5997,6 +6012,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await_2570" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you forget to use 'await'?]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[La propiedad "{0}" no existe en el tipo "{1}". ¿Olvidó usar "await"?]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_mean_2_2551" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you mean '{2}'?]]></Val>
@@ -6489,6 +6513,12 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Resolve_keyof_to_string_valued_property_names_only_no_numbers_or_symbols_6195" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Resolve 'keyof' to string valued property names only (no numbers or symbols).]]></Val>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Resolving_from_node_modules_folder_6118" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Resolving from node_modules folder...]]></Val>
diff --git a/src/loc/lcl/fra/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/fra/diagnosticMessages/diagnosticMessages.generated.json.lcl
index 09f82b9b47d..5f93b90c20e 100644
--- a/src/loc/lcl/fra/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/fra/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -912,6 +912,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Add_0_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Add '{0}.' to unresolved variable]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Ajouter '{0}.' à la variable non résolue]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Add_all_missing_async_modifiers_95041" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add all missing 'async' modifiers]]></Val>
@@ -1008,27 +1017,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
+      <Item ItemId=";Add_qualifier_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to all unresolved variables matching a member name]]></Val>
+          <Val><![CDATA[Add qualifier to all unresolved variables matching a member name]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ajouter 'this.' à toutes les variables non résolues correspondant à un nom de membre]]></Val>
+            <Val><![CDATA[Ajouter un qualificateur à toutes les variables non résolues correspondant à un nom de membre]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to unresolved variable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ajouter 'this.' à la variable non résolue]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Add 'this.' to unresolved variable.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Add_to_all_uncalled_decorators_95044" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add '()' to all uncalled decorators]]></Val>
@@ -2397,15 +2394,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Compilation_complete_Watching_for_file_changes_6042" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Compilation complete. Watching for file changes.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Fin de la compilation. Détection des changements apportés au fichier.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Compile_the_project_given_the_path_to_its_configuration_file_or_to_a_folder_with_a_tsconfig_json_6020" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Compile the project given the path to its configuration file, or to a folder with a 'tsconfig.json'.]]></Val>
@@ -3780,6 +3768,24 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Found_0_errors_Watching_for_file_changes_6194" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Found {0} errors. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[{0} erreurs trouvées. Changements de fichier sous surveillance.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";Found_1_error_Watching_for_file_changes_6193" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Found 1 error. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[1 erreur trouvée. Changements de fichier sous surveillance.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Found_package_json_at_0_6099" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Found 'package.json' at '{0}'.]]></Val>
@@ -3888,6 +3894,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Generate_get_and_set_accessors_95046" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Generate 'get' and 'set' accessors]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Générer les accesseurs 'get' et 'set']]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Generates a sourcemap for each corresponding '.d.ts' file.]]></Val>
@@ -5997,6 +6012,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await_2570" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you forget to use 'await'?]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[La propriété '{0}' n'existe pas sur le type '{1}'. Avez-vous oublié d'utiliser 'await' ?]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_mean_2_2551" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you mean '{2}'?]]></Val>
@@ -6489,6 +6513,12 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Resolve_keyof_to_string_valued_property_names_only_no_numbers_or_symbols_6195" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Resolve 'keyof' to string valued property names only (no numbers or symbols).]]></Val>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Resolving_from_node_modules_folder_6118" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Resolving from node_modules folder...]]></Val>
diff --git a/src/loc/lcl/ita/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/ita/diagnosticMessages/diagnosticMessages.generated.json.lcl
index f8e4866205b..619c6ea41af 100644
--- a/src/loc/lcl/ita/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/ita/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -903,6 +903,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Add_0_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Add '{0}.' to unresolved variable]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Aggiungere '{0}.' alla variabile non risolta]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Add_all_missing_async_modifiers_95041" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add all missing 'async' modifiers]]></Val>
@@ -999,27 +1008,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
+      <Item ItemId=";Add_qualifier_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to all unresolved variables matching a member name]]></Val>
+          <Val><![CDATA[Add qualifier to all unresolved variables matching a member name]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aggiungere 'this.' a tutte le variabili non risolte corrispondenti a un nome di membro]]></Val>
+            <Val><![CDATA[Aggiungere il qualificatore a tutte le variabili non risolte corrispondenti a un nome di membro]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to unresolved variable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Aggiungere 'this.' alla variabile non risolta]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Add 'this.' to unresolved variable.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Add_to_all_uncalled_decorators_95044" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add '()' to all uncalled decorators]]></Val>
@@ -2388,15 +2385,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Compilation_complete_Watching_for_file_changes_6042" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Compilation complete. Watching for file changes.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Compilazione completata. Verranno individuate le modifiche ai file.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Compile_the_project_given_the_path_to_its_configuration_file_or_to_a_folder_with_a_tsconfig_json_6020" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Compile the project given the path to its configuration file, or to a folder with a 'tsconfig.json'.]]></Val>
@@ -3771,6 +3759,24 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Found_0_errors_Watching_for_file_changes_6194" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Found {0} errors. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Sono stati trovati {0} errori. Verranno individuate le modifiche ai file.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";Found_1_error_Watching_for_file_changes_6193" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Found 1 error. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[È stato trovato 1 errore. Verranno individuate le modifiche ai file.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Found_package_json_at_0_6099" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Found 'package.json' at '{0}'.]]></Val>
@@ -3879,6 +3885,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Generate_get_and_set_accessors_95046" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Generate 'get' and 'set' accessors]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Generare le funzioni di accesso 'get' e 'set']]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Generates a sourcemap for each corresponding '.d.ts' file.]]></Val>
@@ -5988,6 +6003,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await_2570" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you forget to use 'await'?]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[La proprietà '{0}' non esiste nel tipo '{1}'. Si è dimenticato di usare 'await'?]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_mean_2_2551" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you mean '{2}'?]]></Val>
diff --git a/src/loc/lcl/jpn/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/jpn/diagnosticMessages/diagnosticMessages.generated.json.lcl
index 59f1bbd4e46..235f19b459f 100644
--- a/src/loc/lcl/jpn/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/jpn/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -903,6 +903,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Add_0_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Add '{0}.' to unresolved variable]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA['{0}' を未解決の変数に追加します]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Add_all_missing_async_modifiers_95041" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add all missing 'async' modifiers]]></Val>
@@ -999,27 +1008,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
+      <Item ItemId=";Add_qualifier_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to all unresolved variables matching a member name]]></Val>
+          <Val><![CDATA[Add qualifier to all unresolved variables matching a member name]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[メンバー名と一致するすべての未解決の変数に 'this.' を追加します]]></Val>
+            <Val><![CDATA[メンバー名と一致するすべての未解決の変数に修飾子を追加します]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to unresolved variable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['this.' を未解決の変数に追加する]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Add 'this.' to unresolved variable.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Add_to_all_uncalled_decorators_95044" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add '()' to all uncalled decorators]]></Val>
@@ -2388,15 +2385,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Compilation_complete_Watching_for_file_changes_6042" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Compilation complete. Watching for file changes.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[コンパイルが完了しました。ファイルの変更を監視しています。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Compile_the_project_given_the_path_to_its_configuration_file_or_to_a_folder_with_a_tsconfig_json_6020" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Compile the project given the path to its configuration file, or to a folder with a 'tsconfig.json'.]]></Val>
@@ -3771,6 +3759,24 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Found_0_errors_Watching_for_file_changes_6194" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Found {0} errors. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[{0} 件のエラーが見つかりました。ファイルの変更をモニタリングしています。]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";Found_1_error_Watching_for_file_changes_6193" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Found 1 error. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[1 件のエラーが見つかりました。ファイルの変更をモニタリングしています。]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Found_package_json_at_0_6099" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Found 'package.json' at '{0}'.]]></Val>
@@ -3879,6 +3885,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Generate_get_and_set_accessors_95046" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Generate 'get' and 'set' accessors]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA['get' および 'set' アクセサーの生成]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Generates a sourcemap for each corresponding '.d.ts' file.]]></Val>
@@ -5988,6 +6003,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await_2570" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you forget to use 'await'?]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[型 '{1}' にプロパティ '{0}' は存在しません。'await' を使用していない可能性があります。]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_mean_2_2551" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you mean '{2}'?]]></Val>
@@ -6480,6 +6504,12 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Resolve_keyof_to_string_valued_property_names_only_no_numbers_or_symbols_6195" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Resolve 'keyof' to string valued property names only (no numbers or symbols).]]></Val>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Resolving_from_node_modules_folder_6118" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Resolving from node_modules folder...]]></Val>
diff --git a/src/loc/lcl/kor/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/kor/diagnosticMessages/diagnosticMessages.generated.json.lcl
index 71d0d0e0465..7c615261dea 100644
--- a/src/loc/lcl/kor/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/kor/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -903,6 +903,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Add_0_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Add '{0}.' to unresolved variable]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[확인되지 않은 변수에 '{0}.' 추가]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Add_all_missing_async_modifiers_95041" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add all missing 'async' modifiers]]></Val>
@@ -999,27 +1008,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
+      <Item ItemId=";Add_qualifier_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to all unresolved variables matching a member name]]></Val>
+          <Val><![CDATA[Add qualifier to all unresolved variables matching a member name]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[멤버 이름과 일치하는 모든 확인되지 않은 변수에 'this.' 추가]]></Val>
+            <Val><![CDATA[멤버 이름과 일치하는 모든 확인되지 않은 변수에 한정자 추가]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to unresolved variable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[확인되지 않은 변수에 'this.' 추가]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Add 'this.' to unresolved variable.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Add_to_all_uncalled_decorators_95044" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add '()' to all uncalled decorators]]></Val>
@@ -2388,15 +2385,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Compilation_complete_Watching_for_file_changes_6042" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Compilation complete. Watching for file changes.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[컴파일이 완료되었습니다. 파일이 변경되었는지 확인하는 중입니다.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Compile_the_project_given_the_path_to_its_configuration_file_or_to_a_folder_with_a_tsconfig_json_6020" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Compile the project given the path to its configuration file, or to a folder with a 'tsconfig.json'.]]></Val>
@@ -3771,6 +3759,24 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Found_0_errors_Watching_for_file_changes_6194" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Found {0} errors. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[{0}개 오류가 발견되었습니다. 파일이 변경되었는지 확인하는 중입니다.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";Found_1_error_Watching_for_file_changes_6193" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Found 1 error. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[1개 오류가 발견되었습니다. 파일이 변경되었는지 확인하는 중입니다.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Found_package_json_at_0_6099" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Found 'package.json' at '{0}'.]]></Val>
@@ -3879,6 +3885,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Generate_get_and_set_accessors_95046" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Generate 'get' and 'set' accessors]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA['get' 및 'set' 접근자 생성]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Generates a sourcemap for each corresponding '.d.ts' file.]]></Val>
@@ -5988,6 +6003,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await_2570" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you forget to use 'await'?]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[속성 '{0}'이(가) '{1}' 형식에 없습니다. 'await' 사용을 잊으셨나요?]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_mean_2_2551" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you mean '{2}'?]]></Val>
@@ -6480,6 +6504,12 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Resolve_keyof_to_string_valued_property_names_only_no_numbers_or_symbols_6195" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Resolve 'keyof' to string valued property names only (no numbers or symbols).]]></Val>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Resolving_from_node_modules_folder_6118" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Resolving from node_modules folder...]]></Val>
diff --git a/src/loc/lcl/plk/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/plk/diagnosticMessages/diagnosticMessages.generated.json.lcl
index 5489cf3f0e8..f8a6325f4a1 100644
--- a/src/loc/lcl/plk/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/plk/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -893,6 +893,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Add_0_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Add '{0}.' to unresolved variable]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Dodaj „{0}.” do nierozpoznanej zmiennej]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Add_all_missing_async_modifiers_95041" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add all missing 'async' modifiers]]></Val>
@@ -989,27 +998,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
+      <Item ItemId=";Add_qualifier_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to all unresolved variables matching a member name]]></Val>
+          <Val><![CDATA[Add qualifier to all unresolved variables matching a member name]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dodaj element „this.” do wszystkich nierozpoznanych zmiennych pasujących do nazwy elementu członkowskiego]]></Val>
+            <Val><![CDATA[Dodaj kwalifikator do wszystkich nierozpoznanych zmiennych pasujących do nazwy składowej]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to unresolved variable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Dodaj „this.” do nierozpoznanej zmiennej]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Add 'this.' to unresolved variable.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Add_to_all_uncalled_decorators_95044" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add '()' to all uncalled decorators]]></Val>
@@ -2378,15 +2375,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Compilation_complete_Watching_for_file_changes_6042" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Compilation complete. Watching for file changes.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ukończono kompilację. Wyszukiwanie zmian plików.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Compile_the_project_given_the_path_to_its_configuration_file_or_to_a_folder_with_a_tsconfig_json_6020" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Compile the project given the path to its configuration file, or to a folder with a 'tsconfig.json'.]]></Val>
@@ -3761,20 +3749,20 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Found_0_errors_6194" ItemType="0" PsrId="306" Leaf="true">
+      <Item ItemId=";Found_0_errors_Watching_for_file_changes_6194" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Found {0} errors.]]></Val>
+          <Val><![CDATA[Found {0} errors. Watching for file changes.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Znaleziono błędy: {0}.]]></Val>
+            <Val><![CDATA[Znalezione błędy: {0}. Obserwowanie zmian plików.]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Found_1_error_6193" ItemType="0" PsrId="306" Leaf="true">
+      <Item ItemId=";Found_1_error_Watching_for_file_changes_6193" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Found 1 error.]]></Val>
+          <Val><![CDATA[Found 1 error. Watching for file changes.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Znaleziono 1 błąd.]]></Val>
+            <Val><![CDATA[Znaleziono 1 błąd. Obserwowanie zmian plików.]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -3887,6 +3875,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Generate_get_and_set_accessors_95046" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Generate 'get' and 'set' accessors]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Generuj metody dostępu „get” i „set”.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Generates a sourcemap for each corresponding '.d.ts' file.]]></Val>
@@ -5996,6 +5993,9 @@
       <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await_2570" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you forget to use 'await'?]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Właściwość „{0}” nie istnieje w typie „{1}”. Czy zapomniano użyć elementu „await”?]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
@@ -6491,6 +6491,12 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Resolve_keyof_to_string_valued_property_names_only_no_numbers_or_symbols_6195" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Resolve 'keyof' to string valued property names only (no numbers or symbols).]]></Val>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Resolving_from_node_modules_folder_6118" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Resolving from node_modules folder...]]></Val>
diff --git a/src/loc/lcl/ptb/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/ptb/diagnosticMessages/diagnosticMessages.generated.json.lcl
index 283b7220eda..ce8b767afab 100644
--- a/src/loc/lcl/ptb/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/ptb/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -893,6 +893,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Add_0_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Add '{0}.' to unresolved variable]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Adicionar '{0}.' à variável não resolvida]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Add_all_missing_async_modifiers_95041" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add all missing 'async' modifiers]]></Val>
@@ -989,27 +998,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
+      <Item ItemId=";Add_qualifier_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to all unresolved variables matching a member name]]></Val>
+          <Val><![CDATA[Add qualifier to all unresolved variables matching a member name]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Adicionar 'this.' a todas as variáveis não resolvidas correspondentes a um nome de membro]]></Val>
+            <Val><![CDATA[Adicionar um qualificador a todas as variáveis não resolvidas correspondentes a um nome de membro]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to unresolved variable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Adicionar 'this.' a uma variável não resolvida]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Add 'this.' to unresolved variable.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Add_to_all_uncalled_decorators_95044" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add '()' to all uncalled decorators]]></Val>
@@ -2378,15 +2375,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Compilation_complete_Watching_for_file_changes_6042" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Compilation complete. Watching for file changes.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Compilação concluída. Monitorando alterações de arquivo.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Compile_the_project_given_the_path_to_its_configuration_file_or_to_a_folder_with_a_tsconfig_json_6020" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Compile the project given the path to its configuration file, or to a folder with a 'tsconfig.json'.]]></Val>
@@ -3761,6 +3749,24 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Found_0_errors_Watching_for_file_changes_6194" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Found {0} errors. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[{0} erros encontrados. Monitorando alterações de arquivo.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";Found_1_error_Watching_for_file_changes_6193" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Found 1 error. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Um erro encontrado. Monitorando alterações de arquivo.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Found_package_json_at_0_6099" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Found 'package.json' at '{0}'.]]></Val>
@@ -3869,6 +3875,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Generate_get_and_set_accessors_95046" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Generate 'get' and 'set' accessors]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Gerar acessadores 'get' e 'set']]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Generates a sourcemap for each corresponding '.d.ts' file.]]></Val>
@@ -5975,6 +5990,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await_2570" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you forget to use 'await'?]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[A propriedade '{0}' não existe no tipo '{1}'. Você esqueceu de usar 'await'?]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_mean_2_2551" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you mean '{2}'?]]></Val>
@@ -6467,6 +6491,12 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Resolve_keyof_to_string_valued_property_names_only_no_numbers_or_symbols_6195" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Resolve 'keyof' to string valued property names only (no numbers or symbols).]]></Val>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Resolving_from_node_modules_folder_6118" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Resolving from node_modules folder...]]></Val>
diff --git a/src/loc/lcl/rus/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/rus/diagnosticMessages/diagnosticMessages.generated.json.lcl
index 20c3ffba771..3be5ddb0dbb 100644
--- a/src/loc/lcl/rus/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/rus/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -902,6 +902,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Add_0_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Add '{0}.' to unresolved variable]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Добавить "{0}." к неразрешенной переменной]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Add_all_missing_async_modifiers_95041" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add all missing 'async' modifiers]]></Val>
@@ -998,27 +1007,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
+      <Item ItemId=";Add_qualifier_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to all unresolved variables matching a member name]]></Val>
+          <Val><![CDATA[Add qualifier to all unresolved variables matching a member name]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Добавить "this." ко всем неразрешенным переменным, соответствующим имени элемента]]></Val>
+            <Val><![CDATA[Добавить квалификатор ко всем неразрешенным переменным, соответствующим имени члена]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to unresolved variable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Добавьте "this." к неразрешенной переменной]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Add 'this.' to unresolved variable.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Add_to_all_uncalled_decorators_95044" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add '()' to all uncalled decorators]]></Val>
@@ -2387,15 +2384,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Compilation_complete_Watching_for_file_changes_6042" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Compilation complete. Watching for file changes.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Компиляция завершена. Отслеживание изменений в файлах.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Compile_the_project_given_the_path_to_its_configuration_file_or_to_a_folder_with_a_tsconfig_json_6020" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Compile the project given the path to its configuration file, or to a folder with a 'tsconfig.json'.]]></Val>
@@ -3770,6 +3758,24 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Found_0_errors_Watching_for_file_changes_6194" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Found {0} errors. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Найдено ошибок: {0}. Отслеживаются изменения в файлах.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";Found_1_error_Watching_for_file_changes_6193" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Found 1 error. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Найдена одна ошибка. Отслеживаются изменения в файлах.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Found_package_json_at_0_6099" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Found 'package.json' at '{0}'.]]></Val>
@@ -3878,6 +3884,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Generate_get_and_set_accessors_95046" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Generate 'get' and 'set' accessors]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Создать методы доступа get и set]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Generates a sourcemap for each corresponding '.d.ts' file.]]></Val>
@@ -5987,6 +6002,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await_2570" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you forget to use 'await'?]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Свойство "{0}" не существует в типе "{1}". Возможно, пропущено "await"?]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_mean_2_2551" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you mean '{2}'?]]></Val>
@@ -6479,6 +6503,12 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Resolve_keyof_to_string_valued_property_names_only_no_numbers_or_symbols_6195" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Resolve 'keyof' to string valued property names only (no numbers or symbols).]]></Val>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Resolving_from_node_modules_folder_6118" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Resolving from node_modules folder...]]></Val>
diff --git a/src/loc/lcl/trk/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/trk/diagnosticMessages/diagnosticMessages.generated.json.lcl
index 0d8cbe6065e..b03397f22a9 100644
--- a/src/loc/lcl/trk/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/trk/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -896,6 +896,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Add_0_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Add '{0}.' to unresolved variable]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Çözümlenmemiş değişkene '{0}.' ekle]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Add_all_missing_async_modifiers_95041" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add all missing 'async' modifiers]]></Val>
@@ -992,27 +1001,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
+      <Item ItemId=";Add_qualifier_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to all unresolved variables matching a member name]]></Val>
+          <Val><![CDATA[Add qualifier to all unresolved variables matching a member name]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Bir üye adıyla eşleşen tüm çözülmemiş değişkenlere 'this.' ekle]]></Val>
+            <Val><![CDATA[Bir üye adıyla eşleşen tüm çözülmemiş değişkenlere niteleyici ekle]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Add_this_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Add 'this.' to unresolved variable]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Çözümlenmemiş değişkene 'this.' ekle]]></Val>
-          </Tgt>
-          <Prev Cat="Text">
-            <Val><![CDATA[Add 'this.' to unresolved variable.]]></Val>
-          </Prev>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Add_to_all_uncalled_decorators_95044" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Add '()' to all uncalled decorators]]></Val>
@@ -2381,15 +2378,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";Compilation_complete_Watching_for_file_changes_6042" ItemType="0" PsrId="306" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Compilation complete. Watching for file changes.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Derleme tamamlandı. Dosya değişiklikleri izleniyor.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";Compile_the_project_given_the_path_to_its_configuration_file_or_to_a_folder_with_a_tsconfig_json_6020" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Compile the project given the path to its configuration file, or to a folder with a 'tsconfig.json'.]]></Val>
@@ -3764,6 +3752,24 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Found_0_errors_Watching_for_file_changes_6194" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Found {0} errors. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[{0} hata bulundu. Dosya değişiklikleri izleniyor.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";Found_1_error_Watching_for_file_changes_6193" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Found 1 error. Watching for file changes.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[1 hata bulundu. Dosya değişiklikleri izleniyor.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Found_package_json_at_0_6099" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Found 'package.json' at '{0}'.]]></Val>
@@ -3872,6 +3878,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Generate_get_and_set_accessors_95046" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Generate 'get' and 'set' accessors]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA['get' ve 'set' erişimcilerini oluşturun]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Generates a sourcemap for each corresponding '.d.ts' file.]]></Val>
@@ -5981,6 +5996,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await_2570" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you forget to use 'await'?]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA['{0}' özelliği '{1}' türü üzerinde yok. 'await' kullanmayı mı unuttunuz?]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_mean_2_2551" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you mean '{2}'?]]></Val>
@@ -6473,6 +6497,12 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";Resolve_keyof_to_string_valued_property_names_only_no_numbers_or_symbols_6195" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Resolve 'keyof' to string valued property names only (no numbers or symbols).]]></Val>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";Resolving_from_node_modules_folder_6118" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Resolving from node_modules folder...]]></Val>
@@ -8723,6 +8753,12 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";_0_is_declared_but_never_used_6196" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA['{0}' is declared but never used.]]></Val>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";_0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2_17012" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA['{0}' is not a valid meta-property for keyword '{1}'. Did you mean '{2}'?]]></Val>
diff --git a/src/server/client.ts b/src/server/client.ts
index 87bb2e93414..d7a83ee5320 100644
--- a/src/server/client.ts
+++ b/src/server/client.ts
@@ -1,5 +1,3 @@
-/// <reference path="session.ts" />
-
 namespace ts.server {
     export interface SessionClientHost extends LanguageServiceHost {
         writeMessage(message: string): void;
@@ -558,7 +556,8 @@ namespace ts.server {
             const request = this.processRequest<protocol.CodeFixRequest>(CommandNames.GetCodeFixes, args);
             const response = this.processResponse<protocol.CodeFixResponse>(request);
 
-            return response.body.map(({ description, changes, fixId, fixAllDescription }) => ({ description, changes: this.convertChanges(changes, file), fixId, fixAllDescription }));
+            return response.body.map<CodeFixAction>(({ fixName, description, changes, commands, fixId, fixAllDescription }) =>
+                ({ fixName, description, changes: this.convertChanges(changes, file), commands: commands as CodeActionCommand[], fixId, fixAllDescription }));
         }
 
         getCombinedCodeFix = notImplemented;
@@ -633,6 +632,10 @@ namespace ts.server {
             return notImplemented();
         }
 
+        getEditsForFileRename() {
+            return notImplemented();
+        }
+
         private convertCodeEditsToTextChanges(edits: protocol.FileCodeEdits[]): FileTextChanges[] {
             return edits.map(edit => {
                 const fileName = edit.fileName;
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index af4d34b8bb2..dfd5539cca3 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -1,11 +1,3 @@
-/// <reference path="..\compiler\commandLineParser.ts" />
-/// <reference path="..\services\services.ts" />
-/// <reference path="utilities.ts" />
-/// <reference path="session.ts" />
-/// <reference path="scriptVersionCache.ts"/>
-/// <reference path="project.ts"/>
-/// <reference path="typingsCache.ts"/>
-
 namespace ts.server {
     export const maxProgramSizeForNonTsFiles = 20 * 1024 * 1024;
 
@@ -318,9 +310,14 @@ namespace ts.server {
         return `Project: ${project ? project.getProjectName() : ""} WatchType: ${watchType}`;
     }
 
+    function updateProjectIfDirty(project: Project) {
+        return project.dirty && project.updateGraph();
+    }
+
     export class ProjectService {
 
-        public readonly typingsCache: TypingsCache;
+        /*@internal*/
+        readonly typingsCache: TypingsCache;
 
         private readonly documentRegistry: DocumentRegistry;
 
@@ -531,13 +528,13 @@ namespace ts.server {
             }
             switch (response.kind) {
                 case ActionSet:
-                    project.resolutionCache.clear();
-                    this.typingsCache.updateTypingsForProject(response.projectName, response.compilerOptions, response.typeAcquisition, response.unresolvedImports, response.typings);
+                    // Update the typing files and update the project
+                    project.updateTypingFiles(this.typingsCache.updateTypingsForProject(response.projectName, response.compilerOptions, response.typeAcquisition, response.unresolvedImports, response.typings));
                     break;
                 case ActionInvalidate:
-                    project.resolutionCache.clear();
-                    this.typingsCache.deleteTypingsForProject(response.projectName);
-                    break;
+                    // Do not clear resolution cache, there was changes detected in typings, so enque typing request and let it get us correct results
+                    this.typingsCache.enqueueInstallTypingsForProject(project, project.lastCachedUnresolvedImportsList, /*forceRefresh*/ true);
+                    return;
             }
             this.delayUpdateProjectGraphAndEnsureProjectStructureForOpenFiles(project);
         }
@@ -680,7 +677,7 @@ namespace ts.server {
             let hasChanges = this.pendingEnsureProjectForOpenFiles;
             this.pendingProjectUpdates.clear();
             const updateGraph = (project: Project) => {
-                hasChanges = this.updateProjectIfDirty(project) || hasChanges;
+                hasChanges = updateProjectIfDirty(project) || hasChanges;
             };
 
             this.externalProjects.forEach(updateGraph);
@@ -691,10 +688,6 @@ namespace ts.server {
             }
         }
 
-        private updateProjectIfDirty(project: Project) {
-            return project.dirty && project.updateGraph();
-        }
-
         getFormatCodeOptions(file: NormalizedPath) {
             const info = this.getScriptInfoForNormalizedPath(file);
             return info && info.getFormatCodeSettings() || this.hostConfiguration.formatCodeOptions;
@@ -1842,11 +1835,11 @@ namespace ts.server {
                     this.logger.info(`Host information ${args.hostInfo}`);
                 }
                 if (args.formatOptions) {
-                    mergeMapLikes(this.hostConfiguration.formatCodeOptions, convertFormatOptions(args.formatOptions));
+                    this.hostConfiguration.formatCodeOptions = { ...this.hostConfiguration.formatCodeOptions, ...convertFormatOptions(args.formatOptions) };
                     this.logger.info("Format host information updated");
                 }
                 if (args.preferences) {
-                    mergeMapLikes(this.hostConfiguration.preferences, args.preferences);
+                    this.hostConfiguration.preferences = { ...this.hostConfiguration.preferences, ...args.preferences };
                 }
                 if (args.extraFileExtensions) {
                     this.hostConfiguration.extraFileExtensions = args.extraFileExtensions;
@@ -1987,7 +1980,7 @@ namespace ts.server {
                 }
             });
             this.pendingEnsureProjectForOpenFiles = false;
-            this.inferredProjects.forEach(p => this.updateProjectIfDirty(p));
+            this.inferredProjects.forEach(updateProjectIfDirty);
 
             this.logger.info("Structure after ensureProjectForOpenFiles:");
             this.printProjects();
@@ -2034,7 +2027,7 @@ namespace ts.server {
                     }
                     else {
                         // Ensure project is ready to check if it contains opened script info
-                        project.updateGraph();
+                        updateProjectIfDirty(project);
                     }
                 }
             }
@@ -2043,6 +2036,11 @@ namespace ts.server {
             // - external project search, which updates the project before checking if info is present in it
             // - configured project - either created or updated to ensure we know correct status of info
 
+            // At this point we need to ensure that containing projects of the info are uptodate
+            // This will ensure that later question of info.isOrphan() will return correct answer
+            // and we correctly create inferred project for the info
+            info.containingProjects.forEach(updateProjectIfDirty);
+
             // At this point if file is part of any any configured or external project, then it would be present in the containing projects
             // So if it still doesnt have any containing projects, it needs to be part of inferred project
             if (info.isOrphan()) {
diff --git a/src/server/project.ts b/src/server/project.ts
index 442c7e3f5ad..92645cfca52 100644
--- a/src/server/project.ts
+++ b/src/server/project.ts
@@ -1,10 +1,3 @@
-/// <reference path="..\services\services.ts" />
-/// <reference path="utilities.ts"/>
-/// <reference path="scriptInfo.ts"/>
-/// <reference path="..\compiler\resolutionCache.ts"/>
-/// <reference path="typingsCache.ts"/>
-/// <reference path="..\compiler\builderState.ts"/>
-
 namespace ts.server {
 
     export enum ProjectKind {
@@ -62,34 +55,6 @@ namespace ts.server {
         projectErrors: ReadonlyArray<Diagnostic>;
     }
 
-    export class UnresolvedImportsMap {
-        readonly perFileMap = createMap<ReadonlyArray<string>>();
-        private version = 0;
-
-        public clear() {
-            this.perFileMap.clear();
-            this.version = 0;
-        }
-
-        public getVersion() {
-            return this.version;
-        }
-
-        public remove(path: Path) {
-            this.perFileMap.delete(path);
-            this.version++;
-        }
-
-        public get(path: Path) {
-            return this.perFileMap.get(path);
-        }
-
-        public set(path: Path, value: ReadonlyArray<string>) {
-            this.perFileMap.set(path, value);
-            this.version++;
-        }
-    }
-
     export interface PluginCreateInfo {
         project: Project;
         languageService: LanguageService;
@@ -123,8 +88,18 @@ namespace ts.server {
         private missingFilesMap: Map<FileWatcher>;
         private plugins: PluginModule[] = [];
 
-        private cachedUnresolvedImportsPerFile = new UnresolvedImportsMap();
-        private lastCachedUnresolvedImportsList: SortedReadonlyArray<string>;
+        /*@internal*/
+        /**
+         * This is map from files to unresolved imports in it
+         * Maop does not contain entries for files that do not have unresolved imports
+         * This helps in containing the set of files to invalidate
+         */
+        cachedUnresolvedImportsPerFile = createMap<ReadonlyArray<string>>();
+
+        /*@internal*/
+        lastCachedUnresolvedImportsList: SortedReadonlyArray<string>;
+        /*@internal*/
+        private hasAddedorRemovedFiles = false;
 
         private lastFileExceededProgramSize: string | undefined;
 
@@ -156,10 +131,10 @@ namespace ts.server {
          */
         private lastReportedVersion = 0;
         /**
-         * Current project structure version.
+         * Current project's program version. (incremented everytime new program is created that is not complete reuse from the old one)
          * This property is changed in 'updateGraph' based on the set of files in program
          */
-        private projectStructureVersion = 0;
+        private projectProgramVersion = 0;
         /**
          * Current version of the project state. It is changed when:
          * - new root file was added/removed
@@ -174,7 +149,8 @@ namespace ts.server {
         /*@internal*/
         hasChangedAutomaticTypeDirectiveNames = false;
 
-        private typingFiles: SortedReadonlyArray<string>;
+        /*@internal*/
+        typingFiles: SortedReadonlyArray<string> = emptyArray;
 
         private readonly cancellationToken: ThrottledCancellationToken;
 
@@ -188,10 +164,6 @@ namespace ts.server {
             return hasOneOrMoreJsAndNoTsFiles(this);
         }
 
-        public getCachedUnresolvedImportsPerFile_TestOnly() {
-            return this.cachedUnresolvedImportsPerFile;
-        }
-
         public static resolveModule(moduleName: string, initialDir: string, host: ServerHost, log: (message: string) => void): {} {
             const resolvedPath = normalizeSlashes(host.resolvePath(combinePaths(initialDir, "node_modules")));
             log(`Loading ${moduleName} from ${initialDir} (resolved to ${resolvedPath})`);
@@ -749,7 +721,7 @@ namespace ts.server {
             else {
                 this.resolutionCache.invalidateResolutionOfFile(info.path);
             }
-            this.cachedUnresolvedImportsPerFile.remove(info.path);
+            this.cachedUnresolvedImportsPerFile.delete(info.path);
 
             if (detachFromProject) {
                 info.detachFromProject(this);
@@ -770,16 +742,13 @@ namespace ts.server {
         }
 
         /* @internal */
-        private extractUnresolvedImportsFromSourceFile(file: SourceFile, result: Push<string>, ambientModules: string[]) {
+        private extractUnresolvedImportsFromSourceFile(file: SourceFile, ambientModules: string[]): ReadonlyArray<string> {
             const cached = this.cachedUnresolvedImportsPerFile.get(file.path);
             if (cached) {
-                // found cached result - use it and return
-                for (const f of cached) {
-                    result.push(f);
-                }
-                return;
+                // found cached result, return
+                return cached;
             }
-            let unresolvedImports: string[];
+            let unresolvedImports: string[] | undefined;
             if (file.resolvedModules) {
                 file.resolvedModules.forEach((resolvedModule, name) => {
                     // pick unresolved non-relative names
@@ -795,17 +764,23 @@ namespace ts.server {
                             trimmed = trimmed.substr(0, i);
                         }
                         (unresolvedImports || (unresolvedImports = [])).push(trimmed);
-                        result.push(trimmed);
                     }
                 });
             }
+
             this.cachedUnresolvedImportsPerFile.set(file.path, unresolvedImports || emptyArray);
+            return unresolvedImports || emptyArray;
 
             function isAmbientlyDeclaredModule(name: string) {
                 return ambientModules.some(m => m === name);
             }
         }
 
+        /* @internal */
+        onFileAddedOrRemoved() {
+            this.hasAddedorRemovedFiles = true;
+        }
+
         /**
          * Updates set of files that contribute to this project
          * @returns: true if set of files in the project stays the same and false - otherwise.
@@ -813,13 +788,15 @@ namespace ts.server {
         updateGraph(): boolean {
             this.resolutionCache.startRecordingFilesWithChangedResolutions();
 
-            let hasChanges = this.updateGraphWorker();
+            const hasNewProgram = this.updateGraphWorker();
+            const hasAddedorRemovedFiles = this.hasAddedorRemovedFiles;
+            this.hasAddedorRemovedFiles = false;
 
             const changedFiles: ReadonlyArray<Path> = this.resolutionCache.finishRecordingFilesWithChangedResolutions() || emptyArray;
 
             for (const file of changedFiles) {
                 // delete cached information for changed files
-                this.cachedUnresolvedImportsPerFile.remove(file);
+                this.cachedUnresolvedImportsPerFile.delete(file);
             }
 
             // update builder only if language service is enabled
@@ -831,30 +808,35 @@ namespace ts.server {
                 // 3. new files were added/removed, but compilation settings stays the same - collect unresolved imports for all new/modified files
                 // (can reuse cached imports for files that were not changed)
                 // 4. compilation settings were changed in the way that might affect module resolution - drop all caches and collect all data from the scratch
-                if (hasChanges || changedFiles.length) {
-                    const result: string[] = [];
+                if (hasNewProgram || changedFiles.length) {
+                    let result: string[] | undefined;
                     const ambientModules = this.program.getTypeChecker().getAmbientModules().map(mod => stripQuotes(mod.getName()));
                     for (const sourceFile of this.program.getSourceFiles()) {
-                        this.extractUnresolvedImportsFromSourceFile(sourceFile, result, ambientModules);
+                        const unResolved = this.extractUnresolvedImportsFromSourceFile(sourceFile, ambientModules);
+                        if (unResolved !== emptyArray) {
+                            (result || (result = [])).push(...unResolved);
+                        }
                     }
-                    this.lastCachedUnresolvedImportsList = toDeduplicatedSortedArray(result);
+                    this.lastCachedUnresolvedImportsList = result ? toDeduplicatedSortedArray(result) : emptyArray;
                 }
 
-                const cachedTypings = this.projectService.typingsCache.getTypingsForProject(this, this.lastCachedUnresolvedImportsList, hasChanges);
-                if (!arrayIsEqualTo(this.typingFiles, cachedTypings)) {
-                    this.typingFiles = cachedTypings;
-                    this.markAsDirty();
-                    hasChanges = this.updateGraphWorker() || hasChanges;
-                }
+                this.projectService.typingsCache.enqueueInstallTypingsForProject(this, this.lastCachedUnresolvedImportsList, hasAddedorRemovedFiles);
             }
             else {
                 this.lastCachedUnresolvedImportsList = undefined;
             }
 
-            if (hasChanges) {
-                this.projectStructureVersion++;
+            if (hasNewProgram) {
+                this.projectProgramVersion++;
             }
-            return !hasChanges;
+            return !hasNewProgram;
+        }
+
+        /*@internal*/
+        updateTypingFiles(typingFiles: SortedReadonlyArray<string>) {
+            this.typingFiles = typingFiles;
+            // Invalidate files with unresolved imports
+            this.resolutionCache.setFilesWithInvalidatedNonRelativeUnresolvedImports(this.cachedUnresolvedImportsPerFile);
         }
 
         /* @internal */
@@ -883,9 +865,9 @@ namespace ts.server {
             // bump up the version if
             // - oldProgram is not set - this is a first time updateGraph is called
             // - newProgram is different from the old program and structure of the old program was not reused.
-            const hasChanges = this.program && (!oldProgram || (this.program !== oldProgram && !(oldProgram.structureIsReused & StructureIsReused.Completely)));
+            const hasNewProgram = this.program && (!oldProgram || (this.program !== oldProgram && !(oldProgram.structureIsReused & StructureIsReused.Completely)));
             this.hasChangedAutomaticTypeDirectiveNames = false;
-            if (hasChanges) {
+            if (hasNewProgram) {
                 if (oldProgram) {
                     for (const f of oldProgram.getSourceFiles()) {
                         if (this.program.getSourceFileByPath(f.path)) {
@@ -923,8 +905,8 @@ namespace ts.server {
                 removed => this.detachScriptInfoFromProject(removed)
             );
             const elapsed = timestamp() - start;
-            this.writeLog(`Finishing updateGraphWorker: Project: ${this.getProjectName()} Version: ${this.getProjectVersion()} structureChanged: ${hasChanges} Elapsed: ${elapsed}ms`);
-            return hasChanges;
+            this.writeLog(`Finishing updateGraphWorker: Project: ${this.getProjectName()} Version: ${this.getProjectVersion()} structureChanged: ${hasNewProgram} Elapsed: ${elapsed}ms`);
+            return hasNewProgram;
         }
 
         private detachScriptInfoFromProject(uncheckedFileName: string) {
@@ -992,15 +974,13 @@ namespace ts.server {
         setCompilerOptions(compilerOptions: CompilerOptions) {
             if (compilerOptions) {
                 compilerOptions.allowNonTsExtensions = true;
-                if (changesAffectModuleResolution(this.compilerOptions, compilerOptions)) {
-                    // reset cached unresolved imports if changes in compiler options affected module resolution
-                    this.cachedUnresolvedImportsPerFile.clear();
-                    this.lastCachedUnresolvedImportsList = undefined;
-                }
                 const oldOptions = this.compilerOptions;
                 this.compilerOptions = compilerOptions;
                 this.setInternalCompilerOptionsForEmittingJsFiles();
                 if (changesAffectModuleResolution(oldOptions, compilerOptions)) {
+                    // reset cached unresolved imports if changes in compiler options affected module resolution
+                    this.cachedUnresolvedImportsPerFile.clear();
+                    this.lastCachedUnresolvedImportsList = undefined;
                     this.resolutionCache.clear();
                 }
                 this.markAsDirty();
@@ -1013,7 +993,7 @@ namespace ts.server {
 
             const info: protocol.ProjectVersionInfo = {
                 projectName: this.getProjectName(),
-                version: this.projectStructureVersion,
+                version: this.projectProgramVersion,
                 isInferred: this.projectKind === ProjectKind.Inferred,
                 options: this.getCompilationSettings(),
                 languageServiceDisabled: !this.languageServiceEnabled,
@@ -1024,7 +1004,7 @@ namespace ts.server {
             // check if requested version is the same that we have reported last time
             if (this.lastReportedFileNames && lastKnownVersion === this.lastReportedVersion) {
                 // if current structure version is the same - return info without any changes
-                if (this.projectStructureVersion === this.lastReportedVersion && !updatedFileNames) {
+                if (this.projectProgramVersion === this.lastReportedVersion && !updatedFileNames) {
                     return { info, projectErrors: this.getGlobalProjectErrors() };
                 }
                 // compute and return the difference
@@ -1047,7 +1027,7 @@ namespace ts.server {
                     }
                 });
                 this.lastReportedFileNames = currentFiles;
-                this.lastReportedVersion = this.projectStructureVersion;
+                this.lastReportedVersion = this.projectProgramVersion;
                 return { info, changes: { added, removed, updated }, projectErrors: this.getGlobalProjectErrors() };
             }
             else {
@@ -1056,7 +1036,7 @@ namespace ts.server {
                 const externalFiles = this.getExternalFiles().map(f => toNormalizedPath(f));
                 const allFiles = projectFileNames.concat(externalFiles);
                 this.lastReportedFileNames = arrayToSet(allFiles);
-                this.lastReportedVersion = this.projectStructureVersion;
+                this.lastReportedVersion = this.projectProgramVersion;
                 return { info, files: allFiles, projectErrors: this.getGlobalProjectErrors() };
             }
         }
diff --git a/src/server/protocol.ts b/src/server/protocol.ts
index 74b6865a3c3..5ab62a1c33f 100644
--- a/src/server/protocol.ts
+++ b/src/server/protocol.ts
@@ -121,6 +121,9 @@ namespace ts.server.protocol {
         OrganizeImports = "organizeImports",
         /* @internal */
         OrganizeImportsFull = "organizeImports-full",
+        GetEditsForFileRename = "getEditsForFileRename",
+        /* @internal */
+        GetEditsForFileRenameFull = "getEditsForFileRename-full",
 
         // NOTE: If updating this, be sure to also update `allCommandNames` in `harness/unittests/session.ts`.
     }
@@ -610,6 +613,22 @@ namespace ts.server.protocol {
         edits: ReadonlyArray<FileCodeEdits>;
     }
 
+    export interface GetEditsForFileRenameRequest extends Request {
+        command: CommandTypes.GetEditsForFileRename;
+        arguments: GetEditsForFileRenameRequestArgs;
+    }
+
+    // Note: The file from FileRequestArgs is just any file in the project.
+    // We will generate code changes for every file in that project, so the choice is arbitrary.
+    export interface GetEditsForFileRenameRequestArgs extends FileRequestArgs {
+        readonly oldFilePath: string;
+        readonly newFilePath: string;
+    }
+
+    export interface GetEditsForFileRenameResponse extends Response {
+        edits: ReadonlyArray<FileCodeEdits>;
+    }
+
     /**
      * Request for the available codefixes at a specific position.
      */
@@ -1698,6 +1717,8 @@ namespace ts.server.protocol {
     }
 
     export interface CodeFixAction extends CodeAction {
+        /** Short name to identify the fix, for use by telemetry. */
+        fixName: string;
         /**
          * If present, one may call 'getCombinedCodeFix' with this fixId.
          * This may be omitted to indicate that the code fix can't be applied in a group.
@@ -1747,6 +1768,7 @@ namespace ts.server.protocol {
          * Optional prefix to apply to possible completions.
          */
         prefix?: string;
+        triggerCharacter?: string;
         /**
          * @deprecated Use UserPreferences.includeCompletionsForModuleExports
          */
@@ -2172,6 +2194,8 @@ namespace ts.server.protocol {
          */
         category: string;
 
+        reportsUnnecessary?: {};
+
         /**
          * The error code of the diagnostic message.
          */
@@ -2638,6 +2662,7 @@ namespace ts.server.protocol {
     }
 
     export interface UserPreferences {
+        readonly disableSuggestions?: boolean;
         readonly quotePreference?: "double" | "single";
         /**
          * If enabled, TypeScript will search through all external modules' exports and add them to the completions list.
diff --git a/src/server/scriptInfo.ts b/src/server/scriptInfo.ts
index 843122e44c0..589975769b1 100644
--- a/src/server/scriptInfo.ts
+++ b/src/server/scriptInfo.ts
@@ -1,5 +1,3 @@
-/// <reference path="scriptVersionCache.ts"/>
-
 namespace ts.server {
 
     /* @internal */
@@ -306,6 +304,7 @@ namespace ts.server {
             const isNew = !this.isAttached(project);
             if (isNew) {
                 this.containingProjects.push(project);
+                project.onFileAddedOrRemoved();
                 if (!project.getCompilerOptions().preserveSymlinks) {
                     this.ensureRealPath();
                 }
@@ -330,19 +329,24 @@ namespace ts.server {
                     return;
                 case 1:
                     if (this.containingProjects[0] === project) {
+                        project.onFileAddedOrRemoved();
                         this.containingProjects.pop();
                     }
                     break;
                 case 2:
                     if (this.containingProjects[0] === project) {
+                        project.onFileAddedOrRemoved();
                         this.containingProjects[0] = this.containingProjects.pop();
                     }
                     else if (this.containingProjects[1] === project) {
+                        project.onFileAddedOrRemoved();
                         this.containingProjects.pop();
                     }
                     break;
                 default:
-                    unorderedRemoveItem(this.containingProjects, project);
+                    if (unorderedRemoveItem(this.containingProjects, project)) {
+                        project.onFileAddedOrRemoved();
+                    }
                     break;
             }
         }
@@ -397,15 +401,18 @@ namespace ts.server {
             if (formatSettings) {
                 if (!this.formatSettings) {
                     this.formatSettings = getDefaultFormatCodeSettings(this.host);
+                    assign(this.formatSettings, formatSettings);
+                }
+                else {
+                    this.formatSettings = { ...this.formatSettings, ...formatSettings };
                 }
-                mergeMapLikes(this.formatSettings, formatSettings);
             }
 
             if (preferences) {
                 if (!this.preferences) {
-                    this.preferences = clone(defaultPreferences);
+                    this.preferences = defaultPreferences;
                 }
-                mergeMapLikes(this.preferences, preferences);
+                this.preferences = { ...this.preferences, ...preferences };
             }
         }
 
diff --git a/src/server/scriptVersionCache.ts b/src/server/scriptVersionCache.ts
index 8a3f43a5434..d57f296e7a7 100644
--- a/src/server/scriptVersionCache.ts
+++ b/src/server/scriptVersionCache.ts
@@ -1,7 +1,3 @@
-/// <reference path="..\compiler\commandLineParser.ts" />
-/// <reference path="..\services\services.ts" />
-/// <reference path="session.ts" />
-
 /*@internal*/
 namespace ts.server {
     const lineCollectionCapacity = 4;
diff --git a/src/server/server.ts b/src/server/server.ts
index 44cb3b7aa1e..6eff3256349 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -1,6 +1,3 @@
-/// <reference path="shared.ts" />
-/// <reference path="session.ts" />
-
 namespace ts.server {
     const childProcess: {
         fork(modulePath: string, args: string[], options?: { execArgv: string[], env?: MapLike<string> }): NodeChildProcess;
diff --git a/src/server/session.ts b/src/server/session.ts
index 3979687d631..19a9ee00772 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -1,8 +1,3 @@
-/// <reference path="..\compiler\commandLineParser.ts" />
-/// <reference path="..\services\services.ts" />
-/// <reference path="protocol.ts" />
-/// <reference path="editorServices.ts" />
-
 namespace ts.server {
     interface StackTraceError extends Error {
         stack?: string;
@@ -80,6 +75,7 @@ namespace ts.server {
             text: flattenDiagnosticMessageText(diag.messageText, "\n"),
             code: diag.code,
             category: diagnosticCategoryName(diag),
+            reportsUnnecessary: diag.reportsUnnecessary,
             source: diag.source
         };
     }
@@ -96,8 +92,8 @@ namespace ts.server {
         const text = flattenDiagnosticMessageText(diag.messageText, "\n");
         const { code, source } = diag;
         const category = diagnosticCategoryName(diag);
-        return includeFileName ? { start, end, text, code, category, source, fileName: diag.file && diag.file.fileName } :
-            { start, end, text, code, category, source };
+        return includeFileName ? { start, end, text, code, category, source, reportsUnnecessary: diag.reportsUnnecessary, fileName: diag.file && diag.file.fileName } :
+            { start, end, text, code, category, reportsUnnecessary: diag.reportsUnnecessary, source };
     }
 
     export interface PendingErrorCheck {
@@ -527,12 +523,20 @@ namespace ts.server {
                         return;
                     }
 
-                    next.immediate(() => {
-                        this.suggestionCheck(fileName, project);
+                    const goNext = () => {
                         if (checkList.length > index) {
                             next.delay(followMs, checkOne);
                         }
-                    });
+                    };
+                    if (this.getPreferences(fileName).disableSuggestions) {
+                        goNext();
+                    }
+                    else {
+                        next.immediate(() => {
+                            this.suggestionCheck(fileName, project);
+                            goNext();
+                        });
+                    }
                 });
             };
 
@@ -630,7 +634,8 @@ namespace ts.server {
                 code: d.code,
                 source: d.source,
                 startLocation: scriptInfo && scriptInfo.positionToLineOffset(d.start),
-                endLocation: scriptInfo && scriptInfo.positionToLineOffset(d.start + d.length)
+                endLocation: scriptInfo && scriptInfo.positionToLineOffset(d.start + d.length),
+                reportsUnnecessary: d.reportsUnnecessary
             });
         }
 
@@ -1282,6 +1287,7 @@ namespace ts.server {
 
             const completions = project.getLanguageService().getCompletionsAtPosition(file, position, {
                 ...this.getPreferences(file),
+                triggerCharacter: args.triggerCharacter,
                 includeExternalModuleExports: args.includeExternalModuleExports,
                 includeInsertTextCompletions: args.includeInsertTextCompletions
             });
@@ -1659,7 +1665,13 @@ namespace ts.server {
             }
         }
 
-        private getCodeFixes(args: protocol.CodeFixRequestArgs, simplifiedResult: boolean): ReadonlyArray<protocol.CodeAction> | ReadonlyArray<CodeAction> {
+        private getEditsForFileRename(args: protocol.GetEditsForFileRenameRequestArgs, simplifiedResult: boolean): ReadonlyArray<protocol.FileCodeEdits> | ReadonlyArray<FileTextChanges> {
+            const { file, project } = this.getFileAndProject(args);
+            const changes = project.getLanguageService().getEditsForFileRename(args.oldFilePath, args.newFilePath, this.getFormatOptions(file));
+            return simplifiedResult ? this.mapTextChangesToCodeEdits(project, changes) : changes;
+        }
+
+        private getCodeFixes(args: protocol.CodeFixRequestArgs, simplifiedResult: boolean): ReadonlyArray<protocol.CodeFixAction> | ReadonlyArray<CodeFixAction> {
             if (args.errorCodes.length === 0) {
                 return undefined;
             }
@@ -1669,15 +1681,7 @@ namespace ts.server {
             const { startPosition, endPosition } = this.getStartAndEndPosition(args, scriptInfo);
 
             const codeActions = project.getLanguageService().getCodeFixesAtPosition(file, startPosition, endPosition, args.errorCodes, this.getFormatOptions(file), this.getPreferences(file));
-            if (!codeActions) {
-                return undefined;
-            }
-            if (simplifiedResult) {
-                return codeActions.map(codeAction => this.mapCodeAction(project, codeAction));
-            }
-            else {
-                return codeActions;
-            }
+            return simplifiedResult ? codeActions.map(codeAction => this.mapCodeFixAction(project, codeAction)) : codeActions;
         }
 
         private getCombinedCodeFix({ scope, fixId }: protocol.GetCombinedCodeFixRequestArgs, simplifiedResult: boolean): protocol.CombinedCodeActions | CombinedCodeActions {
@@ -1725,9 +1729,12 @@ namespace ts.server {
             return { startPosition, endPosition };
         }
 
-        private mapCodeAction(project: Project, { description, changes: unmappedChanges, commands, fixId, fixAllDescription }: CodeFixAction): protocol.CodeFixAction {
-            const changes = unmappedChanges.map(change => this.mapTextChangesToCodeEditsUsingScriptinfo(change, project.getScriptInfoForNormalizedPath(toNormalizedPath(change.fileName))));
-            return { description, changes, commands, fixId, fixAllDescription };
+        private mapCodeAction(project: Project, { description, changes, commands }: CodeAction): protocol.CodeAction {
+            return { description, changes: this.mapTextChangesToCodeEdits(project, changes), commands };
+        }
+
+        private mapCodeFixAction(project: Project, { fixName, description, changes, commands, fixId, fixAllDescription }: CodeFixAction): protocol.CodeFixAction {
+            return { fixName, description, changes: this.mapTextChangesToCodeEdits(project, changes), commands, fixId, fixAllDescription };
         }
 
         private mapTextChangesToCodeEdits(project: Project, textChanges: ReadonlyArray<FileTextChanges>): protocol.FileCodeEdits[] {
@@ -2117,7 +2124,13 @@ namespace ts.server {
             },
             [CommandNames.OrganizeImportsFull]: (request: protocol.OrganizeImportsRequest) => {
                 return this.requiredResponse(this.organizeImports(request.arguments, /*simplifiedResult*/ false));
-            }
+            },
+            [CommandNames.GetEditsForFileRename]: (request: protocol.GetEditsForFileRenameRequest) => {
+                return this.requiredResponse(this.getEditsForFileRename(request.arguments, /*simplifiedResult*/ true));
+            },
+            [CommandNames.GetEditsForFileRenameFull]: (request: protocol.GetEditsForFileRenameRequest) => {
+                return this.requiredResponse(this.getEditsForFileRename(request.arguments, /*simplifiedResult*/ false));
+            },
         });
 
         public addProtocolHandler(command: string, handler: (request: protocol.Request) => HandlerResponse) {
diff --git a/src/server/shared.ts b/src/server/shared.ts
index b46a385106e..a5528b7ba63 100644
--- a/src/server/shared.ts
+++ b/src/server/shared.ts
@@ -1,5 +1,3 @@
-/// <reference path="types.ts" />
-
 namespace ts.server {
     // tslint:disable variable-name
     export const ActionSet: ActionSet = "action::set";
diff --git a/src/server/tsconfig.json b/src/server/tsconfig.json
index c838a7209d9..e6768f4edee 100644
--- a/src/server/tsconfig.json
+++ b/src/server/tsconfig.json
@@ -9,17 +9,124 @@
         ]
     },
     "files": [
-        "../services/shims.ts",
+        "../compiler/types.ts",
+        "../compiler/performance.ts",
+        "../compiler/core.ts",
+        "../compiler/sys.ts",
+        "../compiler/diagnosticInformationMap.generated.ts",
+        "../compiler/scanner.ts",
+        "../compiler/utilities.ts",
+        "../compiler/parser.ts",
+        "../compiler/binder.ts",
+        "../compiler/symbolWalker.ts",
+        "../compiler/moduleNameResolver.ts",
+        "../compiler/checker.ts",
+        "../compiler/factory.ts",
+        "../compiler/visitor.ts",
+        "../compiler/transformers/utilities.ts",
+        "../compiler/transformers/destructuring.ts",
+        "../compiler/transformers/ts.ts",
+        "../compiler/transformers/es2017.ts",
+        "../compiler/transformers/esnext.ts",
+        "../compiler/transformers/jsx.ts",
+        "../compiler/transformers/es2016.ts",
+        "../compiler/transformers/es2015.ts",
+        "../compiler/transformers/es5.ts",
+        "../compiler/transformers/generators.ts",
+        "../compiler/transformers/module/module.ts",
+        "../compiler/transformers/module/system.ts",
+        "../compiler/transformers/module/es2015.ts",
+        "../compiler/transformers/declarations/diagnostics.ts",
+        "../compiler/transformers/declarations.ts",
+        "../compiler/transformer.ts",
+        "../compiler/sourcemap.ts",
+        "../compiler/comments.ts",
+        "../compiler/emitter.ts",
+        "../compiler/watchUtilities.ts",
+        "../compiler/program.ts",
+        "../compiler/builderState.ts",
+        "../compiler/builder.ts",
+        "../compiler/resolutionCache.ts",
+        "../compiler/watch.ts",
+        "../compiler/commandLineParser.ts",
+
+        "../services/types.ts",
         "../services/utilities.ts",
+        "../services/classifier.ts",
+        "../services/pathCompletions.ts",
+        "../services/completions.ts",
+        "../services/documentHighlights.ts",
+        "../services/documentRegistry.ts",
+        "../services/importTracker.ts",
+        "../services/findAllReferences.ts",
+        "../services/goToDefinition.ts",
+        "../services/jsDoc.ts",
+        "../services/semver.ts",
+        "../services/jsTyping.ts",
+        "../services/navigateTo.ts",
+        "../services/navigationBar.ts",
+        "../services/organizeImports.ts",
+        "../services/getEditsForFileRename.ts",
+        "../services/outliningElementsCollector.ts",
+        "../services/patternMatcher.ts",
+        "../services/preProcess.ts",
+        "../services/rename.ts",
+        "../services/signatureHelp.ts",
+        "../services/suggestionDiagnostics.ts",
+        "../services/symbolDisplay.ts",
+        "../services/transpile.ts",
+        "../services/formatting/formattingContext.ts",
+        "../services/formatting/formattingScanner.ts",
+        "../services/formatting/rule.ts",
+        "../services/formatting/rules.ts",
+        "../services/formatting/rulesMap.ts",
+        "../services/formatting/formatting.ts",
+        "../services/formatting/smartIndenter.ts",
+        "../services/textChanges.ts",
+        "../services/codeFixProvider.ts",
+        "../services/refactorProvider.ts",
+        "../services/codefixes/addMissingInvocationForDecorator.ts",
+        "../services/codefixes/annotateWithTypeFromJSDoc.ts",
+        "../services/codefixes/convertFunctionToEs6Class.ts",
+        "../services/codefixes/convertToEs6Module.ts",
+        "../services/codefixes/correctQualifiedNameToIndexedAccessType.ts",
+        "../services/codefixes/fixClassIncorrectlyImplementsInterface.ts",
+        "../services/codefixes/importFixes.ts",
+        "../services/codefixes/fixSpelling.ts",
+        "../services/codefixes/fixAddMissingMember.ts",
+        "../services/codefixes/fixCannotFindModule.ts",
+        "../services/codefixes/fixClassDoesntImplementInheritedAbstractMember.ts",
+        "../services/codefixes/fixClassSuperMustPrecedeThisAccess.ts",
+        "../services/codefixes/fixConstructorForDerivedNeedSuperCall.ts",
+        "../services/codefixes/fixExtendsInterfaceBecomesImplements.ts",
+        "../services/codefixes/fixForgottenThisPropertyAccess.ts",
+        "../services/codefixes/fixUnusedIdentifier.ts",
+        "../services/codefixes/fixJSDocTypes.ts",
+        "../services/codefixes/fixAwaitInSyncFunction.ts",
+        "../services/codefixes/disableJsDiagnostics.ts",
+        "../services/codefixes/helpers.ts",
+        "../services/codefixes/inferFromUsage.ts",
+        "../services/codefixes/fixInvalidImportSyntax.ts",
+        "../services/codefixes/fixStrictClassInitialization.ts",
+        "../services/codefixes/useDefaultImport.ts",
+        "../services/refactors/extractSymbol.ts",
+        "../services/refactors/generateGetAccessorAndSetAccessor.ts",
+        "../services/sourcemaps.ts",
+        "../services/services.ts",
+        "../services/breakpoints.ts",
+        "../services/transform.ts",
+        "../services/shims.ts",
+
+        "types.ts",
         "shared.ts",
         "utilities.ts",
-        "scriptVersionCache.ts",
+        "protocol.ts",
         "scriptInfo.ts",
         "typingsCache.ts",
         "project.ts",
         "editorServices.ts",
-        "protocol.ts",
         "session.ts",
+        "scriptVersionCache.ts",
         "server.ts"
     ]
 }
diff --git a/src/server/tsconfig.library.json b/src/server/tsconfig.library.json
index aa3148d58a1..a167d3b39a2 100644
--- a/src/server/tsconfig.library.json
+++ b/src/server/tsconfig.library.json
@@ -15,17 +15,123 @@
         "types": []
     },
     "files": [
-        "editorServices.ts",
-        "project.ts",
+        "../compiler/types.ts",
+        "../compiler/performance.ts",
+        "../compiler/core.ts",
+        "../compiler/sys.ts",
+        "../compiler/diagnosticInformationMap.generated.ts",
+        "../compiler/scanner.ts",
+        "../compiler/utilities.ts",
+        "../compiler/parser.ts",
+        "../compiler/binder.ts",
+        "../compiler/symbolWalker.ts",
+        "../compiler/moduleNameResolver.ts",
+        "../compiler/checker.ts",
+        "../compiler/factory.ts",
+        "../compiler/visitor.ts",
+        "../compiler/transformers/utilities.ts",
+        "../compiler/transformers/destructuring.ts",
+        "../compiler/transformers/ts.ts",
+        "../compiler/transformers/es2017.ts",
+        "../compiler/transformers/esnext.ts",
+        "../compiler/transformers/jsx.ts",
+        "../compiler/transformers/es2016.ts",
+        "../compiler/transformers/es2015.ts",
+        "../compiler/transformers/es5.ts",
+        "../compiler/transformers/generators.ts",
+        "../compiler/transformers/module/module.ts",
+        "../compiler/transformers/module/system.ts",
+        "../compiler/transformers/module/es2015.ts",
+        "../compiler/transformers/declarations/diagnostics.ts",
+        "../compiler/transformers/declarations.ts",
+        "../compiler/transformer.ts",
+        "../compiler/sourcemap.ts",
+        "../compiler/comments.ts",
+        "../compiler/emitter.ts",
+        "../compiler/watchUtilities.ts",
+        "../compiler/program.ts",
+        "../compiler/builderState.ts",
+        "../compiler/builder.ts",
+        "../compiler/resolutionCache.ts",
+        "../compiler/watch.ts",
+        "../compiler/commandLineParser.ts",
+
+        "../services/types.ts",
+        "../services/utilities.ts",
+        "../services/classifier.ts",
+        "../services/pathCompletions.ts",
+        "../services/completions.ts",
+        "../services/documentHighlights.ts",
+        "../services/documentRegistry.ts",
+        "../services/importTracker.ts",
+        "../services/findAllReferences.ts",
+        "../services/goToDefinition.ts",
+        "../services/jsDoc.ts",
+        "../services/semver.ts",
+        "../services/jsTyping.ts",
+        "../services/navigateTo.ts",
+        "../services/navigationBar.ts",
+        "../services/organizeImports.ts",
+        "../services/getEditsForFileRename.ts",
+        "../services/outliningElementsCollector.ts",
+        "../services/patternMatcher.ts",
+        "../services/preProcess.ts",
+        "../services/rename.ts",
+        "../services/signatureHelp.ts",
+        "../services/suggestionDiagnostics.ts",
+        "../services/symbolDisplay.ts",
+        "../services/transpile.ts",
+        "../services/formatting/formattingContext.ts",
+        "../services/formatting/formattingScanner.ts",
+        "../services/formatting/rule.ts",
+        "../services/formatting/rules.ts",
+        "../services/formatting/rulesMap.ts",
+        "../services/formatting/formatting.ts",
+        "../services/formatting/smartIndenter.ts",
+        "../services/textChanges.ts",
+        "../services/codeFixProvider.ts",
+        "../services/refactorProvider.ts",
+        "../services/codefixes/addMissingInvocationForDecorator.ts",
+        "../services/codefixes/annotateWithTypeFromJSDoc.ts",
+        "../services/codefixes/convertFunctionToEs6Class.ts",
+        "../services/codefixes/convertToEs6Module.ts",
+        "../services/codefixes/correctQualifiedNameToIndexedAccessType.ts",
+        "../services/codefixes/fixClassIncorrectlyImplementsInterface.ts",
+        "../services/codefixes/importFixes.ts",
+        "../services/codefixes/fixSpelling.ts",
+        "../services/codefixes/fixAddMissingMember.ts",
+        "../services/codefixes/fixCannotFindModule.ts",
+        "../services/codefixes/fixClassDoesntImplementInheritedAbstractMember.ts",
+        "../services/codefixes/fixClassSuperMustPrecedeThisAccess.ts",
+        "../services/codefixes/fixConstructorForDerivedNeedSuperCall.ts",
+        "../services/codefixes/fixExtendsInterfaceBecomesImplements.ts",
+        "../services/codefixes/fixForgottenThisPropertyAccess.ts",
+        "../services/codefixes/fixUnusedIdentifier.ts",
+        "../services/codefixes/fixJSDocTypes.ts",
+        "../services/codefixes/fixAwaitInSyncFunction.ts",
+        "../services/codefixes/disableJsDiagnostics.ts",
+        "../services/codefixes/helpers.ts",
+        "../services/codefixes/inferFromUsage.ts",
+        "../services/codefixes/fixInvalidImportSyntax.ts",
+        "../services/codefixes/fixStrictClassInitialization.ts",
+        "../services/codefixes/useDefaultImport.ts",
+        "../services/refactors/extractSymbol.ts",
+        "../services/refactors/generateGetAccessorAndSetAccessor.ts",
+        "../services/sourcemaps.ts",
+        "../services/services.ts",
+        "../services/breakpoints.ts",
+        "../services/transform.ts",
+        "../services/shims.ts",
+
+        "types.ts",
+        "shared.ts",
+        "utilities.ts",
         "protocol.ts",
         "scriptInfo.ts",
-        "scriptVersionCache.ts",
-        "session.ts",
-        "shared.ts",
-        "types.ts",
         "typingsCache.ts",
-        "utilities.ts",
-        "../services/shims.ts",
-        "../services/utilities.ts"
+        "project.ts",
+        "editorServices.ts",
+        "session.ts",
+        "scriptVersionCache.ts"
     ]
 }
diff --git a/src/server/types.ts b/src/server/types.ts
index 617a3be419a..184a121522e 100644
--- a/src/server/types.ts
+++ b/src/server/types.ts
@@ -1,7 +1,3 @@
-/// <reference path="../compiler/types.ts"/>
-/// <reference path="../compiler/sys.ts"/>
-/// <reference path="../services/jsTyping.ts"/>
-
 declare namespace ts.server {
     export interface CompressedData {
         length: number;
@@ -123,8 +119,10 @@ declare namespace ts.server {
 
     /* @internal */
     export interface InstallTypingHost extends JsTyping.TypingResolutionHost {
+        useCaseSensitiveFileNames: boolean;
         writeFile(path: string, content: string): void;
         createDirectory(path: string): void;
         watchFile?(path: string, callback: FileWatcherCallback, pollingInterval?: number): FileWatcher;
+        watchDirectory?(path: string, callback: DirectoryWatcherCallback, recursive?: boolean): FileWatcher;
     }
 }
diff --git a/src/server/typingsCache.ts b/src/server/typingsCache.ts
index a1d8f65f6e0..c255757481f 100644
--- a/src/server/typingsCache.ts
+++ b/src/server/typingsCache.ts
@@ -1,5 +1,3 @@
-/// <reference path="project.ts"/>
-
 namespace ts.server {
     export interface InstallPackageOptionsWithProject extends InstallPackageOptions {
         projectName: string;
@@ -26,7 +24,7 @@ namespace ts.server {
         globalTypingsCacheLocation: undefined
     };
 
-    class TypingsCacheEntry {
+    interface TypingsCacheEntry {
         readonly typeAcquisition: TypeAcquisition;
         readonly compilerOptions: CompilerOptions;
         readonly typings: SortedReadonlyArray<string>;
@@ -82,6 +80,7 @@ namespace ts.server {
         return !arrayIsEqualTo(imports1, imports2);
     }
 
+    /*@internal*/
     export class TypingsCache {
         private readonly perProjectCache: Map<TypingsCacheEntry> = createMap<TypingsCacheEntry>();
 
@@ -96,15 +95,14 @@ namespace ts.server {
             return this.installer.installPackage(options);
         }
 
-        getTypingsForProject(project: Project, unresolvedImports: SortedReadonlyArray<string>, forceRefresh: boolean): SortedReadonlyArray<string> {
+        enqueueInstallTypingsForProject(project: Project, unresolvedImports: SortedReadonlyArray<string>, forceRefresh: boolean) {
             const typeAcquisition = project.getTypeAcquisition();
 
             if (!typeAcquisition || !typeAcquisition.enable) {
-                return <any>emptyArray;
+                return;
             }
 
             const entry = this.perProjectCache.get(project.getProjectName());
-            const result: SortedReadonlyArray<string> = entry ? entry.typings : <any>emptyArray;
             if (forceRefresh ||
                 !entry ||
                 typeAcquisitionChanged(typeAcquisition, entry.typeAcquisition) ||
@@ -115,28 +113,25 @@ namespace ts.server {
                 this.perProjectCache.set(project.getProjectName(), {
                     compilerOptions: project.getCompilationSettings(),
                     typeAcquisition,
-                    typings: result,
+                    typings: entry ? entry.typings : emptyArray,
                     unresolvedImports,
                     poisoned: true
                 });
                 // something has been changed, issue a request to update typings
                 this.installer.enqueueInstallTypingsRequest(project, typeAcquisition, unresolvedImports);
             }
-            return result;
         }
 
         updateTypingsForProject(projectName: string, compilerOptions: CompilerOptions, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray<string>, newTypings: string[]) {
+            const typings = toSortedArray(newTypings);
             this.perProjectCache.set(projectName, {
                 compilerOptions,
                 typeAcquisition,
-                typings: toSortedArray(newTypings),
+                typings,
                 unresolvedImports,
                 poisoned: false
             });
-        }
-
-        deleteTypingsForProject(projectName: string) {
-            this.perProjectCache.delete(projectName);
+            return !typeAcquisition || !typeAcquisition.enable ? emptyArray : typings;
         }
 
         onProjectClosed(project: Project) {
diff --git a/src/server/typingsInstaller/nodeTypingsInstaller.ts b/src/server/typingsInstaller/nodeTypingsInstaller.ts
index 37555bf310b..35f926f1c14 100644
--- a/src/server/typingsInstaller/nodeTypingsInstaller.ts
+++ b/src/server/typingsInstaller/nodeTypingsInstaller.ts
@@ -184,9 +184,8 @@ namespace ts.server.typingsInstaller {
             if (this.log.isEnabled()) {
                 this.log.writeLine(`#${requestId} with arguments'${JSON.stringify(packageNames)}'.`);
             }
-            const command = `${this.npmPath} install --ignore-scripts ${packageNames.join(" ")} --save-dev --user-agent="typesInstaller/${version}"`;
             const start = Date.now();
-            const hasError = this.execSyncAndLog(command, { cwd });
+            const hasError = installNpmPackages(this.npmPath, version, packageNames, command => this.execSyncAndLog(command, { cwd }));
             if (this.log.isEnabled()) {
                 this.log.writeLine(`npm install #${requestId} took: ${Date.now() - start} ms`);
             }
diff --git a/src/server/typingsInstaller/typingsInstaller.ts b/src/server/typingsInstaller/typingsInstaller.ts
index f87e6d7e8ab..7d8cf02fab0 100644
--- a/src/server/typingsInstaller/typingsInstaller.ts
+++ b/src/server/typingsInstaller/typingsInstaller.ts
@@ -30,6 +30,31 @@ namespace ts.server.typingsInstaller {
         }
     }
 
+    /*@internal*/
+    export function installNpmPackages(npmPath: string, tsVersion: string, packageNames: string[], install: (command: string) => boolean) {
+        let hasError = false;
+        for (let remaining = packageNames.length; remaining > 0;) {
+            const result = getNpmCommandForInstallation(npmPath, tsVersion, packageNames, remaining);
+            remaining = result.remaining;
+            hasError = install(result.command) || hasError;
+        }
+        return hasError;
+    }
+
+    /*@internal*/
+    export function getNpmCommandForInstallation(npmPath: string, tsVersion: string, packageNames: string[], remaining: number) {
+        const sliceStart = packageNames.length - remaining;
+        let command: string, toSlice = remaining;
+        while (true) {
+            command = `${npmPath} install --ignore-scripts ${(toSlice === packageNames.length ? packageNames : packageNames.slice(sliceStart, sliceStart + toSlice)).join(" ")} --save-dev --user-agent="typesInstaller/${tsVersion}"`;
+            if (command.length < 8000) {
+                break;
+            }
+
+            toSlice = toSlice - Math.floor(toSlice / 2);
+        }
+        return { command, remaining: remaining - toSlice };
+    }
 
     export type RequestCompletedAction = (success: boolean) => void;
     interface PendingRequest {
@@ -39,13 +64,31 @@ namespace ts.server.typingsInstaller {
         onRequestCompleted: RequestCompletedAction;
     }
 
+    function isPackageOrBowerJson(fileName: string) {
+        const base = getBaseFileName(fileName);
+        return base === "package.json" || base === "bower.json";
+    }
+
+    function getDirectoryExcludingNodeModulesOrBowerComponents(f: string) {
+        const indexOfNodeModules = f.indexOf("/node_modules/");
+        const indexOfBowerComponents = f.indexOf("/bower_components/");
+        const subStrLength = indexOfNodeModules === -1 || indexOfBowerComponents === -1 ?
+            Math.max(indexOfNodeModules, indexOfBowerComponents) :
+            Math.min(indexOfNodeModules, indexOfBowerComponents);
+        return subStrLength === -1 ? f : f.substr(0, subStrLength);
+    }
+
+    type ProjectWatchers = Map<FileWatcher> & { isInvoked?: boolean; };
+
     export abstract class TypingsInstaller {
         private readonly packageNameToTypingLocation: Map<JsTyping.CachedTyping> = createMap<JsTyping.CachedTyping>();
         private readonly missingTypingsSet: Map<true> = createMap<true>();
         private readonly knownCachesSet: Map<true> = createMap<true>();
-        private readonly projectWatchers = createMap<Map<FileWatcher>>();
+        private readonly projectWatchers = createMap<ProjectWatchers>();
         private safeList: JsTyping.SafeList | undefined;
         readonly pendingRunRequests: PendingRequest[] = [];
+        private readonly toCanonicalFileName: GetCanonicalFileName;
+        private readonly globalCacheCanonicalPackageJsonPath: string;
 
         private installRunCount = 1;
         private inFlightRequestCount = 0;
@@ -59,6 +102,8 @@ namespace ts.server.typingsInstaller {
             private readonly typesMapLocation: Path,
             private readonly throttleLimit: number,
             protected readonly log = nullLog) {
+            this.toCanonicalFileName = createGetCanonicalFileName(installTypingHost.useCaseSensitiveFileNames);
+            this.globalCacheCanonicalPackageJsonPath = combinePaths(this.toCanonicalFileName(globalCachePath), "package.json");
             if (this.log.isEnabled()) {
                 this.log.writeLine(`Global cache location '${globalCachePath}', safe file path '${safeListPath}', types map path ${typesMapLocation}`);
             }
@@ -120,7 +165,7 @@ namespace ts.server.typingsInstaller {
             }
 
             // start watching files
-            this.watchFiles(req.projectName, discoverTypingsResult.filesToWatch);
+            this.watchFiles(req.projectName, discoverTypingsResult.filesToWatch, req.projectRootPath);
 
             // install typings
             if (discoverTypingsResult.newTypingNames.length) {
@@ -340,7 +385,7 @@ namespace ts.server.typingsInstaller {
             }
         }
 
-        private watchFiles(projectName: string, files: string[]) {
+        private watchFiles(projectName: string, files: string[], projectRootPath: Path) {
             if (!files.length) {
                 // shut down existing watchers
                 this.closeWatchers(projectName);
@@ -348,43 +393,104 @@ namespace ts.server.typingsInstaller {
             }
 
             let watchers = this.projectWatchers.get(projectName);
+            const toRemove = createMap<FileWatcher>();
             if (!watchers) {
                 watchers = createMap();
                 this.projectWatchers.set(projectName, watchers);
             }
+            else {
+                copyEntries(watchers, toRemove);
+            }
 
             // handler should be invoked once for the entire set of files since it will trigger full rediscovery of typings
-            let isInvoked = false;
+            watchers.isInvoked = false;
+
             const isLoggingEnabled = this.log.isEnabled();
-            mutateMap(
-                watchers,
-                arrayToSet(files),
-                {
-                    // Watch the missing files
-                    createNewValue: file => {
-                        if (isLoggingEnabled) {
-                            this.log.writeLine(`FileWatcher:: Added:: WatchInfo: ${file}`);
-                        }
-                        const watcher = this.installTypingHost.watchFile(file, (f, eventKind) => {
-                            if (isLoggingEnabled) {
-                                this.log.writeLine(`FileWatcher:: Triggered with ${f} eventKind: ${FileWatcherEventKind[eventKind]}:: WatchInfo: ${file}:: handler is already invoked '${isInvoked}'`);
-                            }
-                            if (!isInvoked) {
-                                this.sendResponse({ projectName, kind: ActionInvalidate });
-                                isInvoked = true;
-                            }
-                        }, /*pollingInterval*/ 2000);
-                        return isLoggingEnabled ? {
-                            close: () => {
-                                this.log.writeLine(`FileWatcher:: Closed:: WatchInfo: ${file}`);
-                            }
-                        } : watcher;
-                    },
-                    // Files that are no longer missing (e.g. because they are no longer required)
-                    // should no longer be watched.
-                    onDeleteValue: closeFileWatcher
+            const createProjectWatcher = (path: string, createWatch: (path: string) => FileWatcher) => {
+                toRemove.delete(path);
+                if (watchers.has(path)) {
+                    return;
                 }
-            );
+
+                watchers.set(path, createWatch(path));
+            };
+            const createProjectFileWatcher = (file: string): FileWatcher => {
+                if (isLoggingEnabled) {
+                    this.log.writeLine(`FileWatcher:: Added:: WatchInfo: ${file}`);
+                }
+                const watcher = this.installTypingHost.watchFile(file, (f, eventKind) => {
+                    if (isLoggingEnabled) {
+                        this.log.writeLine(`FileWatcher:: Triggered with ${f} eventKind: ${FileWatcherEventKind[eventKind]}:: WatchInfo: ${file}:: handler is already invoked '${watchers.isInvoked}'`);
+                    }
+                    if (!watchers.isInvoked) {
+                        watchers.isInvoked = true;
+                        this.sendResponse({ projectName, kind: ActionInvalidate });
+                    }
+                }, /*pollingInterval*/ 2000);
+
+                return isLoggingEnabled ? {
+                    close: () => {
+                        this.log.writeLine(`FileWatcher:: Closed:: WatchInfo: ${file}`);
+                        watcher.close();
+                    }
+                } : watcher;
+            };
+            const createProjectDirectoryWatcher = (dir: string): FileWatcher => {
+                if (isLoggingEnabled) {
+                    this.log.writeLine(`DirectoryWatcher:: Added:: WatchInfo: ${dir} recursive`);
+                }
+                const watcher = this.installTypingHost.watchDirectory(dir, f => {
+                    if (isLoggingEnabled) {
+                        this.log.writeLine(`DirectoryWatcher:: Triggered with ${f} :: WatchInfo: ${dir} recursive :: handler is already invoked '${watchers.isInvoked}'`);
+                    }
+                    if (watchers.isInvoked) {
+                        return;
+                    }
+                    f = this.toCanonicalFileName(f);
+                    if (f !== this.globalCacheCanonicalPackageJsonPath && isPackageOrBowerJson(f)) {
+                        watchers.isInvoked = true;
+                        this.sendResponse({ projectName, kind: ActionInvalidate });
+                    }
+                }, /*recursive*/ true);
+
+                return isLoggingEnabled ? {
+                    close: () => {
+                        this.log.writeLine(`DirectoryWatcher:: Closed:: WatchInfo: ${dir} recursive`);
+                        watcher.close();
+                    }
+                } : watcher;
+            };
+
+            // Create watches from list of files
+            for (const file of files) {
+                const filePath = this.toCanonicalFileName(file);
+                if (isPackageOrBowerJson(filePath)) {
+                    // package.json or bower.json exists, watch the file to detect changes and update typings
+                    createProjectWatcher(filePath, createProjectFileWatcher);
+                    continue;
+                }
+
+                // path in projectRoot, watch project root
+                if (containsPath(projectRootPath, filePath, projectRootPath, !this.installTypingHost.useCaseSensitiveFileNames)) {
+                    createProjectWatcher(projectRootPath, createProjectDirectoryWatcher);
+                    continue;
+                }
+
+                // path in global cache, watch global cache
+                if (containsPath(this.globalCachePath, filePath, projectRootPath, !this.installTypingHost.useCaseSensitiveFileNames)) {
+                    createProjectWatcher(this.globalCachePath, createProjectDirectoryWatcher);
+                    continue;
+                }
+
+                // Get path without node_modules and bower_components
+                createProjectWatcher(getDirectoryExcludingNodeModulesOrBowerComponents(getDirectoryPath(filePath)), createProjectDirectoryWatcher);
+            }
+
+            // Remove unused watches
+            toRemove.forEach((watch, path) => {
+                watch.close();
+                watchers.delete(path);
+            });
         }
 
         private createSetTypings(request: DiscoverTypings, typings: string[]): SetTypings {
diff --git a/src/server/utilities.ts b/src/server/utilities.ts
index e2329b868e3..363393d401e 100644
--- a/src/server/utilities.ts
+++ b/src/server/utilities.ts
@@ -1,6 +1,3 @@
-/// <reference path="types.ts" />
-/// <reference path="shared.ts" />
-
 namespace ts.server {
     export enum LogLevel {
         terse,
@@ -83,14 +80,6 @@ namespace ts.server {
         };
     }
 
-    export function mergeMapLikes<T extends object>(target: T, source: Partial<T>): void {
-        for (const key in source) {
-            if (hasProperty(source, key)) {
-                target[key] = source[key];
-            }
-        }
-    }
-
     export type NormalizedPath = string & { __normalizedPathTag: any };
 
     export function toNormalizedPath(fileName: string): NormalizedPath {
diff --git a/src/services/breakpoints.ts b/src/services/breakpoints.ts
index c608028b55f..faab2b08db6 100644
--- a/src/services/breakpoints.ts
+++ b/src/services/breakpoints.ts
@@ -1,8 +1,3 @@
-// Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0.
-// See LICENSE.txt in the project root for complete license information.
-
-/// <reference path='services.ts' />
-
 /* @internal */
 namespace ts.BreakpointResolver {
     /**
diff --git a/src/services/codeFixProvider.ts b/src/services/codeFixProvider.ts
index 291f8fd1d66..39f760ba04c 100644
--- a/src/services/codeFixProvider.ts
+++ b/src/services/codeFixProvider.ts
@@ -24,7 +24,7 @@ namespace ts {
     }
 
     export namespace codefix {
-        const codeFixRegistrations: CodeFixRegistration[][] = [];
+        const errorCodeToFixes = createMultiMap<CodeFixRegistration>();
         const fixIdToRegistration = createMap<CodeFixRegistration>();
 
         type DiagnosticAndArguments = DiagnosticMessage | [DiagnosticMessage, string] | [DiagnosticMessage, string, string];
@@ -34,26 +34,21 @@ namespace ts {
                 : getLocaleSpecificMessage(diag);
         }
 
-        export function createCodeFixActionNoFixId(changes: FileTextChanges[], description: DiagnosticAndArguments) {
-            return createCodeFixActionWorker(diagnosticToString(description), changes, /*fixId*/ undefined, /*fixAllDescription*/ undefined);
+        export function createCodeFixActionNoFixId(fixName: string, changes: FileTextChanges[], description: DiagnosticAndArguments) {
+            return createCodeFixActionWorker(fixName, diagnosticToString(description), changes, /*fixId*/ undefined, /*fixAllDescription*/ undefined);
         }
 
-        export function createCodeFixAction(changes: FileTextChanges[], description: DiagnosticAndArguments, fixId: {}, fixAllDescription: DiagnosticAndArguments, command?: CodeActionCommand): CodeFixAction {
-            return createCodeFixActionWorker(diagnosticToString(description), changes, fixId, diagnosticToString(fixAllDescription), command);
+        export function createCodeFixAction(fixName: string, changes: FileTextChanges[], description: DiagnosticAndArguments, fixId: {}, fixAllDescription: DiagnosticAndArguments, command?: CodeActionCommand): CodeFixAction {
+            return createCodeFixActionWorker(fixName, diagnosticToString(description), changes, fixId, diagnosticToString(fixAllDescription), command);
         }
 
-        function createCodeFixActionWorker(description: string, changes: FileTextChanges[], fixId?: {}, fixAllDescription?: string, command?: CodeActionCommand): CodeFixAction {
-            return { description, changes, fixId, fixAllDescription, commands: command ? [command] : undefined };
+        function createCodeFixActionWorker(fixName: string, description: string, changes: FileTextChanges[], fixId?: {}, fixAllDescription?: string, command?: CodeActionCommand): CodeFixAction {
+            return { fixName, description, changes, fixId, fixAllDescription, commands: command ? [command] : undefined };
         }
 
         export function registerCodeFix(reg: CodeFixRegistration) {
             for (const error of reg.errorCodes) {
-                let registrations = codeFixRegistrations[error];
-                if (!registrations) {
-                    registrations = [];
-                    codeFixRegistrations[error] = registrations;
-                }
-                registrations.push(reg);
+                errorCodeToFixes.add(String(error), reg);
             }
             if (reg.fixIds) {
                 for (const fixId of reg.fixIds) {
@@ -63,29 +58,12 @@ namespace ts {
             }
         }
 
-        export function getSupportedErrorCodes() {
-            return Object.keys(codeFixRegistrations);
+        export function getSupportedErrorCodes(): string[] {
+            return arrayFrom(errorCodeToFixes.keys());
         }
 
         export function getFixes(context: CodeFixContext): CodeFixAction[] {
-            const fixes = codeFixRegistrations[context.errorCode];
-            const allActions: CodeFixAction[] = [];
-
-            forEach(fixes, f => {
-                const actions = f.getCodeActions(context);
-                if (actions && actions.length > 0) {
-                    for (const action of actions) {
-                        if (action === undefined) {
-                            context.host.log(`Action for error code ${context.errorCode} added an invalid action entry; please log a bug`);
-                        }
-                        else {
-                            allActions.push(action);
-                        }
-                    }
-                }
-            });
-
-            return allActions;
+            return flatMap(errorCodeToFixes.get(String(context.errorCode)) || emptyArray, f => f.getCodeActions(context));
         }
 
         export function getAllFixes(context: CodeFixAllContext): CombinedCodeActions {
diff --git a/src/services/codefixes/addMissingInvocationForDecorator.ts b/src/services/codefixes/addMissingInvocationForDecorator.ts
index 7b8a7d05fe7..ead64f9a2ca 100644
--- a/src/services/codefixes/addMissingInvocationForDecorator.ts
+++ b/src/services/codefixes/addMissingInvocationForDecorator.ts
@@ -6,7 +6,7 @@ namespace ts.codefix {
         errorCodes,
         getCodeActions: (context) => {
             const changes = textChanges.ChangeTracker.with(context, t => makeChange(t, context.sourceFile, context.span.start));
-            return [createCodeFixAction(changes, Diagnostics.Call_decorator_expression, fixId, Diagnostics.Add_to_all_uncalled_decorators)];
+            return [createCodeFixAction(fixId, changes, Diagnostics.Call_decorator_expression, fixId, Diagnostics.Add_to_all_uncalled_decorators)];
         },
         fixIds: [fixId],
         getAllCodeActions: context => codeFixAll(context, errorCodes, (changes, diag) => makeChange(changes, diag.file!, diag.start!)),
diff --git a/src/services/codefixes/annotateWithTypeFromJSDoc.ts b/src/services/codefixes/annotateWithTypeFromJSDoc.ts
index c8a3977eb3b..5b809452677 100644
--- a/src/services/codefixes/annotateWithTypeFromJSDoc.ts
+++ b/src/services/codefixes/annotateWithTypeFromJSDoc.ts
@@ -8,7 +8,7 @@ namespace ts.codefix {
             const decl = getDeclaration(context.sourceFile, context.span.start);
             if (!decl) return;
             const changes = textChanges.ChangeTracker.with(context, t => doChange(t, context.sourceFile, decl));
-            return [createCodeFixAction(changes, Diagnostics.Annotate_with_type_from_JSDoc, fixId, Diagnostics.Annotate_everything_with_types_from_JSDoc)];
+            return [createCodeFixAction(fixId, changes, Diagnostics.Annotate_with_type_from_JSDoc, fixId, Diagnostics.Annotate_everything_with_types_from_JSDoc)];
         },
         fixIds: [fixId],
         getAllCodeActions: context => codeFixAll(context, errorCodes, (changes, diag) => {
diff --git a/src/services/codefixes/convertFunctionToEs6Class.ts b/src/services/codefixes/convertFunctionToEs6Class.ts
index bb260463831..d137785a7e7 100644
--- a/src/services/codefixes/convertFunctionToEs6Class.ts
+++ b/src/services/codefixes/convertFunctionToEs6Class.ts
@@ -6,7 +6,7 @@ namespace ts.codefix {
         errorCodes,
         getCodeActions(context: CodeFixContext) {
             const changes = textChanges.ChangeTracker.with(context, t => doChange(t, context.sourceFile, context.span.start, context.program.getTypeChecker()));
-            return [createCodeFixAction(changes, Diagnostics.Convert_function_to_an_ES2015_class, fixId, Diagnostics.Convert_all_constructor_functions_to_classes)];
+            return [createCodeFixAction(fixId, changes, Diagnostics.Convert_function_to_an_ES2015_class, fixId, Diagnostics.Convert_all_constructor_functions_to_classes)];
         },
         fixIds: [fixId],
         getAllCodeActions: context => codeFixAll(context, errorCodes, (changes, err) => doChange(changes, err.file!, err.start, context.program.getTypeChecker())),
@@ -34,13 +34,14 @@ namespace ts.codefix {
 
             case SyntaxKind.VariableDeclaration:
                 precedingNode = ctorDeclaration.parent.parent;
+                newClassDeclaration = createClassFromVariableDeclaration(ctorDeclaration as VariableDeclaration);
                 if ((<VariableDeclarationList>ctorDeclaration.parent).declarations.length === 1) {
+                    copyComments(precedingNode, newClassDeclaration, sourceFile);
                     deleteNode(precedingNode);
                 }
                 else {
                     deleteNode(ctorDeclaration, /*inList*/ true);
                 }
-                newClassDeclaration = createClassFromVariableDeclaration(ctorDeclaration as VariableDeclaration);
                 break;
         }
 
diff --git a/src/services/codefixes/convertToEs6Module.ts b/src/services/codefixes/convertToEs6Module.ts
index b8c78d57827..a8df21dc96d 100644
--- a/src/services/codefixes/convertToEs6Module.ts
+++ b/src/services/codefixes/convertToEs6Module.ts
@@ -13,7 +13,7 @@ namespace ts.codefix {
                 }
             });
             // No support for fix-all since this applies to the whole file at once anyway.
-            return [createCodeFixActionNoFixId(changes, Diagnostics.Convert_to_ES6_module)];
+            return [createCodeFixActionNoFixId("convertToEs6Module", changes, Diagnostics.Convert_to_ES6_module)];
         },
     });
 
@@ -114,8 +114,8 @@ namespace ts.codefix {
                         return false;
                     }
                     case SyntaxKind.BinaryExpression: {
-                        const { left, operatorToken, right } = expression as BinaryExpression;
-                        return operatorToken.kind === SyntaxKind.EqualsToken && convertAssignment(sourceFile, checker, statement as ExpressionStatement, left, right, changes, exports);
+                        const { operatorToken } = expression as BinaryExpression;
+                        return operatorToken.kind === SyntaxKind.EqualsToken && convertAssignment(sourceFile, checker, expression as BinaryExpression, changes, exports);
                     }
                 }
             }
@@ -130,23 +130,23 @@ namespace ts.codefix {
         let foundImport = false;
         const newNodes = flatMap(declarationList.declarations, decl => {
             const { name, initializer } = decl;
-            if (isExportsOrModuleExportsOrAlias(sourceFile, initializer)) {
-                // `const alias = module.exports;` can be removed.
-                foundImport = true;
-                return [];
-            }
-            if (isRequireCall(initializer, /*checkArgumentIsStringLiteralLike*/ true)) {
-                foundImport = true;
-                return convertSingleImport(sourceFile, name, initializer.arguments[0], changes, checker, identifiers, target);
-            }
-            else if (isPropertyAccessExpression(initializer) && isRequireCall(initializer.expression, /*checkArgumentIsStringLiteralLike*/ true)) {
-                foundImport = true;
-                return convertPropertyAccessImport(name, initializer.name.text, initializer.expression.arguments[0], identifiers);
-            }
-            else {
-                // Move it out to its own variable statement.
-                return createVariableStatement(/*modifiers*/ undefined, createVariableDeclarationList([decl], declarationList.flags));
+            if (initializer) {
+                if (isExportsOrModuleExportsOrAlias(sourceFile, initializer)) {
+                    // `const alias = module.exports;` can be removed.
+                    foundImport = true;
+                    return [];
+                }
+                else if (isRequireCall(initializer, /*checkArgumentIsStringLiteralLike*/ true)) {
+                    foundImport = true;
+                    return convertSingleImport(sourceFile, name, initializer.arguments[0], changes, checker, identifiers, target);
+                }
+                else if (isPropertyAccessExpression(initializer) && isRequireCall(initializer.expression, /*checkArgumentIsStringLiteralLike*/ true)) {
+                    foundImport = true;
+                    return convertPropertyAccessImport(name, initializer.name.text, initializer.expression.arguments[0], identifiers);
+                }
             }
+            // Move it out to its own variable statement. (This will not be used if `!foundImport`)
+            return createVariableStatement(/*modifiers*/ undefined, createVariableDeclarationList([decl], declarationList.flags));
         });
         if (foundImport) {
             // useNonAdjustedEndPosition to ensure we don't eat the newline after the statement.
@@ -177,12 +177,11 @@ namespace ts.codefix {
     function convertAssignment(
         sourceFile: SourceFile,
         checker: TypeChecker,
-        statement: ExpressionStatement,
-        left: Expression,
-        right: Expression,
+        assignment: BinaryExpression,
         changes: textChanges.ChangeTracker,
         exports: ExportRenames,
     ): ModuleExportsChanged {
+        const { left, right } = assignment;
         if (!isPropertyAccessExpression(left)) {
             return false;
         }
@@ -190,7 +189,7 @@ namespace ts.codefix {
         if (isExportsOrModuleExportsOrAlias(sourceFile, left)) {
             if (isExportsOrModuleExportsOrAlias(sourceFile, right)) {
                 // `const alias = module.exports;` or `module.exports = alias;` can be removed.
-                changes.deleteNode(sourceFile, statement);
+                changes.deleteNode(sourceFile, assignment.parent);
             }
             else {
                 let newNodes = isObjectLiteralExpression(right) ? tryChangeModuleExportsObject(right) : undefined;
@@ -198,12 +197,12 @@ namespace ts.codefix {
                 if (!newNodes) {
                     ([newNodes, changedToDefaultExport] = convertModuleExportsToExportDefault(right, checker));
                 }
-                changes.replaceNodeWithNodes(sourceFile, statement, newNodes);
+                changes.replaceNodeWithNodes(sourceFile, assignment.parent, newNodes);
                 return changedToDefaultExport;
             }
         }
         else if (isExportsOrModuleExportsOrAlias(sourceFile, left.expression)) {
-            convertNamedExport(sourceFile, statement, left.name, right, changes, exports);
+            convertNamedExport(sourceFile, assignment as BinaryExpression & { left: PropertyAccessExpression }, changes, exports);
         }
 
         return false;
@@ -223,7 +222,7 @@ namespace ts.codefix {
                 case SyntaxKind.SpreadAssignment:
                     return undefined;
                 case SyntaxKind.PropertyAssignment:
-                    return !isIdentifier(prop.name) ? undefined : convertExportsDotXEquals(prop.name.text, prop.initializer);
+                    return !isIdentifier(prop.name) ? undefined : convertExportsDotXEquals_replaceNode(prop.name.text, prop.initializer);
                 case SyntaxKind.MethodDeclaration:
                     return !isIdentifier(prop.name) ? undefined : functionExpressionToDeclaration(prop.name.text, [createToken(SyntaxKind.ExportKeyword)], prop);
                 default:
@@ -234,14 +233,12 @@ namespace ts.codefix {
 
     function convertNamedExport(
         sourceFile: SourceFile,
-        statement: Statement,
-        propertyName: Identifier,
-        right: Expression,
+        assignment: BinaryExpression & { left: PropertyAccessExpression },
         changes: textChanges.ChangeTracker,
         exports: ExportRenames,
     ): void {
         // If "originalKeywordKind" was set, this is e.g. `exports.
-        const { text } = propertyName;
+        const { text } = assignment.left.name;
         const rename = exports.get(text);
         if (rename !== undefined) {
             /*
@@ -249,13 +246,13 @@ namespace ts.codefix {
             export { _class as class };
             */
             const newNodes = [
-                makeConst(/*modifiers*/ undefined, rename, right),
+                makeConst(/*modifiers*/ undefined, rename, assignment.right),
                 makeExportDeclaration([createExportSpecifier(rename, text)]),
             ];
-            changes.replaceNodeWithNodes(sourceFile, statement, newNodes);
+            changes.replaceNodeWithNodes(sourceFile, assignment.parent, newNodes);
         }
         else {
-            changes.replaceNode(sourceFile, statement, convertExportsDotXEquals(text, right));
+            convertExportsPropertyAssignment(assignment, sourceFile, changes);
         }
     }
 
@@ -303,7 +300,27 @@ namespace ts.codefix {
         return makeExportDeclaration([createExportSpecifier(/*propertyName*/ undefined, "default")], moduleSpecifier);
     }
 
-    function convertExportsDotXEquals(name: string | undefined, exported: Expression): Statement {
+    function convertExportsPropertyAssignment({ left, right, parent }: BinaryExpression & { left: PropertyAccessExpression }, sourceFile: SourceFile, changes: textChanges.ChangeTracker): void {
+        const name = left.name.text;
+        if ((isFunctionExpression(right) || isArrowFunction(right) || isClassExpression(right)) && (!right.name || right.name.text === name)) {
+            // `exports.f = function() {}` -> `export function f() {}` -- Replace `exports.f = ` with `export `, and insert the name after `function`.
+            changes.replaceRange(sourceFile, { pos: left.getStart(sourceFile), end: right.getStart(sourceFile) }, createToken(SyntaxKind.ExportKeyword), { suffix: " " });
+
+            if (!right.name) changes.insertName(sourceFile, right, name);
+
+            const semi = findChildOfKind(parent, SyntaxKind.SemicolonToken, sourceFile);
+            if (semi) changes.deleteNode(sourceFile, semi, { useNonAdjustedEndPosition: true });
+        }
+        else {
+            // `exports.f = function g() {}` -> `export const f = function g() {}` -- just replace `exports.` with `export const `
+            changes.replaceNodeRangeWithNodes(sourceFile, left.expression, findChildOfKind(left, SyntaxKind.DotToken, sourceFile)!,
+                [createToken(SyntaxKind.ExportKeyword), createToken(SyntaxKind.ConstKeyword)],
+                { joiner: " ", suffix: " " });
+        }
+    }
+
+    // TODO: GH#22492 this will cause an error if a change has been made inside the body of the node.
+    function convertExportsDotXEquals_replaceNode(name: string | undefined, exported: Expression): Statement {
         const modifiers = [createToken(SyntaxKind.ExportKeyword)];
         switch (exported.kind) {
             case SyntaxKind.FunctionExpression: {
diff --git a/src/services/codefixes/correctQualifiedNameToIndexedAccessType.ts b/src/services/codefixes/correctQualifiedNameToIndexedAccessType.ts
index f47b65aad90..54fe1823863 100644
--- a/src/services/codefixes/correctQualifiedNameToIndexedAccessType.ts
+++ b/src/services/codefixes/correctQualifiedNameToIndexedAccessType.ts
@@ -9,7 +9,7 @@ namespace ts.codefix {
             if (!qualifiedName) return undefined;
             const changes = textChanges.ChangeTracker.with(context, t => doChange(t, context.sourceFile, qualifiedName));
             const newText = `${qualifiedName.left.text}["${qualifiedName.right.text}"]`;
-            return [createCodeFixAction(changes, [Diagnostics.Rewrite_as_the_indexed_access_type_0, newText], fixId, Diagnostics.Rewrite_all_as_indexed_access_types)];
+            return [createCodeFixAction(fixId, changes, [Diagnostics.Rewrite_as_the_indexed_access_type_0, newText], fixId, Diagnostics.Rewrite_all_as_indexed_access_types)];
         },
         fixIds: [fixId],
         getAllCodeActions: (context) => codeFixAll(context, errorCodes, (changes, diag) => {
diff --git a/src/services/codefixes/disableJsDiagnostics.ts b/src/services/codefixes/disableJsDiagnostics.ts
index c53c35c5f81..b5d3059dd42 100644
--- a/src/services/codefixes/disableJsDiagnostics.ts
+++ b/src/services/codefixes/disableJsDiagnostics.ts
@@ -1,5 +1,6 @@
 /* @internal */
 namespace ts.codefix {
+    const fixName = "disableJsDiagnostics";
     const fixId = "disableJsDiagnostics";
     const errorCodes = mapDefined(Object.keys(Diagnostics) as ReadonlyArray<keyof typeof Diagnostics>, key => {
         const diag = Diagnostics[key];
@@ -18,6 +19,7 @@ namespace ts.codefix {
             const fixes: CodeFixAction[] = [
                 // fixId unnecessary because adding `// @ts-nocheck` even once will ignore every error in the file.
                 createCodeFixActionNoFixId(
+                    fixName,
                     [createFileTextChanges(sourceFile.fileName, [
                         createTextChange(sourceFile.checkJsDirective
                             ? createTextSpanFromBounds(sourceFile.checkJsDirective.pos, sourceFile.checkJsDirective.end)
@@ -27,7 +29,7 @@ namespace ts.codefix {
             ];
 
             if (textChanges.isValidLocationToAddComment(sourceFile, span.start)) {
-                fixes.unshift(createCodeFixAction(textChanges.ChangeTracker.with(context, t => makeChange(t, sourceFile, span.start)), Diagnostics.Ignore_this_error_message, fixId, Diagnostics.Add_ts_ignore_to_all_error_messages));
+                fixes.unshift(createCodeFixAction(fixName, textChanges.ChangeTracker.with(context, t => makeChange(t, sourceFile, span.start)), Diagnostics.Ignore_this_error_message, fixId, Diagnostics.Add_ts_ignore_to_all_error_messages));
             }
 
             return fixes;
diff --git a/src/services/codefixes/fixAddMissingMember.ts b/src/services/codefixes/fixAddMissingMember.ts
index 9a3b4854351..940201d7008 100644
--- a/src/services/codefixes/fixAddMissingMember.ts
+++ b/src/services/codefixes/fixAddMissingMember.ts
@@ -1,5 +1,6 @@
 /* @internal */
 namespace ts.codefix {
+    const fixName = "addMissingMember";
     const errorCodes = [
         Diagnostics.Property_0_does_not_exist_on_type_1.code,
         Diagnostics.Property_0_does_not_exist_on_type_1_Did_you_mean_2.code,
@@ -75,7 +76,7 @@ namespace ts.codefix {
     function getActionsForAddMissingMemberInJavaScriptFile(context: CodeFixContext, classDeclarationSourceFile: SourceFile, classDeclaration: ClassLikeDeclaration, tokenName: string, makeStatic: boolean): CodeFixAction | undefined {
         const changes = textChanges.ChangeTracker.with(context, t => addMissingMemberInJs(t, classDeclarationSourceFile, classDeclaration, tokenName, makeStatic));
         return changes.length === 0 ? undefined
-            : createCodeFixAction(changes, [makeStatic ? Diagnostics.Initialize_static_property_0 : Diagnostics.Initialize_property_0_in_the_constructor, tokenName], fixId, Diagnostics.Add_all_missing_members);
+            : createCodeFixAction(fixName, changes, [makeStatic ? Diagnostics.Initialize_static_property_0 : Diagnostics.Initialize_property_0_in_the_constructor, tokenName], fixId, Diagnostics.Add_all_missing_members);
     }
 
     function addMissingMemberInJs(changeTracker: textChanges.ChangeTracker, classDeclarationSourceFile: SourceFile, classDeclaration: ClassLikeDeclaration, tokenName: string, makeStatic: boolean): void {
@@ -120,7 +121,7 @@ namespace ts.codefix {
 
     function createAddPropertyDeclarationAction(context: CodeFixContext, classDeclarationSourceFile: SourceFile, classDeclaration: ClassLikeDeclaration, makeStatic: boolean, tokenName: string, typeNode: TypeNode): CodeFixAction {
         const changes = textChanges.ChangeTracker.with(context, t => addPropertyDeclaration(t, classDeclarationSourceFile, classDeclaration, tokenName, typeNode, makeStatic));
-        return createCodeFixAction(changes, [makeStatic ? Diagnostics.Declare_static_property_0 : Diagnostics.Declare_property_0, tokenName], fixId, Diagnostics.Add_all_missing_members);
+        return createCodeFixAction(fixName, changes, [makeStatic ? Diagnostics.Declare_static_property_0 : Diagnostics.Declare_property_0, tokenName], fixId, Diagnostics.Add_all_missing_members);
     }
 
     function addPropertyDeclaration(changeTracker: textChanges.ChangeTracker, classDeclarationSourceFile: SourceFile, classDeclaration: ClassLikeDeclaration, tokenName: string, typeNode: TypeNode, makeStatic: boolean): void {
@@ -153,7 +154,7 @@ namespace ts.codefix {
 
         const changes = textChanges.ChangeTracker.with(context, t => t.insertNodeAtClassStart(classDeclarationSourceFile, classDeclaration, indexSignature));
         // No fixId here because code-fix-all currently only works on adding individual named properties.
-        return createCodeFixActionNoFixId(changes, [Diagnostics.Add_index_signature_for_property_0, tokenName]);
+        return createCodeFixActionNoFixId(fixName, changes, [Diagnostics.Add_index_signature_for_property_0, tokenName]);
     }
 
     function getActionForMethodDeclaration(
@@ -167,7 +168,7 @@ namespace ts.codefix {
         preferences: UserPreferences,
     ): CodeFixAction | undefined {
         const changes = textChanges.ChangeTracker.with(context, t => addMethodDeclaration(t, classDeclarationSourceFile, classDeclaration, token, callExpression, makeStatic, inJs, preferences));
-        return createCodeFixAction(changes, [makeStatic ? Diagnostics.Declare_static_method_0 : Diagnostics.Declare_method_0, token.text], fixId, Diagnostics.Add_all_missing_members);
+        return createCodeFixAction(fixName, changes, [makeStatic ? Diagnostics.Declare_static_method_0 : Diagnostics.Declare_method_0, token.text], fixId, Diagnostics.Add_all_missing_members);
     }
 
     function addMethodDeclaration(
diff --git a/src/services/codefixes/fixAwaitInSyncFunction.ts b/src/services/codefixes/fixAwaitInSyncFunction.ts
index 804910e9a22..fd00498573c 100644
--- a/src/services/codefixes/fixAwaitInSyncFunction.ts
+++ b/src/services/codefixes/fixAwaitInSyncFunction.ts
@@ -12,7 +12,7 @@ namespace ts.codefix {
             const nodes = getNodes(sourceFile, span.start);
             if (!nodes) return undefined;
             const changes = textChanges.ChangeTracker.with(context, t => doChange(t, sourceFile, nodes));
-            return [createCodeFixAction(changes, Diagnostics.Add_async_modifier_to_containing_function, fixId, Diagnostics.Add_all_missing_async_modifiers)];
+            return [createCodeFixAction(fixId, changes, Diagnostics.Add_async_modifier_to_containing_function, fixId, Diagnostics.Add_all_missing_async_modifiers)];
         },
         fixIds: [fixId],
         getAllCodeActions: context => codeFixAll(context, errorCodes, (changes, diag) => {
diff --git a/src/services/codefixes/fixCannotFindModule.ts b/src/services/codefixes/fixCannotFindModule.ts
index 89f7a3f7793..9699cd3ceb4 100644
--- a/src/services/codefixes/fixCannotFindModule.ts
+++ b/src/services/codefixes/fixCannotFindModule.ts
@@ -8,7 +8,7 @@ namespace ts.codefix {
             const { host, sourceFile, span: { start } } = context;
             const packageName = getTypesPackageNameToInstall(host, sourceFile, start);
             return packageName === undefined ? []
-                : [createCodeFixAction(/*changes*/ [], [Diagnostics.Install_0, packageName], fixId, Diagnostics.Install_all_missing_types_packages, getCommand(sourceFile.fileName, packageName))];
+                : [createCodeFixAction(fixId, /*changes*/ [], [Diagnostics.Install_0, packageName], fixId, Diagnostics.Install_all_missing_types_packages, getCommand(sourceFile.fileName, packageName))];
         },
         fixIds: [fixId],
         getAllCodeActions: context => codeFixAll(context, errorCodes, (_, diag, commands) => {
diff --git a/src/services/codefixes/fixClassDoesntImplementInheritedAbstractMember.ts b/src/services/codefixes/fixClassDoesntImplementInheritedAbstractMember.ts
index 3a1443c04bb..a931f849cb2 100644
--- a/src/services/codefixes/fixClassDoesntImplementInheritedAbstractMember.ts
+++ b/src/services/codefixes/fixClassDoesntImplementInheritedAbstractMember.ts
@@ -11,7 +11,7 @@ namespace ts.codefix {
             const { program, sourceFile, span } = context;
             const changes = textChanges.ChangeTracker.with(context, t =>
                 addMissingMembers(getClass(sourceFile, span.start), sourceFile, program.getTypeChecker(), t, context.preferences));
-            return changes.length === 0 ? undefined : [createCodeFixAction(changes, Diagnostics.Implement_inherited_abstract_class, fixId, Diagnostics.Implement_all_inherited_abstract_classes)];
+            return changes.length === 0 ? undefined : [createCodeFixAction(fixId, changes, Diagnostics.Implement_inherited_abstract_class, fixId, Diagnostics.Implement_all_inherited_abstract_classes)];
         },
         fixIds: [fixId],
         getAllCodeActions: context => {
diff --git a/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts b/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts
index 91815edb775..4e0b5745149 100644
--- a/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts
+++ b/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts
@@ -11,7 +11,7 @@ namespace ts.codefix {
             const checker = program.getTypeChecker();
             return mapDefined<ExpressionWithTypeArguments, CodeFixAction>(getClassImplementsHeritageClauseElements(classDeclaration), implementedTypeNode => {
                 const changes = textChanges.ChangeTracker.with(context, t => addMissingDeclarations(checker, implementedTypeNode, sourceFile, classDeclaration, t, context.preferences));
-                return changes.length === 0 ? undefined : createCodeFixAction(changes, [Diagnostics.Implement_interface_0, implementedTypeNode.getText(sourceFile)], fixId, Diagnostics.Implement_all_unimplemented_interfaces);
+                return changes.length === 0 ? undefined : createCodeFixAction(fixId, changes, [Diagnostics.Implement_interface_0, implementedTypeNode.getText(sourceFile)], fixId, Diagnostics.Implement_all_unimplemented_interfaces);
             });
         },
         fixIds: [fixId],
diff --git a/src/services/codefixes/fixClassSuperMustPrecedeThisAccess.ts b/src/services/codefixes/fixClassSuperMustPrecedeThisAccess.ts
index d9c98747286..af38b8e9025 100644
--- a/src/services/codefixes/fixClassSuperMustPrecedeThisAccess.ts
+++ b/src/services/codefixes/fixClassSuperMustPrecedeThisAccess.ts
@@ -10,7 +10,7 @@ namespace ts.codefix {
             if (!nodes) return undefined;
             const { constructor, superCall } = nodes;
             const changes = textChanges.ChangeTracker.with(context, t => doChange(t, sourceFile, constructor, superCall));
-            return [createCodeFixAction(changes, Diagnostics.Make_super_call_the_first_statement_in_the_constructor, fixId, Diagnostics.Make_all_super_calls_the_first_statement_in_their_constructor)];
+            return [createCodeFixAction(fixId, changes, Diagnostics.Make_super_call_the_first_statement_in_the_constructor, fixId, Diagnostics.Make_all_super_calls_the_first_statement_in_their_constructor)];
         },
         fixIds: [fixId],
         getAllCodeActions(context) {
diff --git a/src/services/codefixes/fixConstructorForDerivedNeedSuperCall.ts b/src/services/codefixes/fixConstructorForDerivedNeedSuperCall.ts
index 31aa4fcedae..2aed263ee83 100644
--- a/src/services/codefixes/fixConstructorForDerivedNeedSuperCall.ts
+++ b/src/services/codefixes/fixConstructorForDerivedNeedSuperCall.ts
@@ -8,7 +8,7 @@ namespace ts.codefix {
             const { sourceFile, span } = context;
             const ctr = getNode(sourceFile, span.start);
             const changes = textChanges.ChangeTracker.with(context, t => doChange(t, sourceFile, ctr));
-            return [createCodeFixAction(changes, Diagnostics.Add_missing_super_call, fixId, Diagnostics.Add_all_missing_super_calls)];
+            return [createCodeFixAction(fixId, changes, Diagnostics.Add_missing_super_call, fixId, Diagnostics.Add_all_missing_super_calls)];
         },
         fixIds: [fixId],
         getAllCodeActions: context => codeFixAll(context, errorCodes, (changes, diag) =>
diff --git a/src/services/codefixes/fixExtendsInterfaceBecomesImplements.ts b/src/services/codefixes/fixExtendsInterfaceBecomesImplements.ts
index 381a8228c0d..c3f406b8475 100644
--- a/src/services/codefixes/fixExtendsInterfaceBecomesImplements.ts
+++ b/src/services/codefixes/fixExtendsInterfaceBecomesImplements.ts
@@ -10,7 +10,7 @@ namespace ts.codefix {
             if (!nodes) return undefined;
             const { extendsToken, heritageClauses } = nodes;
             const changes = textChanges.ChangeTracker.with(context, t => doChanges(t, sourceFile, extendsToken, heritageClauses));
-            return [createCodeFixAction(changes, Diagnostics.Change_extends_to_implements, fixId, Diagnostics.Change_all_extended_interfaces_to_implements)];
+            return [createCodeFixAction(fixId, changes, Diagnostics.Change_extends_to_implements, fixId, Diagnostics.Change_all_extended_interfaces_to_implements)];
         },
         fixIds: [fixId],
         getAllCodeActions: context => codeFixAll(context, errorCodes, (changes, diag) => {
diff --git a/src/services/codefixes/fixForgottenThisPropertyAccess.ts b/src/services/codefixes/fixForgottenThisPropertyAccess.ts
index 2cf7e2143a3..31c6128d003 100644
--- a/src/services/codefixes/fixForgottenThisPropertyAccess.ts
+++ b/src/services/codefixes/fixForgottenThisPropertyAccess.ts
@@ -1,35 +1,38 @@
 /* @internal */
 namespace ts.codefix {
     const fixId = "forgottenThisPropertyAccess";
-    const errorCodes = [Diagnostics.Cannot_find_name_0_Did_you_mean_the_instance_member_this_0.code];
+    const didYouMeanStaticMemberCode = Diagnostics.Cannot_find_name_0_Did_you_mean_the_static_member_1_0.code;
+    const errorCodes = [
+        Diagnostics.Cannot_find_name_0_Did_you_mean_the_instance_member_this_0.code,
+        didYouMeanStaticMemberCode,
+    ];
     registerCodeFix({
         errorCodes,
         getCodeActions(context) {
             const { sourceFile } = context;
-            const token = getNode(sourceFile, context.span.start);
-            if (!token) {
+            const info = getInfo(sourceFile, context.span.start, context.errorCode);
+            if (!info) {
                 return undefined;
             }
-            const changes = textChanges.ChangeTracker.with(context, t => doChange(t, sourceFile, token));
-            return [createCodeFixAction(changes, Diagnostics.Add_this_to_unresolved_variable, fixId, Diagnostics.Add_this_to_all_unresolved_variables_matching_a_member_name)];
+            const changes = textChanges.ChangeTracker.with(context, t => doChange(t, sourceFile, info));
+            return [createCodeFixAction(fixId, changes, [Diagnostics.Add_0_to_unresolved_variable, info.className || "this"], fixId, Diagnostics.Add_qualifier_to_all_unresolved_variables_matching_a_member_name)];
         },
         fixIds: [fixId],
         getAllCodeActions: context => codeFixAll(context, errorCodes, (changes, diag) => {
-            doChange(changes, context.sourceFile, getNode(diag.file, diag.start!));
+            doChange(changes, context.sourceFile, getInfo(diag.file, diag.start!, diag.code));
         }),
     });
 
-    function getNode(sourceFile: SourceFile, pos: number): Identifier | undefined {
+    interface Info { readonly node: Identifier; readonly className: string | undefined; }
+    function getInfo(sourceFile: SourceFile, pos: number, diagCode: number): Info | undefined {
         const node = getTokenAtPosition(sourceFile, pos, /*includeJsDocComment*/ false);
-        return isIdentifier(node) ? node : undefined;
+        if (!isIdentifier(node)) return undefined;
+        return { node, className: diagCode === didYouMeanStaticMemberCode ? getContainingClass(node).name.text : undefined };
     }
 
-    function doChange(changes: textChanges.ChangeTracker, sourceFile: SourceFile, token: Identifier | undefined): void {
-        if (!token) {
-            return;
-        }
+    function doChange(changes: textChanges.ChangeTracker, sourceFile: SourceFile, { node, className }: Info): void {
         // TODO (https://github.com/Microsoft/TypeScript/issues/21246): use shared helper
-        suppressLeadingAndTrailingTrivia(token);
-        changes.replaceNode(sourceFile, token, createPropertyAccess(createThis(), token));
+        suppressLeadingAndTrailingTrivia(node);
+        changes.replaceNode(sourceFile, node, createPropertyAccess(className ? createIdentifier(className) : createThis(), node));
     }
 }
diff --git a/src/services/codefixes/fixInvalidImportSyntax.ts b/src/services/codefixes/fixInvalidImportSyntax.ts
index 84bd9867c70..50bf41360bc 100644
--- a/src/services/codefixes/fixInvalidImportSyntax.ts
+++ b/src/services/codefixes/fixInvalidImportSyntax.ts
@@ -1,5 +1,7 @@
 /* @internal */
 namespace ts.codefix {
+    const fixName = "invalidImportSyntax";
+
     registerCodeFix({
         errorCodes: [Diagnostics.A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime.code],
         getCodeActions: getActionsForInvalidImport
@@ -43,7 +45,7 @@ namespace ts.codefix {
 
     function createAction(context: CodeFixContext, sourceFile: SourceFile, node: Node, replacement: Node): CodeFixAction {
         const changes = textChanges.ChangeTracker.with(context, t => t.replaceNode(sourceFile, node, replacement));
-        return createCodeFixActionNoFixId(changes, [Diagnostics.Replace_import_with_0, changes[0].textChanges[0].newText]);
+        return createCodeFixActionNoFixId("invalidImportSyntax", changes, [Diagnostics.Replace_import_with_0, changes[0].textChanges[0].newText]);
     }
 
     registerCodeFix({
@@ -72,7 +74,7 @@ namespace ts.codefix {
             addRange(fixes, getCodeFixesForImportDeclaration(context, relatedImport));
         }
         const changes = textChanges.ChangeTracker.with(context, t => t.replaceNode(sourceFile, expr, createPropertyAccess(expr, "default"), {}));
-        fixes.push(createCodeFixActionNoFixId(changes, Diagnostics.Use_synthetic_default_member));
+        fixes.push(createCodeFixActionNoFixId(fixName, changes, Diagnostics.Use_synthetic_default_member));
         return fixes;
     }
 }
diff --git a/src/services/codefixes/fixJSDocTypes.ts b/src/services/codefixes/fixJSDocTypes.ts
index 848666b67f0..1919b0742f0 100644
--- a/src/services/codefixes/fixJSDocTypes.ts
+++ b/src/services/codefixes/fixJSDocTypes.ts
@@ -22,7 +22,7 @@ namespace ts.codefix {
 
             function fix(type: Type, fixId: string, fixAllDescription: DiagnosticMessage): CodeFixAction {
                 const changes = textChanges.ChangeTracker.with(context, t => doChange(t, sourceFile, typeNode, type, checker));
-                return createCodeFixAction(changes, [Diagnostics.Change_0_to_1, original, checker.typeToString(type)], fixId, fixAllDescription);
+                return createCodeFixAction("jdocTypes", changes, [Diagnostics.Change_0_to_1, original, checker.typeToString(type)], fixId, fixAllDescription);
             }
         },
         fixIds: [fixIdPlain, fixIdNullable],
diff --git a/src/services/codefixes/fixSpelling.ts b/src/services/codefixes/fixSpelling.ts
index 59f5e64f212..252b08b356a 100644
--- a/src/services/codefixes/fixSpelling.ts
+++ b/src/services/codefixes/fixSpelling.ts
@@ -15,7 +15,7 @@ namespace ts.codefix {
             const { node, suggestion } = info;
             const { target } = context.host.getCompilationSettings();
             const changes = textChanges.ChangeTracker.with(context, t => doChange(t, sourceFile, node, suggestion, target));
-            return [createCodeFixAction(changes, [Diagnostics.Change_spelling_to_0, suggestion], fixId, Diagnostics.Fix_all_detected_spelling_errors)];
+            return [createCodeFixAction("spelling", changes, [Diagnostics.Change_spelling_to_0, suggestion], fixId, Diagnostics.Fix_all_detected_spelling_errors)];
         },
         fixIds: [fixId],
         getAllCodeActions: context => codeFixAll(context, errorCodes, (changes, diag) => {
diff --git a/src/services/codefixes/fixStrictClassInitialization.ts b/src/services/codefixes/fixStrictClassInitialization.ts
index 69a69a8c3c8..6c211b86f8d 100644
--- a/src/services/codefixes/fixStrictClassInitialization.ts
+++ b/src/services/codefixes/fixStrictClassInitialization.ts
@@ -1,5 +1,6 @@
 /* @internal */
 namespace ts.codefix {
+    const fixName = "strictClassInitialization";
     const fixIdAddDefiniteAssignmentAssertions = "addMissingPropertyDefiniteAssignmentAssertions";
     const fixIdAddUndefinedType = "addMissingPropertyUndefinedType";
     const fixIdAddInitializer = "addMissingPropertyInitializer";
@@ -53,7 +54,7 @@ namespace ts.codefix {
 
     function getActionForAddMissingDefiniteAssignmentAssertion (context: CodeFixContext, propertyDeclaration: PropertyDeclaration): CodeFixAction {
         const changes = textChanges.ChangeTracker.with(context, t => addDefiniteAssignmentAssertion(t, context.sourceFile, propertyDeclaration));
-        return createCodeFixAction(changes, [Diagnostics.Add_definite_assignment_assertion_to_property_0, propertyDeclaration.getText()], fixIdAddDefiniteAssignmentAssertions, Diagnostics.Add_definite_assignment_assertions_to_all_uninitialized_properties);
+        return createCodeFixAction(fixName, changes, [Diagnostics.Add_definite_assignment_assertion_to_property_0, propertyDeclaration.getText()], fixIdAddDefiniteAssignmentAssertions, Diagnostics.Add_definite_assignment_assertions_to_all_uninitialized_properties);
     }
 
     function addDefiniteAssignmentAssertion(changeTracker: textChanges.ChangeTracker, propertyDeclarationSourceFile: SourceFile, propertyDeclaration: PropertyDeclaration): void {
@@ -71,7 +72,7 @@ namespace ts.codefix {
 
     function getActionForAddMissingUndefinedType (context: CodeFixContext, propertyDeclaration: PropertyDeclaration): CodeFixAction {
         const changes = textChanges.ChangeTracker.with(context, t => addUndefinedType(t, context.sourceFile, propertyDeclaration));
-        return createCodeFixAction(changes, [Diagnostics.Add_undefined_type_to_property_0, propertyDeclaration.name.getText()], fixIdAddUndefinedType, Diagnostics.Add_undefined_type_to_all_uninitialized_properties);
+        return createCodeFixAction(fixName, changes, [Diagnostics.Add_undefined_type_to_property_0, propertyDeclaration.name.getText()], fixIdAddUndefinedType, Diagnostics.Add_undefined_type_to_all_uninitialized_properties);
     }
 
     function addUndefinedType(changeTracker: textChanges.ChangeTracker, propertyDeclarationSourceFile: SourceFile, propertyDeclaration: PropertyDeclaration): void {
@@ -86,7 +87,7 @@ namespace ts.codefix {
         if (!initializer) return undefined;
 
         const changes = textChanges.ChangeTracker.with(context, t => addInitializer(t, context.sourceFile, propertyDeclaration, initializer));
-        return createCodeFixAction(changes, [Diagnostics.Add_initializer_to_property_0, propertyDeclaration.name.getText()], fixIdAddInitializer, Diagnostics.Add_initializers_to_all_uninitialized_properties);
+        return createCodeFixAction(fixName, changes, [Diagnostics.Add_initializer_to_property_0, propertyDeclaration.name.getText()], fixIdAddInitializer, Diagnostics.Add_initializers_to_all_uninitialized_properties);
     }
 
     function addInitializer (changeTracker: textChanges.ChangeTracker, propertyDeclarationSourceFile: SourceFile, propertyDeclaration: PropertyDeclaration, initializer: Expression): void {
@@ -126,7 +127,7 @@ namespace ts.codefix {
             const classDeclaration = getClassLikeDeclarationOfSymbol(type.symbol);
             if (!classDeclaration || hasModifier(classDeclaration, ModifierFlags.Abstract)) return undefined;
 
-            const constructorDeclaration = find<ClassElement, ConstructorDeclaration>(classDeclaration.members, (m): m is ConstructorDeclaration => isConstructorDeclaration(m) && !!m.body)!;
+            const constructorDeclaration = getFirstConstructorWithBody(classDeclaration);
             if (constructorDeclaration && constructorDeclaration.parameters.length) return undefined;
 
             return createNew(createIdentifier(type.symbol.name), /*typeArguments*/ undefined, /*argumentsArray*/ undefined);
diff --git a/src/services/codefixes/fixUnusedIdentifier.ts b/src/services/codefixes/fixUnusedIdentifier.ts
index 1fe0107dafb..fd360c73ea1 100644
--- a/src/services/codefixes/fixUnusedIdentifier.ts
+++ b/src/services/codefixes/fixUnusedIdentifier.ts
@@ -1,9 +1,11 @@
 /* @internal */
 namespace ts.codefix {
+    const fixName = "unusedIdentifier";
     const fixIdPrefix = "unusedIdentifier_prefix";
     const fixIdDelete = "unusedIdentifier_delete";
     const errorCodes = [
         Diagnostics._0_is_declared_but_its_value_is_never_read.code,
+        Diagnostics._0_is_declared_but_never_used.code,
         Diagnostics.Property_0_is_declared_but_its_value_is_never_read.code,
         Diagnostics.All_imports_in_import_declaration_are_unused.code,
     ];
@@ -14,7 +16,7 @@ namespace ts.codefix {
             const importDecl = tryGetFullImport(sourceFile, context.span.start);
             if (importDecl) {
                 const changes = textChanges.ChangeTracker.with(context, t => t.deleteNode(sourceFile, importDecl));
-                return [createCodeFixAction(changes, [Diagnostics.Remove_import_from_0, showModuleSpecifier(importDecl)], fixIdDelete, Diagnostics.Delete_all_unused_declarations)];
+                return [createCodeFixAction(fixName, changes, [Diagnostics.Remove_import_from_0, showModuleSpecifier(importDecl)], fixIdDelete, Diagnostics.Delete_all_unused_declarations)];
             }
 
             const token = getToken(sourceFile, textSpanEnd(context.span));
@@ -22,12 +24,12 @@ namespace ts.codefix {
 
             const deletion = textChanges.ChangeTracker.with(context, t => tryDeleteDeclaration(t, sourceFile, token));
             if (deletion.length) {
-                result.push(createCodeFixAction(deletion, [Diagnostics.Remove_declaration_for_Colon_0, token.getText(sourceFile)], fixIdDelete, Diagnostics.Delete_all_unused_declarations));
+                result.push(createCodeFixAction(fixName, deletion, [Diagnostics.Remove_declaration_for_Colon_0, token.getText(sourceFile)], fixIdDelete, Diagnostics.Delete_all_unused_declarations));
             }
 
             const prefix = textChanges.ChangeTracker.with(context, t => tryPrefixDeclaration(t, errorCode, sourceFile, token));
             if (prefix.length) {
-                result.push(createCodeFixAction(prefix, [Diagnostics.Prefix_0_with_an_underscore, token.getText(sourceFile)], fixIdPrefix, Diagnostics.Prefix_all_unused_declarations_with_where_possible));
+                result.push(createCodeFixAction(fixName, prefix, [Diagnostics.Prefix_0_with_an_underscore, token.getText(sourceFile)], fixIdPrefix, Diagnostics.Prefix_all_unused_declarations_with_where_possible));
             }
 
             return result;
diff --git a/src/services/codefixes/fixes.ts b/src/services/codefixes/fixes.ts
deleted file mode 100644
index e16a7d2d8bf..00000000000
--- a/src/services/codefixes/fixes.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// Fixes higher in this list will be first in the array returned by `getCodeFixesAtPosition`.
-
-/// <reference path="addMissingInvocationForDecorator.ts" />
-/// <reference path="annotateWithTypeFromJSDoc.ts" />
-/// <reference path="convertFunctionToEs6Class.ts" />
-/// <reference path="convertToEs6Module.ts" />
-/// <reference path="correctQualifiedNameToIndexedAccessType.ts" />
-/// <reference path="fixClassIncorrectlyImplementsInterface.ts" />
-/// <reference path="importFixes.ts" />
-/// <reference path="fixSpelling.ts" />
-/// <reference path="fixAddMissingMember.ts" />
-/// <reference path="fixCannotFindModule.ts" />
-/// <reference path="fixClassDoesntImplementInheritedAbstractMember.ts" />
-/// <reference path="fixClassSuperMustPrecedeThisAccess.ts" />
-/// <reference path="fixConstructorForDerivedNeedSuperCall.ts" />
-/// <reference path="fixExtendsInterfaceBecomesImplements.ts" />
-/// <reference path="fixForgottenThisPropertyAccess.ts" />
-/// <reference path='fixUnusedIdentifier.ts' />
-/// <reference path='fixJSDocTypes.ts' />
-/// <reference path='fixAwaitInSyncFunction.ts' />
-/// <reference path='disableJsDiagnostics.ts' />
-/// <reference path='helpers.ts' />
-/// <reference path='inferFromUsage.ts' />
-/// <reference path="fixInvalidImportSyntax.ts" />
-/// <reference path="fixStrictClassInitialization.ts" />
-/// <reference path="useDefaultImport.ts" />
diff --git a/src/services/codefixes/helpers.ts b/src/services/codefixes/helpers.ts
index 35e75d831fd..cd3c5339a29 100644
--- a/src/services/codefixes/helpers.ts
+++ b/src/services/codefixes/helpers.ts
@@ -25,8 +25,7 @@ namespace ts.codefix {
         }
 
         const declaration = declarations[0];
-        // Clone name to remove leading trivia.
-        const name = getSynthesizedDeepClone(getNameOfDeclaration(declaration)) as PropertyName;
+        const name = getSynthesizedDeepClone(getNameOfDeclaration(declaration), /*includeTrivia*/ false) as PropertyName;
         const visibilityModifier = createVisibilityModifier(getModifierFlags(declaration));
         const modifiers = visibilityModifier ? createNodeArray([visibilityModifier]) : undefined;
         const type = checker.getWidenedType(checker.getTypeOfSymbolAtLocation(symbol, enclosingDeclaration));
@@ -69,7 +68,7 @@ namespace ts.codefix {
 
                 for (const signature of signatures) {
                     // Need to ensure nodes are fresh each time so they can have different positions.
-                    outputMethod(signature, getSynthesizedDeepClones(modifiers), getSynthesizedDeepClone(name));
+                    outputMethod(signature, getSynthesizedDeepClones(modifiers, /*includeTrivia*/ false), getSynthesizedDeepClone(name, /*includeTrivia*/ false));
                 }
 
                 if (declarations.length > signatures.length) {
@@ -103,10 +102,6 @@ namespace ts.codefix {
         return signatureDeclaration;
     }
 
-    function getSynthesizedDeepClones<T extends Node>(nodes: NodeArray<T> | undefined): NodeArray<T> | undefined {
-        return nodes && createNodeArray(nodes.map(getSynthesizedDeepClone));
-    }
-
     export function createMethodFromCallExpression(
         { typeArguments, arguments: args }: CallExpression,
         methodName: string,
diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
index 6becea1c6d3..fa466eb8cb9 100644
--- a/src/services/codefixes/importFixes.ts
+++ b/src/services/codefixes/importFixes.ts
@@ -7,7 +7,8 @@ namespace ts.codefix {
             Diagnostics.Cannot_find_name_0.code,
             Diagnostics.Cannot_find_name_0_Did_you_mean_1.code,
             Diagnostics.Cannot_find_namespace_0.code,
-            Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead.code
+            Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead.code,
+            Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here.code,
         ],
         getCodeActions: getImportCodeActions,
         // TODO: GH#20315
@@ -35,11 +36,10 @@ namespace ts.codefix {
 
     function createCodeAction(descriptionDiagnostic: DiagnosticMessage, diagnosticArgs: [string, string], changes: FileTextChanges[]): CodeFixAction {
         // TODO: GH#20315
-        return createCodeFixActionNoFixId(changes, [descriptionDiagnostic, ...diagnosticArgs] as [DiagnosticMessage, string, string]);
+        return createCodeFixActionNoFixId("import", changes, [descriptionDiagnostic, ...diagnosticArgs] as [DiagnosticMessage, string, string]);
     }
 
     function convertToImportCodeFixContext(context: CodeFixContext, symbolToken: Node, symbolName: string): ImportCodeFixContext {
-        const useCaseSensitiveFileNames = context.host.useCaseSensitiveFileNames ? context.host.useCaseSensitiveFileNames() : false;
         const { program } = context;
         const checker = program.getTypeChecker();
 
@@ -51,7 +51,7 @@ namespace ts.codefix {
             checker,
             compilerOptions: program.getCompilerOptions(),
             cachedImportDeclarations: [],
-            getCanonicalFileName: createGetCanonicalFileName(useCaseSensitiveFileNames),
+            getCanonicalFileName: createGetCanonicalFileName(hostUsesCaseSensitiveFileNames(context.host)),
             symbolName,
             symbolToken,
             preferences: context.preferences,
@@ -98,16 +98,21 @@ namespace ts.codefix {
         symbolToken: Node | undefined,
         preferences: UserPreferences,
     ): { readonly moduleSpecifier: string, readonly codeAction: CodeAction } {
-        const exportInfos = getAllReExportingModules(exportedSymbol, symbolName, checker, allSourceFiles);
+        const exportInfos = getAllReExportingModules(exportedSymbol, moduleSymbol, symbolName, sourceFile, checker, allSourceFiles);
         Debug.assert(exportInfos.some(info => info.moduleSymbol === moduleSymbol));
         // We sort the best codefixes first, so taking `first` is best for completions.
         const moduleSpecifier = first(getNewImportInfos(program, sourceFile, exportInfos, compilerOptions, getCanonicalFileName, host, preferences)).moduleSpecifier;
         const ctx: ImportCodeFixContext = { host, program, checker, compilerOptions, sourceFile, formatContext, symbolName, getCanonicalFileName, symbolToken, preferences };
         return { moduleSpecifier, codeAction: first(getCodeActionsForImport(exportInfos, ctx)) };
     }
-    function getAllReExportingModules(exportedSymbol: Symbol, symbolName: string, checker: TypeChecker, allSourceFiles: ReadonlyArray<SourceFile>): ReadonlyArray<SymbolExportInfo> {
+    function getAllReExportingModules(exportedSymbol: Symbol, exportingModuleSymbol: Symbol, symbolName: string, sourceFile: SourceFile, checker: TypeChecker, allSourceFiles: ReadonlyArray<SourceFile>): ReadonlyArray<SymbolExportInfo> {
         const result: SymbolExportInfo[] = [];
-        forEachExternalModule(checker, allSourceFiles, moduleSymbol => {
+        forEachExternalModule(checker, allSourceFiles, (moduleSymbol, moduleFile) => {
+            // Don't import from a re-export when looking "up" like to `./index` or `../index`.
+            if (moduleFile && moduleSymbol !== exportingModuleSymbol && startsWith(sourceFile.fileName, getDirectoryPath(moduleFile.fileName))) {
+                return;
+            }
+
             for (const exported of checker.getExportsOfModule(moduleSymbol)) {
                 if (exported.escapedName === InternalSymbolName.Default || exported.name === symbolName && skipAlias(exported, checker) === exportedSymbol) {
                     const isDefaultExport = checker.tryGetMemberInModuleExports(InternalSymbolName.Default, moduleSymbol) === exported;
@@ -119,6 +124,12 @@ namespace ts.codefix {
     }
 
     function getCodeActionsForImport(exportInfos: ReadonlyArray<SymbolExportInfo>, context: ImportCodeFixContext): CodeFixAction[] {
+        const result: CodeFixAction[] = [];
+        getCodeActionsForImport_separateExistingAndNew(exportInfos, context, result, result);
+        return result;
+    }
+
+    function getCodeActionsForImport_separateExistingAndNew(exportInfos: ReadonlyArray<SymbolExportInfo>, context: ImportCodeFixContext, useExisting: Push<CodeFixAction>, addNew: Push<CodeFixAction>): void {
         const existingImports = flatMap(exportInfos, info =>
             getImportDeclarations(info, context.checker, context.sourceFile, context.cachedImportDeclarations));
         // It is possible that multiple import statements with the same specifier exist in the file.
@@ -133,16 +144,18 @@ namespace ts.codefix {
         //     1. change "member3" to "ns.member3"
         //     2. add "member3" to the second import statement's import list
         // and it is up to the user to decide which one fits best.
-        const useExistingImportActions = !context.symbolToken || !isIdentifier(context.symbolToken) ? emptyArray : mapDefined(existingImports, ({ declaration }) => {
-            const namespace = getNamespaceImportName(declaration);
-            if (namespace) {
-                const moduleSymbol = context.checker.getAliasedSymbol(context.checker.getSymbolAtLocation(namespace));
-                if (moduleSymbol && moduleSymbol.exports.has(escapeLeadingUnderscores(context.symbolName))) {
-                    return getCodeActionForUseExistingNamespaceImport(namespace.text, context, context.symbolToken as Identifier);
+        if (context.symbolToken && isIdentifier(context.symbolToken)) {
+            for (const { declaration } of existingImports) {
+                const namespace = getNamespaceImportName(declaration);
+                if (namespace) {
+                    const moduleSymbol = context.checker.getAliasedSymbol(context.checker.getSymbolAtLocation(namespace));
+                    if (moduleSymbol && moduleSymbol.exports.has(escapeLeadingUnderscores(context.symbolName))) {
+                        useExisting.push(getCodeActionForUseExistingNamespaceImport(namespace.text, context, context.symbolToken));
+                    }
                 }
             }
-        });
-        return [...useExistingImportActions, ...getCodeActionsForAddImport(exportInfos, context, existingImports)];
+        }
+        getCodeActionsForAddImport(exportInfos, context, existingImports, useExisting, addNew);
     }
 
     function getNamespaceImportName(declaration: AnyImportSyntax): Identifier | undefined {
@@ -240,6 +253,7 @@ namespace ts.codefix {
         preferences: UserPreferences,
     ): ReadonlyArray<NewImportInfo> {
         const { baseUrl, paths, rootDirs } = compilerOptions;
+        const moduleResolutionKind = getEmitModuleResolutionKind(compilerOptions);
         const addJsExtension = usesJsExtensionOnImports(sourceFile);
         const choicesForEachExportingModule = flatMap<SymbolExportInfo, NewImportInfo[]>(moduleSymbols, ({ moduleSymbol, importKind }) => {
             const modulePathsGroups = getAllModulePaths(program, moduleSymbol.valueDeclaration.getSourceFile()).map(moduleFileName => {
@@ -252,7 +266,7 @@ namespace ts.codefix {
                     return [global];
                 }
 
-                const relativePath = removeExtensionAndIndexPostFix(getRelativePath(moduleFileName, sourceDirectory, getCanonicalFileName), compilerOptions, addJsExtension);
+                const relativePath = removeExtensionAndIndexPostFix(getRelativePath(moduleFileName, sourceDirectory, getCanonicalFileName), moduleResolutionKind, addJsExtension);
                 if (!baseUrl || preferences.importModuleSpecifierPreference === "relative") {
                     return [relativePath];
                 }
@@ -262,7 +276,7 @@ namespace ts.codefix {
                     return [relativePath];
                 }
 
-                const importRelativeToBaseUrl = removeExtensionAndIndexPostFix(relativeToBaseUrl, compilerOptions, addJsExtension);
+                const importRelativeToBaseUrl = removeExtensionAndIndexPostFix(relativeToBaseUrl, moduleResolutionKind, addJsExtension);
                 if (paths) {
                     const fromPaths = tryGetModuleNameFromPaths(removeFileExtension(relativeToBaseUrl), importRelativeToBaseUrl, paths);
                     if (fromPaths) {
@@ -390,7 +404,8 @@ namespace ts.codefix {
         return firstDefined(roots, unNormalizedTypeRoot => {
             const typeRoot = toPath(unNormalizedTypeRoot, /*basePath*/ undefined, getCanonicalFileName);
             if (startsWith(moduleFileName, typeRoot)) {
-                return removeExtensionAndIndexPostFix(moduleFileName.substring(typeRoot.length + 1), options, addJsExtension);
+                // For a type definition, we can strip `/index` even with classic resolution.
+                return removeExtensionAndIndexPostFix(moduleFileName.substring(typeRoot.length + 1), ModuleResolutionKind.NodeJs, addJsExtension);
             }
         });
     }
@@ -527,11 +542,11 @@ namespace ts.codefix {
         });
     }
 
-    function removeExtensionAndIndexPostFix(fileName: string, options: CompilerOptions, addJsExtension: boolean): string {
+    function removeExtensionAndIndexPostFix(fileName: string, moduleResolutionKind: ModuleResolutionKind, addJsExtension: boolean): string {
         const noExtension = removeFileExtension(fileName);
         return addJsExtension
             ? noExtension + ".js"
-            : getEmitModuleResolutionKind(options) === ModuleResolutionKind.NodeJs
+            : moduleResolutionKind === ModuleResolutionKind.NodeJs
                 ? removeSuffix(noExtension, "/index")
                 : noExtension;
     }
@@ -545,16 +560,13 @@ namespace ts.codefix {
         return startsWith(path, "..");
     }
 
-    function getRelativePath(path: string, directoryPath: string, getCanonicalFileName: GetCanonicalFileName) {
-        const relativePath = getRelativePathToDirectoryOrUrl(directoryPath, path, directoryPath, getCanonicalFileName, /*isAbsolutePathAnUrl*/ false);
-        return !pathIsRelative(relativePath) ? "./" + relativePath : relativePath;
-    }
-
     function getCodeActionsForAddImport(
         exportInfos: ReadonlyArray<SymbolExportInfo>,
         ctx: ImportCodeFixContext,
         existingImports: ReadonlyArray<ExistingImportInfo>,
-    ): CodeFixAction[] {
+        useExisting: Push<CodeFixAction>,
+        addNew: Push<CodeFixAction>,
+    ): void {
         const fromExistingImport = firstDefined(existingImports, ({ declaration, importKind }) => {
             if (declaration.kind === SyntaxKind.ImportDeclaration && declaration.importClause) {
                 const changes = tryUpdateExistingImport(ctx, isImportClause(declaration.importClause) && declaration.importClause || undefined, importKind);
@@ -565,14 +577,17 @@ namespace ts.codefix {
             }
         });
         if (fromExistingImport) {
-            return [fromExistingImport];
+            useExisting.push(fromExistingImport);
+            return;
         }
 
         const existingDeclaration = firstDefined(existingImports, newImportInfoFromExistingSpecifier);
         const newImportInfos = existingDeclaration
             ? [existingDeclaration]
             : getNewImportInfos(ctx.program, ctx.sourceFile, exportInfos, ctx.compilerOptions, ctx.getCanonicalFileName, ctx.host, ctx.preferences);
-        return newImportInfos.map(info => getCodeActionForNewImport(ctx, info));
+        for (const info of newImportInfos) {
+            addNew.push(getCodeActionForNewImport(ctx, info));
+        }
     }
 
     function newImportInfoFromExistingSpecifier({ declaration, importKind }: ExistingImportInfo): NewImportInfo | undefined {
@@ -763,7 +778,12 @@ namespace ts.codefix {
             }
         });
 
-        return arrayFrom(flatMapIterator(originalSymbolToExportInfos.values(), exportInfos => getCodeActionsForImport(exportInfos, convertToImportCodeFixContext(context, symbolToken, symbolName))));
+        const addToExistingDeclaration: CodeFixAction[] = [];
+        const addNewDeclaration: CodeFixAction[] = [];
+        originalSymbolToExportInfos.forEach(exportInfos => {
+            getCodeActionsForImport_separateExistingAndNew(exportInfos, convertToImportCodeFixContext(context, symbolToken, symbolName), addToExistingDeclaration, addNewDeclaration);
+        });
+        return [...addToExistingDeclaration, ...addNewDeclaration];
     }
 
     function checkSymbolHasMeaning({ declarations }: Symbol, meaning: SemanticMeaning): boolean {
diff --git a/src/services/codefixes/inferFromUsage.ts b/src/services/codefixes/inferFromUsage.ts
index 99556fc84de..8b36d3e5d51 100644
--- a/src/services/codefixes/inferFromUsage.ts
+++ b/src/services/codefixes/inferFromUsage.ts
@@ -34,7 +34,7 @@ namespace ts.codefix {
             let declaration!: Declaration;
             const changes = textChanges.ChangeTracker.with(context, changes => { declaration = doChange(changes, sourceFile, token, errorCode, program, cancellationToken); });
             return changes.length === 0 ? undefined
-                : [createCodeFixAction(changes, [getDiagnostic(errorCode, token), getNameOfDeclaration(declaration).getText(sourceFile)], fixId, Diagnostics.Infer_all_types_from_usage)];
+                : [createCodeFixAction(fixId, changes, [getDiagnostic(errorCode, token), getNameOfDeclaration(declaration).getText(sourceFile)], fixId, Diagnostics.Infer_all_types_from_usage)];
         },
         fixIds: [fixId],
         getAllCodeActions(context) {
diff --git a/src/services/codefixes/useDefaultImport.ts b/src/services/codefixes/useDefaultImport.ts
index 7a6a0acfc30..632cfc97e00 100644
--- a/src/services/codefixes/useDefaultImport.ts
+++ b/src/services/codefixes/useDefaultImport.ts
@@ -9,7 +9,7 @@ namespace ts.codefix {
             const info = getInfo(sourceFile, start);
             if (!info) return undefined;
             const changes = textChanges.ChangeTracker.with(context, t => doChange(t, sourceFile, info));
-            return [createCodeFixAction(changes, Diagnostics.Convert_to_default_import, fixId, Diagnostics.Convert_all_to_default_imports)];
+            return [createCodeFixAction(fixId, changes, Diagnostics.Convert_to_default_import, fixId, Diagnostics.Convert_all_to_default_imports)];
         },
         fixIds: [fixId],
         getAllCodeActions: context => codeFixAll(context, errorCodes, (changes, diag) => {
diff --git a/src/services/completions.ts b/src/services/completions.ts
index 40d3738f12f..f5aba7f99e8 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -1,5 +1,3 @@
-/// <reference path="./pathCompletions.ts" />
-
 /* @internal */
 namespace ts.Completions {
     export type Log = (message: string) => void;
@@ -27,7 +25,7 @@ namespace ts.Completions {
 
     const enum GlobalsSearch { Continue, Success, Fail }
 
-    export function getCompletionsAtPosition(host: LanguageServiceHost, program: Program, log: Log, sourceFile: SourceFile, position: number, preferences: UserPreferences): CompletionInfo | undefined {
+    export function getCompletionsAtPosition(host: LanguageServiceHost, program: Program, log: Log, sourceFile: SourceFile, position: number, preferences: UserPreferences, triggerCharacter: string | undefined): CompletionInfo | undefined {
         const typeChecker = program.getTypeChecker();
         const compilerOptions = program.getCompilerOptions();
         if (isInReferenceComment(sourceFile, position)) {
@@ -36,6 +34,7 @@ namespace ts.Completions {
         }
 
         const contextToken = findPrecedingToken(position, sourceFile);
+        if (triggerCharacter && !isValidTrigger(sourceFile, triggerCharacter, contextToken, position)) return undefined;
 
         if (isInString(sourceFile, position, contextToken)) {
             return !contextToken || !isStringLiteralLike(contextToken)
@@ -48,7 +47,7 @@ namespace ts.Completions {
             return getLabelCompletionAtPosition(contextToken.parent);
         }
 
-        const completionData = getCompletionData(program, log, sourceFile, position, preferences);
+        const completionData = getCompletionData(program, log, sourceFile, position, preferences, /*detailsEntryId*/ undefined);
         if (!completionData) {
             return undefined;
         }
@@ -487,9 +486,9 @@ namespace ts.Completions {
         previousToken: Node;
         readonly isJsxInitializer: IsJsxInitializer;
     }
-    function getSymbolCompletionFromEntryId(program: Program, log: Log, sourceFile: SourceFile, position: number, { name, source }: CompletionEntryIdentifier,
+    function getSymbolCompletionFromEntryId(program: Program, log: Log, sourceFile: SourceFile, position: number, entryId: CompletionEntryIdentifier,
     ): SymbolCompletion | { type: "request", request: Request } | { type: "none" } {
-        const completionData = getCompletionData(program, log, sourceFile, position, { includeCompletionsForModuleExports: true, includeCompletionsWithInsertText: true });
+        const completionData = getCompletionData(program, log, sourceFile, position, { includeCompletionsForModuleExports: true, includeCompletionsWithInsertText: true }, entryId);
         if (!completionData) {
             return { type: "none" };
         }
@@ -506,7 +505,9 @@ namespace ts.Completions {
         return firstDefined<Symbol, SymbolCompletion>(symbols, (symbol): SymbolCompletion => { // TODO: Shouldn't need return type annotation (GH#12632)
             const origin = symbolToOriginInfoMap[getSymbolId(symbol)];
             const info = getCompletionEntryDisplayNameForSymbol(symbol, program.getCompilerOptions().target, origin, completionKind);
-            return info && info.name === name && getSourceFromOrigin(origin) === source ? { type: "symbol" as "symbol", symbol, location, symbolToOriginInfoMap, previousToken, isJsxInitializer } : undefined;
+            return info && info.name === entryId.name && getSourceFromOrigin(origin) === entryId.source
+                ? { type: "symbol" as "symbol", symbol, location, symbolToOriginInfoMap, previousToken, isJsxInitializer }
+                : undefined;
         }) || { type: "none" };
     }
 
@@ -533,6 +534,7 @@ namespace ts.Completions {
         formatContext: formatting.FormatContext,
         getCanonicalFileName: GetCanonicalFileName,
         preferences: UserPreferences,
+        cancellationToken: CancellationToken,
     ): CompletionEntryDetails {
         const typeChecker = program.getTypeChecker();
         const compilerOptions = program.getCompilerOptions();
@@ -543,7 +545,7 @@ namespace ts.Completions {
             const stringLiteralCompletions = !contextToken || !isStringLiteralLike(contextToken)
                 ? undefined
                 : getStringLiteralCompletionEntries(sourceFile, contextToken, position, typeChecker, compilerOptions, host);
-            return stringLiteralCompletions && stringLiteralCompletionDetails(name, contextToken, stringLiteralCompletions, sourceFile, typeChecker);
+            return stringLiteralCompletions && stringLiteralCompletionDetails(name, contextToken, stringLiteralCompletions, sourceFile, typeChecker, cancellationToken);
         }
 
         // Compute all the completion symbols again.
@@ -565,7 +567,7 @@ namespace ts.Completions {
             case "symbol": {
                 const { symbol, location, symbolToOriginInfoMap, previousToken } = symbolCompletion;
                 const { codeActions, sourceDisplay } = getCompletionEntryCodeActionsAndSourceDisplay(symbolToOriginInfoMap, symbol, program, typeChecker, host, compilerOptions, sourceFile, previousToken, formatContext, getCanonicalFileName, program.getSourceFiles(), preferences);
-                return createCompletionDetailsForSymbol(symbol, typeChecker, sourceFile, location, codeActions, sourceDisplay);
+                return createCompletionDetailsForSymbol(symbol, typeChecker, sourceFile, location, cancellationToken, codeActions, sourceDisplay);
             }
             case "none":
                 // Didn't find a symbol with this name.  See if we can find a keyword instead.
@@ -573,12 +575,15 @@ namespace ts.Completions {
         }
     }
 
-    function createCompletionDetailsForSymbol(symbol: Symbol, checker: TypeChecker, sourceFile: SourceFile, location: Node, codeActions?: CodeAction[], sourceDisplay?: SymbolDisplayPart[]): CompletionEntryDetails {
-        const { displayParts, documentation, symbolKind, tags } = SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(checker, symbol, sourceFile, location, location, SemanticMeaning.All);
+    function createCompletionDetailsForSymbol(symbol: Symbol, checker: TypeChecker, sourceFile: SourceFile, location: Node, cancellationToken: CancellationToken, codeActions?: CodeAction[], sourceDisplay?: SymbolDisplayPart[]): CompletionEntryDetails {
+        const { displayParts, documentation, symbolKind, tags } =
+            checker.runWithCancellationToken(cancellationToken, checker =>
+                SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(checker, symbol, sourceFile, location, location, SemanticMeaning.All)
+            );
         return createCompletionDetails(symbol.name, SymbolDisplay.getSymbolModifiers(symbol), symbolKind, displayParts, documentation, tags, codeActions, sourceDisplay);
     }
 
-    function stringLiteralCompletionDetails(name: string, location: Node, completion: StringLiteralCompletion, sourceFile: SourceFile, checker: TypeChecker): CompletionEntryDetails | undefined {
+    function stringLiteralCompletionDetails(name: string, location: Node, completion: StringLiteralCompletion, sourceFile: SourceFile, checker: TypeChecker, cancellationToken: CancellationToken): CompletionEntryDetails | undefined {
         switch (completion.kind) {
             case StringLiteralCompletionKind.Paths: {
                 const match = find(completion.paths, p => p.name === name);
@@ -586,7 +591,7 @@ namespace ts.Completions {
             }
             case StringLiteralCompletionKind.Properties: {
                 const match = find(completion.symbols, s => s.name === name);
-                return match && createCompletionDetailsForSymbol(match, checker, sourceFile, location);
+                return match && createCompletionDetailsForSymbol(match, checker, sourceFile, location, cancellationToken);
             }
             case StringLiteralCompletionKind.Types:
                 return find(completion.types, t => t.value === name) ? createCompletionDetails(name, ScriptElementKindModifier.none, ScriptElementKind.typeElement, [textPart(name)]) : undefined;
@@ -756,6 +761,7 @@ namespace ts.Completions {
         sourceFile: SourceFile,
         position: number,
         preferences: Pick<UserPreferences, "includeCompletionsForModuleExports" | "includeCompletionsWithInsertText">,
+        detailsEntryId: CompletionEntryIdentifier | undefined,
     ): CompletionData | Request | undefined {
         const typeChecker = program.getTypeChecker();
 
@@ -844,7 +850,7 @@ namespace ts.Completions {
 
         // Check if the caret is at the end of an identifier; this is a partial identifier that we want to complete: e.g. a.toS|
         // Skip this partial identifier and adjust the contextToken to the token that precedes it.
-        if (contextToken && position <= contextToken.end && isWord(contextToken.kind)) {
+        if (contextToken && position <= contextToken.end && (isIdentifier(contextToken) || isKeyword(contextToken.kind))) {
             const start = timestamp();
             contextToken = findPrecedingToken(contextToken.getFullStart(), sourceFile, /*startNode*/ undefined, insideJsDocTagTypeExpression);
             log("getCompletionData: Get previous token 2: " + (timestamp() - start));
@@ -1199,14 +1205,11 @@ namespace ts.Completions {
             // If already using commonjs, don't introduce ES6.
             if (sourceFile.commonJsModuleIndicator) return false;
             // If some file is using ES6 modules, assume that it's OK to add more.
-            if (program.getSourceFiles().some(s => !s.isDeclarationFile && !program.isSourceFileFromExternalLibrary(s) && !!s.externalModuleIndicator)) {
-                return true;
-            }
+            if (programContainsEs6Modules(program)) return true;
             // For JS, stay on the safe side.
             if (isSourceFileJavaScript(sourceFile)) return false;
             // If module transpilation is enabled or we're targeting es6 or above, or not emitting, OK.
-            const compilerOptions = program.getCompilerOptions();
-            return !!compilerOptions.module || compilerOptions.target >= ScriptTarget.ES2015 || !!compilerOptions.noEmit;
+            return compilerOptionsIndicateEs6Modules(program.getCompilerOptions());
         }
 
         function isSnippetScope(scopeNode: Node): boolean {
@@ -1303,6 +1306,11 @@ namespace ts.Completions {
             const tokenTextLowerCase = tokenText.toLowerCase();
 
             codefix.forEachExternalModuleToImportFrom(typeChecker, sourceFile, program.getSourceFiles(), moduleSymbol => {
+                // Perf -- ignore other modules if this is a request for details
+                if (detailsEntryId && detailsEntryId.source && stripQuotes(moduleSymbol.name) !== detailsEntryId.source) {
+                    return;
+                }
+
                 for (let symbol of typeChecker.getExportsOfModule(moduleSymbol)) {
                     // Don't add a completion for a re-export, only for the original.
                     // The actual import fix might end up coming from a re-export -- we don't compute that until getting completion details.
@@ -1321,7 +1329,7 @@ namespace ts.Completions {
                     }
 
                     const origin: SymbolOriginInfo = { type: "export", moduleSymbol, isDefaultExport };
-                    if (stringContainsCharactersInOrder(getSymbolName(symbol, origin, target).toLowerCase(), tokenTextLowerCase)) {
+                    if (detailsEntryId || stringContainsCharactersInOrder(getSymbolName(symbol, origin, target).toLowerCase(), tokenTextLowerCase)) {
                         symbols.push(symbol);
                         symbolToOriginInfoMap[getSymbolId(symbol)] = origin;
                     }
@@ -1555,32 +1563,22 @@ namespace ts.Completions {
          * @returns true if 'symbols' was successfully populated; false otherwise.
          */
         function tryGetImportOrExportClauseCompletionSymbols(): GlobalsSearch {
-            const namedImportsOrExports = tryGetNamedImportsOrExportsForCompletion(contextToken);
-            if (!namedImportsOrExports) return undefined;
+            // `import { |` or `import { a as 0, | }`
+            const namedImportsOrExports = contextToken && (contextToken.kind === SyntaxKind.OpenBraceToken || contextToken.kind === SyntaxKind.CommaToken)
+                ? tryCast(contextToken.parent, isNamedImportsOrExports) : undefined;
+            if (!namedImportsOrExports) return GlobalsSearch.Continue;
 
             // cursor is in an import clause
             // try to show exported member for imported module
-            const declarationKind = namedImportsOrExports.kind === SyntaxKind.NamedImports ?
-                SyntaxKind.ImportDeclaration :
-                SyntaxKind.ExportDeclaration;
-            const importOrExportDeclaration = <ImportDeclaration | ExportDeclaration>getAncestor(namedImportsOrExports, declarationKind);
-            const moduleSpecifier = importOrExportDeclaration.moduleSpecifier;
-
-            if (!moduleSpecifier) {
-                return GlobalsSearch.Fail;
-            }
+            const { moduleSpecifier } = namedImportsOrExports.kind === SyntaxKind.NamedImports ? namedImportsOrExports.parent.parent : namedImportsOrExports.parent;
+            const moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(moduleSpecifier);
+            if (!moduleSpecifierSymbol) return GlobalsSearch.Fail;
 
             completionKind = CompletionKind.MemberLike;
             isNewIdentifierLocation = false;
-
-            const moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(moduleSpecifier);
-            if (!moduleSpecifierSymbol) {
-                symbols = emptyArray;
-                return GlobalsSearch.Fail;
-            }
-
             const exports = typeChecker.getExportsAndPropertiesOfModule(moduleSpecifierSymbol);
-            symbols = filterNamedImportOrExportCompletionItems(exports, namedImportsOrExports.elements);
+            const existing = arrayToSet<ImportOrExportSpecifier>(namedImportsOrExports.elements, n => isCurrentlyEditingNode(n) ? undefined : (n.propertyName || n.name).escapedText);
+            symbols = exports.filter(e => e.escapedName !== InternalSymbolName.Default && !existing.get(e.escapedName));
             return GlobalsSearch.Success;
         }
 
@@ -1648,26 +1646,6 @@ namespace ts.Completions {
             return undefined;
         }
 
-        /**
-         * Returns the containing list of named imports or exports of a context token,
-         * on the condition that one exists and that the context implies completion should be given.
-         */
-        function tryGetNamedImportsOrExportsForCompletion(contextToken: Node): NamedImportsOrExports {
-            if (contextToken) {
-                switch (contextToken.kind) {
-                    case SyntaxKind.OpenBraceToken:  // import { |
-                    case SyntaxKind.CommaToken:      // import { a as 0, |
-                        switch (contextToken.parent.kind) {
-                            case SyntaxKind.NamedImports:
-                            case SyntaxKind.NamedExports:
-                                return <NamedImportsOrExports>contextToken.parent;
-                        }
-                }
-            }
-
-            return undefined;
-        }
-
         function isConstructorParameterCompletion(node: Node): boolean {
             return !!node.parent && isParameter(node.parent) && isConstructorDeclaration(node.parent.parent)
                 && (isParameterPropertyModifier(node.kind) || isDeclarationName(node));
@@ -1911,31 +1889,6 @@ namespace ts.Completions {
             return false;
         }
 
-        /**
-         * Filters out completion suggestions for named imports or exports.
-         *
-         * @param exportsOfModule          The list of symbols which a module exposes.
-         * @param namedImportsOrExports    The list of existing import/export specifiers in the import/export clause.
-         *
-         * @returns Symbols to be suggested at an import/export clause, barring those whose named imports/exports
-         *          do not occur at the current position and have not otherwise been typed.
-         */
-        function filterNamedImportOrExportCompletionItems(exportsOfModule: Symbol[], namedImportsOrExports: ReadonlyArray<ImportOrExportSpecifier>): Symbol[] {
-            const existingImportsOrExports = createUnderscoreEscapedMap<boolean>();
-
-            for (const element of namedImportsOrExports) {
-                // If this is the current item we are editing right now, do not filter it out
-                if (isCurrentlyEditingNode(element)) {
-                    continue;
-                }
-
-                const name = element.propertyName || element.name;
-                existingImportsOrExports.set(name.escapedText, true);
-            }
-
-            return exportsOfModule.filter(e => e.escapedName !== InternalSymbolName.Default && !existingImportsOrExports.get(e.escapedName));
-        }
-
         /**
          * Filters out completion suggestions for named imports or exports.
          *
@@ -2248,10 +2201,37 @@ namespace ts.Completions {
 
     // TODO: GH#19856 Would like to return `node is Node & { parent: (ClassElement | TypeElement) & { parent: ObjectTypeDeclaration } }` but then compilation takes > 10 minutes
     function isFromObjectTypeDeclaration(node: Node): boolean {
-        return node.parent && (isClassElement(node.parent) || isTypeElement(node.parent)) && isObjectTypeDeclaration(node.parent.parent);
+        return node.parent && isClassOrTypeElement(node.parent) && isObjectTypeDeclaration(node.parent.parent);
     }
 
     function hasIndexSignature(type: Type): boolean {
         return !!type.getStringIndexType() || !!type.getNumberIndexType();
     }
+
+    function isValidTrigger(sourceFile: SourceFile, triggerCharacter: string, contextToken: Node, position: number): boolean {
+        switch (triggerCharacter) {
+            case '"':
+            case "'":
+            case "`":
+                // Only automatically bring up completions if this is an opening quote.
+                return isStringLiteralOrTemplate(contextToken) && position === contextToken.getStart(sourceFile) + 1;
+            case "<":
+                // Opening JSX tag
+                return contextToken.kind === SyntaxKind.LessThanToken && contextToken.parent.kind !== SyntaxKind.BinaryExpression;
+            default:
+                return Debug.fail(triggerCharacter);
+        }
+    }
+
+    function isStringLiteralOrTemplate(node: Node): node is StringLiteralLike | TemplateExpression | TaggedTemplateExpression {
+        switch (node.kind) {
+            case SyntaxKind.StringLiteral:
+            case SyntaxKind.NoSubstitutionTemplateLiteral:
+            case SyntaxKind.TemplateExpression:
+            case SyntaxKind.TaggedTemplateExpression:
+                return true;
+            default:
+                return false;
+        }
+    }
 }
diff --git a/src/services/documentHighlights.ts b/src/services/documentHighlights.ts
index 8d48d526a4b..69c75548fe5 100644
--- a/src/services/documentHighlights.ts
+++ b/src/services/documentHighlights.ts
@@ -1,7 +1,7 @@
 /* @internal */
 namespace ts.DocumentHighlights {
     export function getDocumentHighlights(program: Program, cancellationToken: CancellationToken, sourceFile: SourceFile, position: number, sourceFilesToSearch: ReadonlyArray<SourceFile>): DocumentHighlights[] | undefined {
-        const node = getTouchingWord(sourceFile, position, /*includeJsDocComment*/ true);
+        const node = getTouchingPropertyName(sourceFile, position, /*includeJsDocComment*/ true);
 
         if (node.parent && (isJsxOpeningElement(node.parent) && node.parent.tagName === node || isJsxClosingElement(node.parent))) {
             // For a JSX element, just highlight the matching tag, not all references.
@@ -22,10 +22,20 @@ namespace ts.DocumentHighlights {
     }
 
     function getSemanticDocumentHighlights(position: number, node: Node, program: Program, cancellationToken: CancellationToken, sourceFilesToSearch: ReadonlyArray<SourceFile>): DocumentHighlights[] | undefined {
-        const referenceEntries = FindAllReferences.getReferenceEntriesForNode(position, node, program, sourceFilesToSearch, cancellationToken);
+        const sourceFilesSet = arrayToSet(sourceFilesToSearch, f => f.fileName);
+        const referenceEntries = FindAllReferences.getReferenceEntriesForNode(position, node, program, sourceFilesToSearch, cancellationToken, /*options*/ undefined, sourceFilesSet);
         if (!referenceEntries) return undefined;
         const map = arrayToMultiMap(referenceEntries.map(FindAllReferences.toHighlightSpan), e => e.fileName, e => e.span);
-        return arrayFrom(map.entries(), ([fileName, highlightSpans]) => ({ fileName, highlightSpans }));
+        return arrayFrom(map.entries(), ([fileName, highlightSpans]) => {
+            if (!sourceFilesSet.has(fileName)) {
+                Debug.assert(program.redirectTargetsSet.has(fileName));
+                const redirectTarget = program.getSourceFile(fileName);
+                const redirect = find(sourceFilesToSearch, f => f.redirectInfo && f.redirectInfo.redirectTarget === redirectTarget)!;
+                fileName = redirect.fileName;
+                Debug.assert(sourceFilesSet.has(fileName));
+            }
+            return { fileName, highlightSpans };
+        });
     }
 
     function getSyntacticDocumentHighlights(node: Node, sourceFile: SourceFile): DocumentHighlights[] {
diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts
index 41d08bc6582..2be21476fab 100644
--- a/src/services/findAllReferences.ts
+++ b/src/services/findAllReferences.ts
@@ -1,5 +1,3 @@
-/// <reference path="./importTracker.ts" />
-
 /* @internal */
 namespace ts.FindAllReferences {
     export interface SymbolAndEntries {
@@ -43,11 +41,14 @@ namespace ts.FindAllReferences {
 
     export function findReferencedSymbols(program: Program, cancellationToken: CancellationToken, sourceFiles: ReadonlyArray<SourceFile>, sourceFile: SourceFile, position: number): ReferencedSymbol[] | undefined {
         const node = getTouchingPropertyName(sourceFile, position, /*includeJsDocComment*/ true);
-        const referencedSymbols = Core.getReferencedSymbolsForNode(position, node, program, sourceFiles, cancellationToken, /*options*/ {});
+        const referencedSymbols = Core.getReferencedSymbolsForNode(position, node, program, sourceFiles, cancellationToken);
         const checker = program.getTypeChecker();
         return !referencedSymbols || !referencedSymbols.length ? undefined : mapDefined<SymbolAndEntries, ReferencedSymbol>(referencedSymbols, ({ definition, references }) =>
             // Only include referenced symbols that have a valid definition.
-            definition && { definition: definitionToReferencedSymbolDefinitionInfo(definition, checker, node), references: references.map(toReferenceEntry) });
+            definition && {
+                definition: checker.runWithCancellationToken(cancellationToken, checker => definitionToReferencedSymbolDefinitionInfo(definition, checker, node)),
+                references: references.map(toReferenceEntry)
+            });
     }
 
     export function getImplementationsAtPosition(program: Program, cancellationToken: CancellationToken, sourceFiles: ReadonlyArray<SourceFile>, sourceFile: SourceFile, position: number): ImplementationLocation[] {
@@ -88,8 +89,8 @@ namespace ts.FindAllReferences {
         return map(flattenEntries(Core.getReferencedSymbolsForNode(position, node, program, sourceFiles, cancellationToken, options)), toReferenceEntry);
     }
 
-    export function getReferenceEntriesForNode(position: number, node: Node, program: Program, sourceFiles: ReadonlyArray<SourceFile>, cancellationToken: CancellationToken, options: Options = {}): Entry[] | undefined {
-        return flattenEntries(Core.getReferencedSymbolsForNode(position, node, program, sourceFiles, cancellationToken, options));
+    export function getReferenceEntriesForNode(position: number, node: Node, program: Program, sourceFiles: ReadonlyArray<SourceFile>, cancellationToken: CancellationToken, options: Options = {}, sourceFilesSet: ReadonlyMap<true> = arrayToSet(sourceFiles, f => f.fileName)): Entry[] | undefined {
+        return flattenEntries(Core.getReferencedSymbolsForNode(position, node, program, sourceFiles, cancellationToken, options, sourceFilesSet));
     }
 
     function flattenEntries(referenceSymbols: SymbolAndEntries[]): Entry[] {
@@ -132,8 +133,7 @@ namespace ts.FindAllReferences {
 
         const { node, name, kind, displayParts } = info;
         const sourceFile = node.getSourceFile();
-        const textSpan = getTextSpan(isComputedPropertyName(node) ? node.expression : node, sourceFile);
-        return { containerKind: ScriptElementKind.unknown, containerName: "", fileName: sourceFile.fileName, kind, name, textSpan, displayParts };
+        return { containerKind: ScriptElementKind.unknown, containerName: "", fileName: sourceFile.fileName, kind, name, textSpan: getTextSpan(isComputedPropertyName(node) ? node.expression : node, sourceFile), displayParts };
     }
 
     function getDefinitionKindAndDisplayParts(symbol: Symbol, checker: TypeChecker, node: Node): { displayParts: SymbolDisplayPart[], kind: ScriptElementKind } {
@@ -150,21 +150,23 @@ namespace ts.FindAllReferences {
         }
 
         const { node, isInString } = entry;
+        const sourceFile = node.getSourceFile();
         return {
-            fileName: node.getSourceFile().fileName,
-            textSpan: getTextSpan(node),
+            fileName: sourceFile.fileName,
+            textSpan: getTextSpan(node, sourceFile),
             isWriteAccess: isWriteAccessForReference(node),
             isDefinition: node.kind === SyntaxKind.DefaultKeyword
                 || isAnyDeclarationName(node)
                 || isLiteralComputedPropertyDeclarationName(node),
-            isInString
+            isInString,
         };
     }
 
     function toImplementationLocation(entry: Entry, checker: TypeChecker): ImplementationLocation {
         if (entry.type === "node") {
             const { node } = entry;
-            return { textSpan: getTextSpan(node), fileName: node.getSourceFile().fileName, ...implementationKindDisplayParts(node, checker) };
+            const sourceFile = node.getSourceFile();
+            return { textSpan: getTextSpan(node, sourceFile), fileName: sourceFile.fileName, ...implementationKindDisplayParts(node, checker) };
         }
         else {
             const { textSpan, fileName } = entry;
@@ -201,17 +203,17 @@ namespace ts.FindAllReferences {
         }
 
         const { node, isInString } = entry;
-        const fileName = entry.node.getSourceFile().fileName;
+        const sourceFile = node.getSourceFile();
         const writeAccess = isWriteAccessForReference(node);
         const span: HighlightSpan = {
-            textSpan: getTextSpan(node),
+            textSpan: getTextSpan(node, sourceFile),
             kind: writeAccess ? HighlightSpanKind.writtenReference : HighlightSpanKind.reference,
             isInString
         };
-        return { fileName, span };
+        return { fileName: sourceFile.fileName, span };
     }
 
-    function getTextSpan(node: Node, sourceFile?: SourceFile): TextSpan {
+    function getTextSpan(node: Node, sourceFile: SourceFile): TextSpan {
         let start = node.getStart(sourceFile);
         let end = node.getEnd();
         if (node.kind === SyntaxKind.StringLiteral) {
@@ -231,10 +233,10 @@ namespace ts.FindAllReferences {
 /* @internal */
 namespace ts.FindAllReferences.Core {
     /** Core find-all-references algorithm. Handles special cases before delegating to `getReferencedSymbolsForSymbol`. */
-    export function getReferencedSymbolsForNode(position: number, node: Node, program: Program, sourceFiles: ReadonlyArray<SourceFile>, cancellationToken: CancellationToken, options: Options = {}): SymbolAndEntries[] | undefined {
+    export function getReferencedSymbolsForNode(position: number, node: Node, program: Program, sourceFiles: ReadonlyArray<SourceFile>, cancellationToken: CancellationToken, options: Options = {}, sourceFilesSet: ReadonlyMap<true> = arrayToSet(sourceFiles, f => f.fileName)): SymbolAndEntries[] | undefined {
         if (isSourceFile(node)) {
             const reference = GoToDefinition.getReferenceAtPosition(node, position, program);
-            return reference && getReferencedSymbolsForModule(program, program.getTypeChecker().getMergedSymbol(reference.file.symbol), sourceFiles);
+            return reference && getReferencedSymbolsForModule(program, program.getTypeChecker().getMergedSymbol(reference.file.symbol), sourceFiles, sourceFilesSet);
         }
 
         if (!options.implementations) {
@@ -254,10 +256,10 @@ namespace ts.FindAllReferences.Core {
         }
 
         if (symbol.flags & SymbolFlags.Module && isModuleReferenceLocation(node)) {
-            return getReferencedSymbolsForModule(program, symbol, sourceFiles);
+            return getReferencedSymbolsForModule(program, symbol, sourceFiles, sourceFilesSet);
         }
 
-        return getReferencedSymbolsForSymbol(symbol, node, sourceFiles, checker, cancellationToken, options);
+        return getReferencedSymbolsForSymbol(symbol, node, sourceFiles, sourceFilesSet, checker, cancellationToken, options);
     }
 
     function isModuleReferenceLocation(node: Node): boolean {
@@ -277,7 +279,7 @@ namespace ts.FindAllReferences.Core {
         }
     }
 
-    function getReferencedSymbolsForModule(program: Program, symbol: Symbol, sourceFiles: ReadonlyArray<SourceFile>): SymbolAndEntries[] {
+    function getReferencedSymbolsForModule(program: Program, symbol: Symbol, sourceFiles: ReadonlyArray<SourceFile>, sourceFilesSet: ReadonlyMap<true>): SymbolAndEntries[] {
         Debug.assert(!!symbol.valueDeclaration);
 
         const references = findModuleReferences(program, sourceFiles, symbol).map<Entry>(reference => {
@@ -299,7 +301,9 @@ namespace ts.FindAllReferences.Core {
                     // Don't include the source file itself. (This may not be ideal behavior, but awkward to include an entire file as a reference.)
                     break;
                 case SyntaxKind.ModuleDeclaration:
-                    references.push({ type: "node", node: (decl as ModuleDeclaration).name });
+                    if (sourceFilesSet.has(decl.getSourceFile().fileName)) {
+                        references.push({ type: "node", node: (decl as ModuleDeclaration).name });
+                    }
                     break;
                 default:
                     Debug.fail("Expected a module symbol to be declared by a SourceFile or ModuleDeclaration.");
@@ -339,14 +343,14 @@ namespace ts.FindAllReferences.Core {
     }
 
     /** Core find-all-references algorithm for a normal symbol. */
-    function getReferencedSymbolsForSymbol(symbol: Symbol, node: Node, sourceFiles: ReadonlyArray<SourceFile>, checker: TypeChecker, cancellationToken: CancellationToken, options: Options): SymbolAndEntries[] {
+    function getReferencedSymbolsForSymbol(symbol: Symbol, node: Node, sourceFiles: ReadonlyArray<SourceFile>, sourceFilesSet: ReadonlyMap<true>, checker: TypeChecker, cancellationToken: CancellationToken, options: Options): SymbolAndEntries[] {
         symbol = skipPastExportOrImportSpecifierOrUnion(symbol, node, checker) || symbol;
 
         // Compute the meaning from the location and the symbol it references
         const searchMeaning = getIntersectingMeaningFromDeclarations(node, symbol);
 
         const result: SymbolAndEntries[] = [];
-        const state = new State(sourceFiles, getSpecialSearchKind(node), checker, cancellationToken, searchMeaning, options, result);
+        const state = new State(sourceFiles, sourceFilesSet, getSpecialSearchKind(node), checker, cancellationToken, searchMeaning, options, result);
 
         if (node.kind === SyntaxKind.DefaultKeyword) {
             addReference(node, symbol, state);
@@ -424,7 +428,8 @@ namespace ts.FindAllReferences.Core {
         readonly text: string;
         readonly escapedText: __String;
         /** Only set if `options.implementations` is true. These are the symbols checked to get the implementations of a property access. */
-        readonly parents: Symbol[] | undefined;
+        readonly parents: ReadonlyArray<Symbol> | undefined;
+        readonly allSearchSymbols: ReadonlyArray<Symbol>;
 
         /**
          * Whether a symbol is in the search set.
@@ -469,10 +474,9 @@ namespace ts.FindAllReferences.Core {
          */
         readonly markSeenReExportRHS = nodeSeenTracker();
 
-        private readonly includedSourceFiles: Map<true>;
-
         constructor(
             readonly sourceFiles: ReadonlyArray<SourceFile>,
+            readonly sourceFilesSet: ReadonlyMap<true>,
             /** True if we're searching for constructor references. */
             readonly specialSearchKind: SpecialSearchKind,
             readonly checker: TypeChecker,
@@ -480,17 +484,16 @@ namespace ts.FindAllReferences.Core {
             readonly searchMeaning: SemanticMeaning,
             readonly options: Options,
             private readonly result: Push<SymbolAndEntries>) {
-            this.includedSourceFiles = arrayToSet(sourceFiles, s => s.fileName);
         }
 
         includesSourceFile(sourceFile: SourceFile): boolean {
-            return this.includedSourceFiles.has(sourceFile.fileName);
+            return this.sourceFilesSet.has(sourceFile.fileName);
         }
 
         private importTracker: ImportTracker | undefined;
         /** Gets every place to look for references of an exported symbols. See `ImportsResult` in `importTracker.ts` for more documentation. */
         getImportSearches(exportSymbol: Symbol, exportInfo: ExportInfo): ImportsResult {
-            if (!this.importTracker) this.importTracker = createImportTracker(this.sourceFiles, this.checker, this.cancellationToken);
+            if (!this.importTracker) this.importTracker = createImportTracker(this.sourceFiles, this.sourceFilesSet, this.checker, this.cancellationToken);
             return this.importTracker(exportSymbol, exportInfo, this.options.isForRename);
         }
 
@@ -502,14 +505,11 @@ namespace ts.FindAllReferences.Core {
             // here appears to be intentional).
             const {
                 text = stripQuotes(unescapeLeadingUnderscores((getLocalSymbolForExportDefault(symbol) || symbol).escapedName)),
-                allSearchSymbols,
+                allSearchSymbols = [symbol],
             } = searchOptions;
             const escapedText = escapeLeadingUnderscores(text);
             const parents = this.options.implementations && getParentSymbolsOfPropertyAccess(location, symbol, this.checker);
-            return {
-                symbol, comingFrom, text, escapedText, parents,
-                includes: referenceSymbol => allSearchSymbols ? contains(allSearchSymbols, referenceSymbol) : referenceSymbol === symbol,
-            };
+            return { symbol, comingFrom, text, escapedText, parents, allSearchSymbols, includes: sym => contains(allSearchSymbols, sym) };
         }
 
         private readonly symbolIdToReferences: Entry[][] = [];
@@ -536,13 +536,17 @@ namespace ts.FindAllReferences.Core {
         }
 
         // Source file ID → symbol ID → Whether the symbol has been searched for in the source file.
-        private readonly sourceFileToSeenSymbols: true[][] = [];
+        private readonly sourceFileToSeenSymbols: Map<true>[] = [];
         /** Returns `true` the first time we search for a symbol in a file and `false` afterwards. */
-        markSearchedSymbol(sourceFile: SourceFile, symbol: Symbol): boolean {
+        markSearchedSymbols(sourceFile: SourceFile, symbols: ReadonlyArray<Symbol>): boolean {
             const sourceId = getNodeId(sourceFile);
-            const symbolId = getSymbolId(symbol);
-            const seenSymbols = this.sourceFileToSeenSymbols[sourceId] || (this.sourceFileToSeenSymbols[sourceId] = []);
-            return !seenSymbols[symbolId] && (seenSymbols[symbolId] = true);
+            const seenSymbols = this.sourceFileToSeenSymbols[sourceId] || (this.sourceFileToSeenSymbols[sourceId] = createMap<true>());
+
+            let anyNewSymbols = false;
+            for (const sym of symbols) {
+                anyNewSymbols = addToSeen(seenSymbols, getSymbolId(sym)) || anyNewSymbols;
+            }
+            return anyNewSymbols;
         }
     }
 
@@ -554,7 +558,10 @@ namespace ts.FindAllReferences.Core {
         if (singleReferences.length) {
             const addRef = state.referenceAdder(exportSymbol);
             for (const singleRef of singleReferences) {
-                addRef(singleRef);
+                // At `default` in `import { default as x }` or `export { default as x }`, do add a reference, but do not rename.
+                if (!(state.options.isForRename && (isExportSpecifier(singleRef.parent) || isImportSpecifier(singleRef.parent)) && singleRef.escapedText === InternalSymbolName.Default)) {
+                    addRef(singleRef);
+                }
             }
         }
 
@@ -706,12 +713,19 @@ namespace ts.FindAllReferences.Core {
     export function isSymbolReferencedInFile(definition: Identifier, checker: TypeChecker, sourceFile: SourceFile) {
         const symbol = checker.getSymbolAtLocation(definition);
         if (!symbol) return true; // Be lenient with invalid code.
-        return getPossibleSymbolReferencePositions(sourceFile, symbol.name).some(position => {
-            const token = tryCast(getTouchingPropertyName(sourceFile, position, /*includeJsDocComment*/ true), isIdentifier);
-            return token && token !== definition && token.escapedText === definition.escapedText && checker.getSymbolAtLocation(token) === symbol;
+        return getPossibleSymbolReferenceNodes(sourceFile, symbol.name).some(token => {
+            if (!isIdentifier(token) || token === definition || token.escapedText !== definition.escapedText) return false;
+            const referenceSymbol = checker.getSymbolAtLocation(token);
+            return referenceSymbol === symbol
+                || checker.getShorthandAssignmentValueSymbol(token.parent) === symbol
+                || isExportSpecifier(token.parent) && getLocalSymbolForExportSpecifier(token, referenceSymbol, token.parent, checker) === symbol;
         });
     }
 
+    function getPossibleSymbolReferenceNodes(sourceFile: SourceFile, symbolName: string, container: Node = sourceFile): ReadonlyArray<Node> {
+        return getPossibleSymbolReferencePositions(sourceFile, symbolName, container).map(pos => getTouchingPropertyName(sourceFile, pos, /*includeJsDocComment*/ true));
+    }
+
     function getPossibleSymbolReferencePositions(sourceFile: SourceFile, symbolName: string, container: Node = sourceFile): ReadonlyArray<number> {
         const positions: number[] = [];
 
@@ -750,11 +764,9 @@ namespace ts.FindAllReferences.Core {
     function getLabelReferencesInNode(container: Node, targetLabel: Identifier): SymbolAndEntries[] {
         const sourceFile = container.getSourceFile();
         const labelName = targetLabel.text;
-        const references = mapDefined(getPossibleSymbolReferencePositions(sourceFile, labelName, container), position => {
-            const node = getTouchingWord(sourceFile, position, /*includeJsDocComment*/ false);
+        const references = mapDefined(getPossibleSymbolReferenceNodes(sourceFile, labelName, container), node =>
             // Only pick labels that are either the target label, or have a target that is the target label
-            return node && (node === targetLabel || (isJumpStatementTarget(node) && getTargetLabel(node, labelName) === targetLabel)) ? nodeEntry(node) : undefined;
-        });
+            node === targetLabel || (isJumpStatementTarget(node) && getTargetLabel(node, labelName) === targetLabel) ? nodeEntry(node) : undefined);
         return [{ definition: { type: "label", node: targetLabel }, references }];
     }
 
@@ -784,10 +796,8 @@ namespace ts.FindAllReferences.Core {
     function getAllReferencesForKeyword(sourceFiles: ReadonlyArray<SourceFile>, keywordKind: SyntaxKind, cancellationToken: CancellationToken): SymbolAndEntries[] {
         const references = flatMap(sourceFiles, sourceFile => {
             cancellationToken.throwIfCancellationRequested();
-            return mapDefined(getPossibleSymbolReferencePositions(sourceFile, tokenToString(keywordKind), sourceFile), position => {
-                const referenceLocation = getTouchingPropertyName(sourceFile, position, /*includeJsDocComment*/ true);
-                return referenceLocation.kind === keywordKind ? nodeEntry(referenceLocation) : undefined;
-            });
+            return mapDefined(getPossibleSymbolReferenceNodes(sourceFile, tokenToString(keywordKind), sourceFile), referenceLocation =>
+                referenceLocation.kind === keywordKind ? nodeEntry(referenceLocation) : undefined);
         });
         return references.length ? [{ definition: { type: "keyword", node: references[0].node }, references }] : undefined;
     }
@@ -803,7 +813,7 @@ namespace ts.FindAllReferences.Core {
      * searchLocation: a node where the search value
      */
     function getReferencesInContainer(container: Node, sourceFile: SourceFile, search: Search, state: State, addReferencesHere: boolean): void {
-        if (!state.markSearchedSymbol(sourceFile, search.symbol)) {
+        if (!state.markSearchedSymbols(sourceFile, search.allSearchSymbols)) {
             return;
         }
 
@@ -883,7 +893,10 @@ namespace ts.FindAllReferences.Core {
         }
 
         if (!propertyName) {
-            addRef();
+            // Don't rename at `export { default } from "m";`. (but do continue to search for imports of the re-export)
+            if (!(state.options.isForRename && name.escapedText === InternalSymbolName.Default)) {
+                addRef();
+            }
         }
         else if (referenceLocation === propertyName) {
             // For `export { foo as bar } from "baz"`, "`foo`" will be added from the singleReferences for import searches of the original export.
@@ -1004,21 +1017,17 @@ namespace ts.FindAllReferences.Core {
 
     function addClassStaticThisReferences(referenceLocation: Node, search: Search, state: State): void {
         addReference(referenceLocation, search.symbol, state);
-        if (!state.options.isForRename && isClassLike(referenceLocation.parent)) {
-            Debug.assert(referenceLocation.parent.name === referenceLocation);
-            // This is the class declaration.
-            addStaticThisReferences(referenceLocation.parent, state.referenceAdder(search.symbol));
-        }
-    }
-
-    function addStaticThisReferences(classLike: ClassLikeDeclaration, pusher: (node: Node) => void): void {
+        const classLike = referenceLocation.parent;
+        if (state.options.isForRename || !isClassLike(classLike)) return;
+        Debug.assert(classLike.name === referenceLocation);
+        const addRef = state.referenceAdder(search.symbol);
         for (const member of classLike.members) {
             if (!(isMethodOrAccessor(member) && hasModifier(member, ModifierFlags.Static))) {
                 continue;
             }
             member.body.forEachChild(function cb(node) {
                 if (node.kind === SyntaxKind.ThisKeyword) {
-                    pusher(node);
+                    addRef(node);
                 }
                 else if (!isFunctionLike(node)) {
                     node.forEachChild(cb);
@@ -1027,10 +1036,6 @@ namespace ts.FindAllReferences.Core {
         }
     }
 
-    function getPropertyAccessExpressionFromRightHandSide(node: Node): PropertyAccessExpression {
-        return isRightSideOfPropertyAccess(node) && <PropertyAccessExpression>node.parent;
-    }
-
     /**
      * `classSymbol` is the class where the constructor was defined.
      * Reference the constructor and all calls to `new this()`.
@@ -1102,69 +1107,37 @@ namespace ts.FindAllReferences.Core {
         }
 
         // If we got a type reference, try and see if the reference applies to any expressions that can implement an interface
-        const containingTypeReference = getContainingTypeReference(refNode);
-        if (containingTypeReference && state.markSeenContainingTypeReference(containingTypeReference)) {
-            const parent = containingTypeReference.parent;
-            if (hasType(parent) && parent.type === containingTypeReference && hasInitializer(parent) && isImplementationExpression(parent.initializer)) {
-                addReference(parent.initializer);
+        // Find the first node whose parent isn't a type node -- i.e., the highest type node.
+        const typeNode = findAncestor(refNode, a => !isQualifiedName(a.parent) && !isTypeNode(a.parent) && !isTypeElement(a.parent));
+        const typeHavingNode = typeNode.parent;
+        if (hasType(typeHavingNode) && typeHavingNode.type === typeNode && state.markSeenContainingTypeReference(typeHavingNode)) {
+            if (hasInitializer(typeHavingNode)) {
+                addIfImplementation(typeHavingNode.initializer);
             }
-            else if (isFunctionLike(parent) && parent.type === containingTypeReference && (parent as FunctionLikeDeclaration).body) {
-                const body = (parent as FunctionLikeDeclaration).body;
+            else if (isFunctionLike(typeHavingNode) && (typeHavingNode as FunctionLikeDeclaration).body) {
+                const body = (typeHavingNode as FunctionLikeDeclaration).body;
                 if (body.kind === SyntaxKind.Block) {
                     forEachReturnStatement(<Block>body, returnStatement => {
-                        if (returnStatement.expression && isImplementationExpression(returnStatement.expression)) {
-                            addReference(returnStatement.expression);
-                        }
+                        if (returnStatement.expression) addIfImplementation(returnStatement.expression);
                     });
                 }
-                else if (isImplementationExpression(body)) {
-                    addReference(body);
+                else {
+                    addIfImplementation(body);
                 }
             }
-            else if (isAssertionExpression(parent) && isImplementationExpression(parent.expression)) {
-                addReference(parent.expression);
+            else if (isAssertionExpression(typeHavingNode)) {
+                addIfImplementation(typeHavingNode.expression);
             }
         }
+
+        function addIfImplementation(e: Expression): void {
+            if (isImplementationExpression(e)) addReference(e);
+        }
     }
 
-    function getSymbolsForClassAndInterfaceComponents(type: UnionOrIntersectionType, result: Symbol[] = []): Symbol[] {
-        for (const componentType of type.types) {
-            if (componentType.symbol && componentType.symbol.getFlags() & (SymbolFlags.Class | SymbolFlags.Interface)) {
-                result.push(componentType.symbol);
-            }
-            if (componentType.isUnionOrIntersection()) {
-                getSymbolsForClassAndInterfaceComponents(componentType, result);
-            }
-        }
-        return result;
-    }
-
-    function getContainingTypeReference(node: Node): Node {
-        let topLevelTypeReference: Node;
-
-        while (node) {
-            if (isTypeNode(node)) {
-                topLevelTypeReference = node;
-            }
-            node = node.parent;
-        }
-
-        return topLevelTypeReference;
-    }
-
-    function getContainingClassIfInHeritageClause(node: Node): ClassLikeDeclaration {
-        if (node && node.parent) {
-            if (node.kind === SyntaxKind.ExpressionWithTypeArguments
-                && node.parent.kind === SyntaxKind.HeritageClause
-                && isClassLike(node.parent.parent)) {
-                return node.parent.parent;
-            }
-
-            else if (node.kind === SyntaxKind.Identifier || node.kind === SyntaxKind.PropertyAccessExpression) {
-                return getContainingClassIfInHeritageClause(node.parent);
-            }
-        }
-        return undefined;
+    function getContainingClassIfInHeritageClause(node: Node): ClassLikeDeclaration | InterfaceDeclaration {
+        return isIdentifier(node) || isPropertyAccessExpression(node) ? getContainingClassIfInHeritageClause(node.parent)
+            : isExpressionWithTypeArguments(node) ? tryCast(node.parent.parent, isClassLike) : undefined;
     }
 
     /**
@@ -1251,9 +1224,8 @@ namespace ts.FindAllReferences.Core {
         }
 
         const sourceFile = searchSpaceNode.getSourceFile();
-        const references = mapDefined(getPossibleSymbolReferencePositions(sourceFile, "super", searchSpaceNode), position => {
-            const node = getTouchingWord(sourceFile, position, /*includeJsDocComment*/ false);
-            if (!node || node.kind !== SyntaxKind.SuperKeyword) {
+        const references = mapDefined(getPossibleSymbolReferenceNodes(sourceFile, "super", searchSpaceNode), node => {
+            if (node.kind !== SyntaxKind.SuperKeyword) {
                 return;
             }
 
@@ -1303,12 +1275,30 @@ namespace ts.FindAllReferences.Core {
                 return undefined;
         }
 
-        const references: Entry[] = [];
-        for (const sourceFile of searchSpaceNode.kind === SyntaxKind.SourceFile ? sourceFiles : [searchSpaceNode.getSourceFile()]) {
+        const references = flatMap(searchSpaceNode.kind === SyntaxKind.SourceFile ? sourceFiles : [searchSpaceNode.getSourceFile()], sourceFile => {
             cancellationToken.throwIfCancellationRequested();
-            const positions = getPossibleSymbolReferencePositions(sourceFile, "this", isSourceFile(searchSpaceNode) ? sourceFile : searchSpaceNode);
-            getThisReferencesInFile(sourceFile, searchSpaceNode.kind === SyntaxKind.SourceFile ? sourceFile : searchSpaceNode, positions, staticFlag, references);
-        }
+            return getPossibleSymbolReferenceNodes(sourceFile, "this", isSourceFile(searchSpaceNode) ? sourceFile : searchSpaceNode).filter(node => {
+                if (!isThis(node)) {
+                    return false;
+                }
+                const container = getThisContainer(node, /* includeArrowFunctions */ false);
+                switch (searchSpaceNode.kind) {
+                    case SyntaxKind.FunctionExpression:
+                    case SyntaxKind.FunctionDeclaration:
+                        return searchSpaceNode.symbol === container.symbol;
+                    case SyntaxKind.MethodDeclaration:
+                    case SyntaxKind.MethodSignature:
+                        return isObjectLiteralMethod(searchSpaceNode) && searchSpaceNode.symbol === container.symbol;
+                    case SyntaxKind.ClassExpression:
+                    case SyntaxKind.ClassDeclaration:
+                        // Make sure the container belongs to the same class
+                        // and has the appropriate static modifier from the original container.
+                        return container.parent && searchSpaceNode.symbol === container.parent.symbol && (getModifierFlags(container) & ModifierFlags.Static) === staticFlag;
+                    case SyntaxKind.SourceFile:
+                        return container.kind === SyntaxKind.SourceFile && !isExternalModule(<SourceFile>container);
+                }
+            });
+        }).map(n => nodeEntry(n));
 
         return [{
             definition: { type: "this", node: thisOrSuperKeyword },
@@ -1316,52 +1306,11 @@ namespace ts.FindAllReferences.Core {
         }];
     }
 
-    function getThisReferencesInFile(sourceFile: SourceFile, searchSpaceNode: Node, possiblePositions: ReadonlyArray<number>, staticFlag: ModifierFlags, result: Push<Entry>): void {
-        forEach(possiblePositions, position => {
-            const node = getTouchingWord(sourceFile, position, /*includeJsDocComment*/ false);
-            if (!node || !isThis(node)) {
-                return;
-            }
-
-            const container = getThisContainer(node, /* includeArrowFunctions */ false);
-
-            switch (searchSpaceNode.kind) {
-                case SyntaxKind.FunctionExpression:
-                case SyntaxKind.FunctionDeclaration:
-                    if (searchSpaceNode.symbol === container.symbol) {
-                        result.push(nodeEntry(node));
-                    }
-                    break;
-                case SyntaxKind.MethodDeclaration:
-                case SyntaxKind.MethodSignature:
-                    if (isObjectLiteralMethod(searchSpaceNode) && searchSpaceNode.symbol === container.symbol) {
-                        result.push(nodeEntry(node));
-                    }
-                    break;
-                case SyntaxKind.ClassExpression:
-                case SyntaxKind.ClassDeclaration:
-                    // Make sure the container belongs to the same class
-                    // and has the appropriate static modifier from the original container.
-                    if (container.parent && searchSpaceNode.symbol === container.parent.symbol && (getModifierFlags(container) & ModifierFlags.Static) === staticFlag) {
-                        result.push(nodeEntry(node));
-                    }
-                    break;
-                case SyntaxKind.SourceFile:
-                    if (container.kind === SyntaxKind.SourceFile && !isExternalModule(<SourceFile>container)) {
-                        result.push(nodeEntry(node));
-                    }
-                    break;
-            }
-        });
-    }
-
     function getReferencesForStringLiteral(node: StringLiteral, sourceFiles: ReadonlyArray<SourceFile>, cancellationToken: CancellationToken): SymbolAndEntries[] {
         const references = flatMap(sourceFiles, sourceFile => {
             cancellationToken.throwIfCancellationRequested();
-            return mapDefined(getPossibleSymbolReferencePositions(sourceFile, node.text), position => {
-                const ref = tryCast(getTouchingWord(sourceFile, position, /*includeJsDocComment*/ false), isStringLiteral);
-                return ref && ref.text === node.text ? nodeEntry(ref, /*isInString*/ true) : undefined;
-            });
+            return mapDefined(getPossibleSymbolReferenceNodes(sourceFile, node.text), ref =>
+                isStringLiteral(ref) && ref.text === node.text ? nodeEntry(ref, /*isInString*/ true) : undefined);
         });
 
         return [{
@@ -1483,7 +1432,7 @@ namespace ts.FindAllReferences.Core {
                 ? rootSymbol && !(getCheckFlags(sym) & CheckFlags.Synthetic) ? rootSymbol : sym
                 : undefined,
             /*allowBaseTypes*/ rootSymbol =>
-                !(search.parents && !some(search.parents, parent => explicitlyInheritsFrom(rootSymbol.parent, parent, state.inheritsFromCache, checker))));
+                !(search.parents && !search.parents.some(parent => explicitlyInheritsFrom(rootSymbol.parent, parent, state.inheritsFromCache, checker))));
     }
 
     /** Gets all symbols for one property. Does not get symbols for every property. */
@@ -1570,13 +1519,11 @@ namespace ts.FindAllReferences.Core {
      * symbol may have a different parent symbol if the local type's symbol does not declare the property
      * being accessed (i.e. it is declared in some parent class or interface)
      */
-    function getParentSymbolsOfPropertyAccess(location: Node, symbol: Symbol, checker: TypeChecker): Symbol[] | undefined {
-        const propertyAccessExpression = getPropertyAccessExpressionFromRightHandSide(location);
-        const localParentType = propertyAccessExpression && checker.getTypeAtLocation(propertyAccessExpression.expression);
-        return localParentType && localParentType.symbol && localParentType.symbol.flags & (SymbolFlags.Class | SymbolFlags.Interface) && localParentType.symbol !== symbol.parent
-            ? [localParentType.symbol]
-            : localParentType && localParentType.isUnionOrIntersection()
-            ? getSymbolsForClassAndInterfaceComponents(localParentType)
-            : undefined;
+    function getParentSymbolsOfPropertyAccess(location: Node, symbol: Symbol, checker: TypeChecker): ReadonlyArray<Symbol> | undefined {
+        const propertyAccessExpression = isRightSideOfPropertyAccess(location) ? <PropertyAccessExpression>location.parent : undefined;
+        const lhsType = propertyAccessExpression && checker.getTypeAtLocation(propertyAccessExpression.expression);
+        const res = mapDefined(lhsType && (lhsType.isUnionOrIntersection() ? lhsType.types : lhsType.symbol === symbol.parent ? undefined : [lhsType]), t =>
+            t.symbol && t.symbol.flags & (SymbolFlags.Class | SymbolFlags.Interface) ? t.symbol : undefined);
+        return res.length === 0 ? undefined : res;
     }
 }
diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts
index debec04536a..494a811c238 100644
--- a/src/services/formatting/formatting.ts
+++ b/src/services/formatting/formatting.ts
@@ -1,8 +1,3 @@
-/// <reference path="formattingContext.ts" />
-/// <reference path="formattingScanner.ts" />
-/// <reference path="rule.ts" />
-/// <reference path="rulesMap.ts" />
-
 /* @internal */
 namespace ts.formatting {
     export interface FormatContext {
diff --git a/src/services/formatting/formattingScanner.ts b/src/services/formatting/formattingScanner.ts
index 9b9c956f670..a53a1e5ce26 100644
--- a/src/services/formatting/formattingScanner.ts
+++ b/src/services/formatting/formattingScanner.ts
@@ -1,6 +1,3 @@
-/// <reference path="formatting.ts"/>
-/// <reference path="..\..\compiler\scanner.ts"/>
-
 /* @internal */
 namespace ts.formatting {
     const standardScanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false, LanguageVariant.Standard);
diff --git a/src/services/formatting/rulesMap.ts b/src/services/formatting/rulesMap.ts
index 75cc68cb268..b10d163343e 100644
--- a/src/services/formatting/rulesMap.ts
+++ b/src/services/formatting/rulesMap.ts
@@ -1,5 +1,3 @@
-/// <reference path="rules.ts" />
-
 /* @internal */
 namespace ts.formatting {
     export function getFormatContext(options: FormatCodeSettings): FormatContext {
diff --git a/src/services/getEditsForFileRename.ts b/src/services/getEditsForFileRename.ts
new file mode 100644
index 00000000000..09bbdc11e78
--- /dev/null
+++ b/src/services/getEditsForFileRename.ts
@@ -0,0 +1,76 @@
+/* @internal */
+namespace ts {
+    export function getEditsForFileRename(program: Program, oldFilePath: string, newFilePath: string, host: LanguageServiceHost, formatContext: formatting.FormatContext): ReadonlyArray<FileTextChanges> {
+        const pathUpdater = getPathUpdater(oldFilePath, newFilePath, host);
+        return textChanges.ChangeTracker.with({ host, formatContext }, changeTracker => {
+            updateTsconfigFiles(program, changeTracker, oldFilePath, newFilePath);
+            for (const { sourceFile, toUpdate } of getImportsToUpdate(program, oldFilePath)) {
+                const newPath = pathUpdater(isRef(toUpdate) ? toUpdate.fileName : toUpdate.text);
+                if (newPath !== undefined) {
+                    const range = isRef(toUpdate) ? toUpdate : createStringRange(toUpdate, sourceFile);
+                    changeTracker.replaceRangeWithText(sourceFile, range, isRef(toUpdate) ? newPath : removeFileExtension(newPath));
+                }
+            }
+        });
+    }
+
+    function updateTsconfigFiles(program: Program, changeTracker: textChanges.ChangeTracker, oldFilePath: string, newFilePath: string): void {
+        const cfg = program.getCompilerOptions().configFile;
+        if (!cfg) return;
+        const oldFile = cfg.jsonObject && getFilesEntry(cfg.jsonObject, oldFilePath);
+        if (oldFile) {
+            changeTracker.replaceRangeWithText(cfg, createStringRange(oldFile, cfg), newFilePath);
+        }
+    }
+
+    function getFilesEntry(cfg: ObjectLiteralExpression, fileName: string): StringLiteral | undefined {
+        const filesProp = find(cfg.properties, (prop): prop is PropertyAssignment =>
+            isPropertyAssignment(prop) && isStringLiteral(prop.name) && prop.name.text === "files");
+        const files = filesProp && filesProp.initializer;
+        return files && isArrayLiteralExpression(files) ? find(files.elements, (e): e is StringLiteral => isStringLiteral(e) && e.text === fileName) : undefined;
+    }
+
+    interface ToUpdate {
+        readonly sourceFile: SourceFile;
+        readonly toUpdate: StringLiteralLike | FileReference;
+    }
+    function isRef(toUpdate: StringLiteralLike | FileReference): toUpdate is FileReference {
+        return "fileName" in toUpdate;
+    }
+
+    function getImportsToUpdate(program: Program, oldFilePath: string): ReadonlyArray<ToUpdate> {
+        const checker = program.getTypeChecker();
+        const result: ToUpdate[] = [];
+        for (const sourceFile of program.getSourceFiles()) {
+            for (const ref of sourceFile.referencedFiles) {
+                if (!program.getSourceFileFromReference(sourceFile, ref) && resolveTripleslashReference(ref.fileName, sourceFile.fileName) === oldFilePath) {
+                    result.push({ sourceFile, toUpdate: ref });
+                }
+            }
+
+            for (const importStringLiteral of sourceFile.imports) {
+                // If it resolved to something already, ignore.
+                if (checker.getSymbolAtLocation(importStringLiteral)) continue;
+
+                const resolved = program.getResolvedModuleWithFailedLookupLocationsFromCache(importStringLiteral.text, sourceFile.fileName);
+                if (contains(resolved.failedLookupLocations, oldFilePath)) {
+                    result.push({ sourceFile, toUpdate: importStringLiteral });
+                }
+            }
+        }
+        return result;
+    }
+
+    function getPathUpdater(oldFilePath: string, newFilePath: string, host: LanguageServiceHost): (oldPath: string) => string | undefined {
+        // Get the relative path from old to new location, and append it on to the end of imports and normalize.
+        const rel = getRelativePath(newFilePath, getDirectoryPath(oldFilePath), createGetCanonicalFileName(hostUsesCaseSensitiveFileNames(host)));
+        return oldPath => {
+            if (!pathIsRelative(oldPath)) return;
+            return ensurePathIsRelative(normalizePath(combinePaths(getDirectoryPath(oldPath), rel)));
+        };
+    }
+
+    function createStringRange(node: StringLiteralLike, sourceFile: SourceFileLike): TextRange {
+        return createTextRange(node.getStart(sourceFile) + 1, node.end - 1);
+    }
+}
diff --git a/src/services/goToDefinition.ts b/src/services/goToDefinition.ts
index 226fe74ef10..977f9617353 100644
--- a/src/services/goToDefinition.ts
+++ b/src/services/goToDefinition.ts
@@ -18,13 +18,7 @@ namespace ts.GoToDefinition {
         }
 
         const typeChecker = program.getTypeChecker();
-
-        const calledDeclaration = tryGetSignatureDeclaration(typeChecker, node);
-        if (calledDeclaration) {
-            return [createDefinitionFromSignatureDeclaration(typeChecker, calledDeclaration)];
-        }
-
-        let symbol = typeChecker.getSymbolAtLocation(node);
+        const symbol = getSymbol(node, typeChecker);
 
         // Could not find a symbol e.g. node is string or number keyword,
         // or the symbol was an internal symbol and does not have a declaration e.g. undefined symbol
@@ -32,15 +26,14 @@ namespace ts.GoToDefinition {
             return getDefinitionInfoForIndexSignatures(node, typeChecker);
         }
 
-        // If this is an alias, and the request came at the declaration location
-        // get the aliased symbol instead. This allows for goto def on an import e.g.
-        //   import {A, B} from "mod";
-        // to jump to the implementation directly.
-        if (symbol.flags & SymbolFlags.Alias && shouldSkipAlias(node, symbol.declarations[0])) {
-            const aliased = typeChecker.getAliasedSymbol(symbol);
-            if (aliased.declarations) {
-                symbol = aliased;
-            }
+        const calledDeclaration = tryGetSignatureDeclaration(typeChecker, node);
+        if (calledDeclaration) {
+            const sigInfo = createDefinitionFromSignatureDeclaration(typeChecker, calledDeclaration);
+            // For a function, if this is the original function definition, return just sigInfo.
+            // If this is the original constructor definition, parent is the class.
+            return typeChecker.getRootSymbols(symbol).some(s => calledDeclaration.symbol === s || calledDeclaration.symbol.parent === s)
+                ? [sigInfo]
+                : [sigInfo, ...getDefinitionFromSymbol(typeChecker, symbol, node)];
         }
 
         // Because name in short-hand property assignment has two different meanings: property name and property value,
@@ -50,16 +43,7 @@ namespace ts.GoToDefinition {
         // assignment. This case and others are handled by the following code.
         if (node.parent.kind === SyntaxKind.ShorthandPropertyAssignment) {
             const shorthandSymbol = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
-            if (!shorthandSymbol) {
-                return [];
-            }
-
-            const shorthandDeclarations = shorthandSymbol.getDeclarations();
-            const shorthandSymbolKind = SymbolDisplay.getSymbolKind(typeChecker, shorthandSymbol, node);
-            const shorthandSymbolName = typeChecker.symbolToString(shorthandSymbol);
-            const shorthandContainerName = typeChecker.symbolToString(symbol.parent, node);
-            return map(shorthandDeclarations,
-                declaration => createDefinitionInfo(declaration, shorthandSymbolKind, shorthandSymbolName, shorthandContainerName));
+            return shorthandSymbol ? shorthandSymbol.declarations.map(decl => createDefinitionInfo(decl, typeChecker, shorthandSymbol, node)) : [];
         }
 
         // If the node is the name of a BindingElement within an ObjectBindingPattern instead of just returning the
@@ -167,6 +151,21 @@ namespace ts.GoToDefinition {
         });
     }
 
+    function getSymbol(node: Node, checker: TypeChecker): Symbol | undefined {
+        const symbol = checker.getSymbolAtLocation(node);
+        // If this is an alias, and the request came at the declaration location
+        // get the aliased symbol instead. This allows for goto def on an import e.g.
+        //   import {A, B} from "mod";
+        // to jump to the implementation directly.
+        if (symbol && symbol.flags & SymbolFlags.Alias && shouldSkipAlias(node, symbol.declarations[0])) {
+            const aliased = checker.getAliasedSymbol(symbol);
+            if (aliased.declarations) {
+                return aliased;
+            }
+        }
+        return symbol;
+    }
+
     // Go to the original declaration for cases:
     //
     //   (1) when the aliased symbol was declared in the location(parent).
@@ -191,8 +190,7 @@ namespace ts.GoToDefinition {
     }
 
     function getDefinitionFromSymbol(typeChecker: TypeChecker, symbol: Symbol, node: Node): DefinitionInfo[] {
-        const { symbolName, symbolKind, containerName } = getSymbolInfo(typeChecker, symbol, node);
-        return getConstructSignatureDefinition() || getCallSignatureDefinition() || map(symbol.declarations, declaration => createDefinitionInfo(declaration, symbolKind, symbolName, containerName));
+        return getConstructSignatureDefinition() || getCallSignatureDefinition() || map(symbol.declarations, declaration => createDefinitionInfo(declaration, typeChecker, symbol, node));
 
         function getConstructSignatureDefinition(): DefinitionInfo[] | undefined {
             // Applicable only if we are in a new expression, or we are on a constructor declaration
@@ -213,33 +211,24 @@ namespace ts.GoToDefinition {
             if (!signatureDeclarations) {
                 return undefined;
             }
-            const declarations = signatureDeclarations.filter(selectConstructors ? isConstructorDeclaration : isSignatureDeclaration);
+            const declarations = signatureDeclarations.filter(selectConstructors ? isConstructorDeclaration : isFunctionLike);
             return declarations.length
-                ? [createDefinitionInfo(find(declarations, d => !!(<FunctionLikeDeclaration>d).body) || last(declarations), symbolKind, symbolName, containerName)]
+                ? [createDefinitionInfo(find(declarations, d => !!(<FunctionLikeDeclaration>d).body) || last(declarations), typeChecker, symbol, node)]
                 : undefined;
         }
     }
 
-    function isSignatureDeclaration(node: Node): boolean {
-        switch (node.kind) {
-            case SyntaxKind.Constructor:
-            case SyntaxKind.ConstructSignature:
-            case SyntaxKind.FunctionDeclaration:
-            case SyntaxKind.MethodDeclaration:
-            case SyntaxKind.MethodSignature:
-                return true;
-            default:
-                return false;
-        }
-    }
-
     /** Creates a DefinitionInfo from a Declaration, using the declaration's name if possible. */
-    function createDefinitionInfo(node: Declaration, symbolKind: ScriptElementKind, symbolName: string, containerName: string): DefinitionInfo {
-        return createDefinitionInfoFromName(getNameOfDeclaration(node) || node, symbolKind, symbolName, containerName);
+    function createDefinitionInfo(declaration: Declaration, checker: TypeChecker, symbol: Symbol, node: Node): DefinitionInfo {
+        const symbolName = checker.symbolToString(symbol); // Do not get scoped name, just the name of the symbol
+        const symbolKind = SymbolDisplay.getSymbolKind(checker, symbol, node);
+        const containerName = symbol.parent ? checker.symbolToString(symbol.parent, node) : "";
+        return createDefinitionInfoFromName(declaration, symbolKind, symbolName, containerName);
     }
 
     /** Creates a DefinitionInfo directly from the name of a declaration. */
-    function createDefinitionInfoFromName(name: Node, symbolKind: ScriptElementKind, symbolName: string, containerName: string): DefinitionInfo {
+    function createDefinitionInfoFromName(declaration: Declaration, symbolKind: ScriptElementKind, symbolName: string, containerName: string): DefinitionInfo {
+        const name = getNameOfDeclaration(declaration) || declaration;
         const sourceFile = name.getSourceFile();
         return {
             fileName: sourceFile.fileName,
@@ -251,26 +240,12 @@ namespace ts.GoToDefinition {
         };
     }
 
-    function getSymbolInfo(typeChecker: TypeChecker, symbol: Symbol, node: Node) {
-        return {
-            symbolName: typeChecker.symbolToString(symbol), // Do not get scoped name, just the name of the symbol
-            symbolKind: SymbolDisplay.getSymbolKind(typeChecker, symbol, node),
-            containerName: symbol.parent ? typeChecker.symbolToString(symbol.parent, node) : ""
-        };
-    }
-
     function createDefinitionFromSignatureDeclaration(typeChecker: TypeChecker, decl: SignatureDeclaration): DefinitionInfo {
-        const { symbolName, symbolKind, containerName } = getSymbolInfo(typeChecker, decl.symbol, decl);
-        return createDefinitionInfo(decl, symbolKind, symbolName, containerName);
+        return createDefinitionInfo(decl, typeChecker, decl.symbol, decl);
     }
 
     export function findReferenceInPosition(refs: ReadonlyArray<FileReference>, pos: number): FileReference | undefined {
-        for (const ref of refs) {
-            if (ref.pos <= pos && pos <= ref.end) {
-                return ref;
-            }
-        }
-        return undefined;
+        return find(refs, ref => ref.pos <= pos && pos <= ref.end);
     }
 
     function getDefinitionInfoForFileReference(name: string, targetFileName: string): DefinitionInfo {
@@ -298,13 +273,7 @@ namespace ts.GoToDefinition {
     function tryGetSignatureDeclaration(typeChecker: TypeChecker, node: Node): SignatureDeclaration | undefined {
         const callLike = getAncestorCallLikeExpression(node);
         const signature = callLike && typeChecker.getResolvedSignature(callLike);
-        if (signature) {
-            const decl = signature.declaration;
-            if (decl && isSignatureDeclaration(decl)) {
-                return decl;
-            }
-        }
         // Don't go to a function type, go to the value having that type.
-        return undefined;
+        return tryCast(signature && signature.declaration, (d): d is SignatureDeclaration => isFunctionLike(d) && !isFunctionTypeNode(d));
     }
 }
diff --git a/src/services/importTracker.ts b/src/services/importTracker.ts
index de8a49243fa..1a4b2a9f751 100644
--- a/src/services/importTracker.ts
+++ b/src/services/importTracker.ts
@@ -12,10 +12,10 @@ namespace ts.FindAllReferences {
     export type ImportTracker = (exportSymbol: Symbol, exportInfo: ExportInfo, isForRename: boolean) => ImportsResult;
 
     /** Creates the imports map and returns an ImportTracker that uses it. Call this lazily to avoid calling `getDirectImportsMap` unnecessarily.  */
-    export function createImportTracker(sourceFiles: ReadonlyArray<SourceFile>, checker: TypeChecker, cancellationToken: CancellationToken): ImportTracker {
+    export function createImportTracker(sourceFiles: ReadonlyArray<SourceFile>, sourceFilesSet: ReadonlyMap<true>, checker: TypeChecker, cancellationToken: CancellationToken): ImportTracker {
         const allDirectImports = getDirectImportsMap(sourceFiles, checker, cancellationToken);
         return (exportSymbol, exportInfo, isForRename) => {
-            const { directImports, indirectUsers } = getImportersForExport(sourceFiles, allDirectImports, exportInfo, checker, cancellationToken);
+            const { directImports, indirectUsers } = getImportersForExport(sourceFiles, sourceFilesSet, allDirectImports, exportInfo, checker, cancellationToken);
             return { indirectUsers, ...getSearchesFromDirectImports(directImports, exportSymbol, exportInfo.exportKind, checker, isForRename) };
         };
     }
@@ -33,12 +33,13 @@ namespace ts.FindAllReferences {
     interface AmbientModuleDeclaration extends ModuleDeclaration { body?: ModuleBlock; }
     type SourceFileLike = SourceFile | AmbientModuleDeclaration;
     // Identifier for the case of `const x = require("y")`.
-    type Importer = AnyImportOrReExport | Identifier;
+    type Importer = AnyImportOrReExport | ImportTypeNode | Identifier;
     type ImporterOrCallExpression = Importer | CallExpression;
 
     /** Returns import statements that directly reference the exporting module, and a list of files that may access the module through a namespace. */
     function getImportersForExport(
         sourceFiles: ReadonlyArray<SourceFile>,
+        sourceFilesSet: ReadonlyMap<true>,
         allDirectImports: Map<ImporterOrCallExpression[]>,
         { exportingModuleSymbol, exportKind }: ExportInfo,
         checker: TypeChecker,
@@ -62,7 +63,7 @@ namespace ts.FindAllReferences {
 
             // Module augmentations may use this module's exports without importing it.
             for (const decl of exportingModuleSymbol.declarations) {
-                if (isExternalModuleAugmentation(decl)) {
+                if (isExternalModuleAugmentation(decl) && sourceFilesSet.has(decl.getSourceFile().fileName)) {
                     addIndirectUser(decl);
                 }
             }
@@ -214,6 +215,10 @@ namespace ts.FindAllReferences {
                 return;
             }
 
+            if (decl.kind === SyntaxKind.ImportType) {
+                return;
+            }
+
             // Ignore if there's a grammar error
             if (decl.moduleSpecifier.kind !== SyntaxKind.StringLiteral) {
                 return;
@@ -249,7 +254,7 @@ namespace ts.FindAllReferences {
                 }
 
                 // 'default' might be accessed as a named import `{ default as foo }`.
-                if (!isForRename && exportKind === ExportKind.Default) {
+                if (exportKind === ExportKind.Default) {
                     searchForNamedImport(namedBindings as NamedImports | undefined);
                 }
             }
@@ -281,7 +286,9 @@ namespace ts.FindAllReferences {
                 if (propertyName) {
                     // This is `import { foo as bar } from "./a"` or `export { foo as bar } from "./a"`. `foo` isn't a local in the file, so just add it as a single reference.
                     singleReferences.push(propertyName);
-                    if (!isForRename) { // If renaming `foo`, don't touch `bar`, just `foo`.
+                    // If renaming `{ foo as bar }`, don't touch `bar`, just `foo`.
+                    // But do rename `foo` in ` { default as foo }` if that's the original export name.
+                    if (!isForRename || name.escapedText === exportSymbol.escapedName) {
                         // Search locally for `bar`.
                         addSearch(name, checker.getSymbolAtLocation(name));
                     }
diff --git a/src/services/jsDoc.ts b/src/services/jsDoc.ts
index d0860c3e161..ca0dafbc74c 100644
--- a/src/services/jsDoc.ts
+++ b/src/services/jsDoc.ts
@@ -365,13 +365,10 @@ namespace ts.JsDoc {
             case SyntaxKind.FunctionExpression:
             case SyntaxKind.ArrowFunction:
                 return (<FunctionExpression>rightHandSide).parameters;
-            case SyntaxKind.ClassExpression:
-                for (const member of (<ClassExpression>rightHandSide).members) {
-                    if (member.kind === SyntaxKind.Constructor) {
-                        return (<ConstructorDeclaration>member).parameters;
-                    }
-                }
-                break;
+            case SyntaxKind.ClassExpression: {
+                const ctr = find((rightHandSide as ClassExpression).members, isConstructorDeclaration);
+                return ctr && ctr.parameters;
+            }
         }
 
         return emptyArray;
diff --git a/src/services/jsTyping.ts b/src/services/jsTyping.ts
index 393b8ca34e0..6b4f7f2e1d4 100644
--- a/src/services/jsTyping.ts
+++ b/src/services/jsTyping.ts
@@ -1,11 +1,3 @@
-// Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0.
-// See LICENSE.txt in the project root for complete license information.
-
-/// <reference path='../compiler/types.ts' />
-/// <reference path='../compiler/core.ts' />
-/// <reference path='../compiler/commandLineParser.ts' />
-/// <reference path='../services/semver.ts' />
-
 /* @internal */
 namespace ts.JsTyping {
 
diff --git a/src/services/navigateTo.ts b/src/services/navigateTo.ts
index 1a556cf33c0..84c299abf61 100644
--- a/src/services/navigateTo.ts
+++ b/src/services/navigateTo.ts
@@ -10,6 +10,7 @@ namespace ts.NavigateTo {
 
     export function getNavigateToItems(sourceFiles: ReadonlyArray<SourceFile>, checker: TypeChecker, cancellationToken: CancellationToken, searchValue: string, maxResultCount: number, excludeDtsFiles: boolean): NavigateToItem[] {
         const patternMatcher = createPatternMatcher(searchValue);
+        if (!patternMatcher) return emptyArray;
         let rawItems: RawNavigateToItem[] = [];
 
         // Search the declarations in all files and output matched NavigateToItem into array of NavigateToItem[]
@@ -35,28 +36,24 @@ namespace ts.NavigateTo {
     function getItemsFromNamedDeclaration(patternMatcher: PatternMatcher, name: string, declarations: ReadonlyArray<Declaration>, checker: TypeChecker, fileName: string, rawItems: Push<RawNavigateToItem>): void {
         // First do a quick check to see if the name of the declaration matches the
         // last portion of the (possibly) dotted name they're searching for.
-        const matches = patternMatcher.getMatchesForLastSegmentOfPattern(name);
-
-        if (!matches) {
+        const match = patternMatcher.getMatchForLastSegmentOfPattern(name);
+        if (!match) {
             return; // continue to next named declarations
         }
 
         for (const declaration of declarations) {
-            if (!shouldKeepItem(declaration, checker)) {
-                continue;
-            }
+            if (!shouldKeepItem(declaration, checker)) continue;
 
-            // It was a match! If the pattern has dots in it, then also see if the
-            // declaration container matches as well.
-            let containerMatches = matches;
             if (patternMatcher.patternContainsDots) {
-                containerMatches = patternMatcher.getMatches(getContainers(declaration), name);
-                if (!containerMatches) {
-                    continue;
+                const fullMatch = patternMatcher.getFullMatch(getContainers(declaration), name);
+                if (fullMatch) {
+                    rawItems.push({ name, fileName, matchKind: fullMatch.kind, isCaseSensitive: fullMatch.isCaseSensitive, declaration });
                 }
             }
-
-            rawItems.push({ name, fileName, matchKind: Math.min(...matches.map(m => m.kind)), isCaseSensitive: matches.every(m => m.isCaseSensitive), declaration });
+            else {
+                // If the pattern has dots in it, then also see if the declaration container matches as well.
+                rawItems.push({ name, fileName, matchKind: match.kind, isCaseSensitive: match.isCaseSensitive, declaration });
+            }
         }
     }
 
diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts
index e2176d2c1c9..b029796e718 100644
--- a/src/services/navigationBar.ts
+++ b/src/services/navigationBar.ts
@@ -1,5 +1,3 @@
-/// <reference path='services.ts' />
-
 /* @internal */
 namespace ts.NavigationBar {
     /**
diff --git a/src/services/organizeImports.ts b/src/services/organizeImports.ts
index 52f9a50366f..5109b050b6b 100644
--- a/src/services/organizeImports.ts
+++ b/src/services/organizeImports.ts
@@ -131,9 +131,7 @@ namespace ts.OrganizeImports {
     }
 
     function getExternalModuleName(specifier: Expression) {
-        return isStringLiteral(specifier) || isNoSubstitutionTemplateLiteral(specifier)
-            ? specifier.text
-            : undefined;
+        return isStringLiteralLike(specifier) ? specifier.text : undefined;
     }
 
     /* @internal */ // Internal for testing
diff --git a/src/services/outliningElementsCollector.ts b/src/services/outliningElementsCollector.ts
index 90c53d47561..65888305d81 100644
--- a/src/services/outliningElementsCollector.ts
+++ b/src/services/outliningElementsCollector.ts
@@ -21,7 +21,17 @@ namespace ts.OutliningElementsCollector {
             if (span) out.push(span);
 
             depthRemaining--;
-            n.forEachChild(walk);
+            if (isIfStatement(n) && n.elseStatement && isIfStatement(n.elseStatement)) {
+                // Consider an 'else if' to be on the same depth as the 'if'.
+                walk(n.expression);
+                walk(n.thenStatement);
+                depthRemaining++;
+                walk(n.elseStatement);
+                depthRemaining--;
+            }
+            else {
+                n.forEachChild(walk);
+            }
             depthRemaining++;
         });
     }
diff --git a/src/services/patternMatcher.ts b/src/services/patternMatcher.ts
index 612fa57378d..2d26d059021 100644
--- a/src/services/patternMatcher.ts
+++ b/src/services/patternMatcher.ts
@@ -33,12 +33,12 @@ namespace ts {
         // this will return a successful match, having only tested "SK" against "SyntaxKind".  At
         // that point a call can be made to 'getMatches("SyntaxKind", "ts.compiler")', with the
         // work to create 'ts.compiler' only being done once the first match succeeded.
-        getMatchesForLastSegmentOfPattern(candidate: string): PatternMatch[];
+        getMatchForLastSegmentOfPattern(candidate: string): PatternMatch | undefined;
 
         // Fully checks a candidate, with an dotted container, against the search pattern.
         // The candidate must match the last part of the search pattern, and the dotted container
         // must match the preceding segments of the pattern.
-        getMatches(candidateContainers: string[], candidate: string): PatternMatch[] | undefined;
+        getFullMatch(candidateContainers: ReadonlyArray<string>, candidate: string): PatternMatch | undefined;
 
         // Whether or not the pattern contained dots or not.  Clients can use this to determine
         // If they should call getMatches, or if getMatchesForLastSegmentOfPattern is sufficient.
@@ -97,31 +97,25 @@ namespace ts {
         };
     }
 
-    export function createPatternMatcher(pattern: string): PatternMatcher {
+    export function createPatternMatcher(pattern: string): PatternMatcher | undefined {
         // We'll often see the same candidate string many times when searching (For example, when
         // we see the name of a module that is used everywhere, or the name of an overload).  As
         // such, we cache the information we compute about the candidate for the life of this
         // pattern matcher so we don't have to compute it multiple times.
         const stringToWordSpans = createMap<TextSpan[]>();
 
-        pattern = pattern.trim();
-
-        const dotSeparatedSegments = pattern.split(".").map(p => createSegment(p.trim()));
-        const invalidPattern = dotSeparatedSegments.length === 0 || forEach(dotSeparatedSegments, segmentIsInvalid);
+        const dotSeparatedSegments = pattern.trim().split(".").map(p => createSegment(p.trim()));
+        // A segment is considered invalid if we couldn't find any words in it.
+        if (dotSeparatedSegments.some(segment => !segment.subWordTextChunks.length)) return undefined;
 
         return {
-            getMatches: (containers, candidate) => skipMatch(candidate) ? undefined : getMatches(containers, candidate, dotSeparatedSegments, stringToWordSpans),
-            getMatchesForLastSegmentOfPattern: candidate => skipMatch(candidate) ? undefined : matchSegment(candidate, lastOrUndefined(dotSeparatedSegments), stringToWordSpans),
+            getFullMatch: (containers, candidate) => getFullMatch(containers, candidate, dotSeparatedSegments, stringToWordSpans),
+            getMatchForLastSegmentOfPattern: candidate => matchSegment(candidate, last(dotSeparatedSegments), stringToWordSpans),
             patternContainsDots: dotSeparatedSegments.length > 1
         };
-
-        // Quick checks so we can bail out when asked to match a candidate.
-        function skipMatch(candidate: string) {
-            return invalidPattern || !candidate;
-        }
     }
 
-    function getMatches(candidateContainers: ReadonlyArray<string>, candidate: string, dotSeparatedSegments: ReadonlyArray<Segment>, stringToWordSpans: Map<TextSpan[]>): PatternMatch[] | undefined {
+    function getFullMatch(candidateContainers: ReadonlyArray<string>, candidate: string, dotSeparatedSegments: ReadonlyArray<Segment>, stringToWordSpans: Map<TextSpan[]>): PatternMatch | undefined {
         // First, check that the last part of the dot separated pattern matches the name of the
         // candidate.  If not, then there's no point in proceeding and doing the more
         // expensive work.
@@ -140,29 +134,13 @@ namespace ts {
             return undefined;
         }
 
-        // So far so good.  Now break up the container for the candidate and check if all
-        // the dotted parts match up correctly.
-        const totalMatch = candidateMatch;
-
+        let bestMatch: PatternMatch | undefined;
         for (let i = dotSeparatedSegments.length - 2, j = candidateContainers.length - 1;
              i >= 0;
              i -= 1, j -= 1) {
-
-            const segment = dotSeparatedSegments[i];
-            const containerName = candidateContainers[j];
-
-            const containerMatch = matchSegment(containerName, segment, stringToWordSpans);
-            if (!containerMatch) {
-                // This container didn't match the pattern piece.  So there's no match at all.
-                return undefined;
-            }
-
-            addRange(totalMatch, containerMatch);
+            bestMatch = betterMatch(bestMatch, matchSegment(candidateContainers[j], dotSeparatedSegments[i], stringToWordSpans));
         }
-
-        // Success, this symbol's full name matched against the dotted name the user was asking
-        // about.
-        return totalMatch;
+        return bestMatch;
     }
 
     function getWordSpans(word: string, stringToWordSpans: Map<TextSpan[]>): TextSpan[] {
@@ -225,7 +203,7 @@ namespace ts {
         }
     }
 
-    function matchSegment(candidate: string, segment: Segment, stringToWordSpans: Map<TextSpan[]>): PatternMatch[] {
+    function matchSegment(candidate: string, segment: Segment, stringToWordSpans: Map<TextSpan[]>): PatternMatch {
         // First check if the segment matches as is.  This is also useful if the segment contains
         // characters we would normally strip when splitting into parts that we also may want to
         // match in the candidate.  For example if the segment is "@int" and the candidate is
@@ -235,9 +213,7 @@ namespace ts {
         // multi-word segment.
         if (every(segment.totalTextChunk.text, ch => ch !== CharacterCodes.space && ch !== CharacterCodes.asterisk)) {
             const match = matchTextChunk(candidate, segment.totalTextChunk, stringToWordSpans);
-            if (match) {
-                return [match];
-            }
+            if (match) return match;
         }
 
         // The logic for pattern matching is now as follows:
@@ -277,20 +253,19 @@ namespace ts {
         // Only if all words have some sort of match is the pattern considered matched.
 
         const subWordTextChunks = segment.subWordTextChunks;
-        let matches: PatternMatch[];
-
+        let bestMatch: PatternMatch | undefined;
         for (const subWordTextChunk of subWordTextChunks) {
-            // Try to match the candidate with this word
-            const result = matchTextChunk(candidate, subWordTextChunk, stringToWordSpans);
-            if (!result) {
-                return undefined;
-            }
-
-            matches = matches || [];
-            matches.push(result);
+            bestMatch = betterMatch(bestMatch, matchTextChunk(candidate, subWordTextChunk, stringToWordSpans));
         }
+        return bestMatch;
+    }
 
-        return matches;
+    function betterMatch(a: PatternMatch | undefined, b: PatternMatch | undefined): PatternMatch {
+        return min(a, b, compareMatches);
+    }
+    function compareMatches(a: PatternMatch | undefined, b: PatternMatch | undefined): Comparison {
+        return a === undefined ? Comparison.GreaterThan : b === undefined ? Comparison.LessThan
+            : compareValues(a.kind, b.kind) || compareBooleans(!a.isCaseSensitive, !b.isCaseSensitive);
     }
 
     function partStartsWith(candidate: string, candidateSpan: TextSpan, pattern: string, ignoreCase: boolean, patternSpan: TextSpan = { start: 0, length: pattern.length }): boolean {
@@ -381,11 +356,6 @@ namespace ts {
         };
     }
 
-    // A segment is considered invalid if we couldn't find any words in it.
-    function segmentIsInvalid(segment: Segment) {
-        return segment.subWordTextChunks.length === 0;
-    }
-
     function isUpperCaseLetter(ch: number) {
         // Fast check for the ascii range.
         if (ch >= CharacterCodes.A && ch <= CharacterCodes.Z) {
diff --git a/src/services/preProcess.ts b/src/services/preProcess.ts
index fb138a87866..6c5f6c1b2ff 100644
--- a/src/services/preProcess.ts
+++ b/src/services/preProcess.ts
@@ -12,20 +12,23 @@ namespace ts {
         };
         const importedFiles: FileReference[] = [];
         let ambientExternalModules: { ref: FileReference, depth: number }[];
+        let lastToken: SyntaxKind;
+        let currentToken: SyntaxKind;
         let braceNesting = 0;
         // assume that text represent an external module if it contains at least one top level import/export
         // ambient modules that are found inside external modules are interpreted as module augmentations
         let externalModule = false;
 
         function nextToken() {
-            const token = scanner.scan();
-            if (token === SyntaxKind.OpenBraceToken) {
+            lastToken = currentToken;
+            currentToken = scanner.scan();
+            if (currentToken === SyntaxKind.OpenBraceToken) {
                 braceNesting++;
             }
-            else if (token === SyntaxKind.CloseBraceToken) {
+            else if (currentToken === SyntaxKind.CloseBraceToken) {
                 braceNesting--;
             }
-            return token;
+            return currentToken;
         }
 
         function getFileReference() {
@@ -77,6 +80,9 @@ namespace ts {
          * Returns true if at least one token was consumed from the stream
          */
         function tryConsumeImport(): boolean {
+            if (lastToken === SyntaxKind.DotToken) {
+                return false;
+            }
             let token = scanner.getToken();
             if (token === SyntaxKind.ImportKeyword) {
                 token = nextToken();
@@ -293,6 +299,10 @@ namespace ts {
             //    export import i = require("mod")
             //    (for JavaScript files) require("mod")
 
+            // Do not look for:
+            //    AnySymbol.import("mod")
+            //    AnySymbol.nested.import("mod")
+
             while (true) {
                 if (scanner.getToken() === SyntaxKind.EndOfFileToken) {
                     break;
diff --git a/src/services/refactors/extractSymbol.ts b/src/services/refactors/extractSymbol.ts
index b99a4b26552..5805a986180 100644
--- a/src/services/refactors/extractSymbol.ts
+++ b/src/services/refactors/extractSymbol.ts
@@ -1,6 +1,3 @@
-/// <reference path="../refactorProvider.ts" />
-/// <reference path="../../compiler/checker.ts" />
-
 /* @internal */
 namespace ts.refactor.extractSymbol {
     const refactorName = "Extract Symbol";
@@ -701,14 +698,6 @@ namespace ts.refactor.extractSymbol {
         Global,
     }
 
-    function getUniqueName(baseName: string, fileText: string): string {
-        let nameText = baseName;
-        for (let i = 1; stringContains(fileText, nameText); i++) {
-            nameText = `${baseName}_${i}`;
-        }
-        return nameText;
-    }
-
     /**
      * Result of 'extractRange' operation for a specific scope.
      * Stores either a list of changes that should be applied to extract a range or a list of errors
@@ -1129,37 +1118,6 @@ namespace ts.refactor.extractSymbol {
         }
     }
 
-    /**
-     * @return The index of the (only) reference to the extracted symbol.  We want the cursor
-     * to be on the reference, rather than the declaration, because it's closer to where the
-     * user was before extracting it.
-     */
-    function getRenameLocation(edits: ReadonlyArray<FileTextChanges>, renameFilename: string, functionNameText: string, isDeclaredBeforeUse: boolean): number {
-        let delta = 0;
-        let lastPos = -1;
-        for (const { fileName, textChanges } of edits) {
-            Debug.assert(fileName === renameFilename);
-            for (const change of textChanges) {
-                const { span, newText } = change;
-                const index = newText.indexOf(functionNameText);
-                if (index !== -1) {
-                    lastPos = span.start + delta + index;
-
-                    // If the reference comes first, return immediately.
-                    if (!isDeclaredBeforeUse) {
-                        return lastPos;
-                    }
-                }
-                delta += newText.length - span.length;
-            }
-        }
-
-        // If the declaration comes first, return the position of the last occurrence.
-        Debug.assert(isDeclaredBeforeUse);
-        Debug.assert(lastPos >= 0);
-        return lastPos;
-    }
-
     function getFirstDeclaration(type: Type): Declaration | undefined {
         let firstDeclaration;
 
diff --git a/src/services/refactors/generateGetAccessorAndSetAccessor.ts b/src/services/refactors/generateGetAccessorAndSetAccessor.ts
new file mode 100644
index 00000000000..33ecbbaab66
--- /dev/null
+++ b/src/services/refactors/generateGetAccessorAndSetAccessor.ts
@@ -0,0 +1,202 @@
+/* @internal */
+namespace ts.refactor.generateGetAccessorAndSetAccessor {
+    const actionName = "Generate 'get' and 'set' accessors";
+    const actionDescription = Diagnostics.Generate_get_and_set_accessors.message;
+    registerRefactor(actionName, { getEditsForAction, getAvailableActions });
+
+    type AcceptedDeclaration = ParameterPropertyDeclaration | PropertyDeclaration | PropertyAssignment;
+    type AcceptedNameType = Identifier | StringLiteral;
+    type ContainerDeclaration = ClassLikeDeclaration | ObjectLiteralExpression;
+
+    interface Info {
+        container: ContainerDeclaration;
+        isStatic: boolean;
+        type: TypeNode | undefined;
+        declaration: AcceptedDeclaration;
+        fieldName: AcceptedNameType;
+        accessorName: AcceptedNameType;
+    }
+
+    function getAvailableActions(context: RefactorContext): ApplicableRefactorInfo[] | undefined {
+        const { file, startPosition } = context;
+        if (!getConvertibleFieldAtPosition(file, startPosition)) return undefined;
+
+        return [{
+            name: actionName,
+            description: actionDescription,
+            actions: [
+                {
+                    name: actionName,
+                    description: actionDescription
+                }
+            ]
+        }];
+    }
+
+    function getEditsForAction(context: RefactorContext, _actionName: string): RefactorEditInfo | undefined {
+        const { file, startPosition } = context;
+
+        const fieldInfo = getConvertibleFieldAtPosition(file, startPosition);
+        if (!fieldInfo) return undefined;
+
+        const isJS = isSourceFileJavaScript(file);
+        const changeTracker = textChanges.ChangeTracker.fromContext(context);
+        const { isStatic, fieldName, accessorName, type, container, declaration } = fieldInfo;
+
+        const isInClassLike = isClassLike(container);
+        const accessorModifiers = isInClassLike
+            ? !declaration.modifiers || getModifierFlags(declaration) & ModifierFlags.Private ? getModifiers(isJS, isStatic, SyntaxKind.PublicKeyword) : declaration.modifiers
+            : undefined;
+        const fieldModifiers = isInClassLike ? getModifiers(isJS, isStatic, SyntaxKind.PrivateKeyword) : undefined;
+
+        updateFieldDeclaration(changeTracker, file, declaration, fieldName, fieldModifiers, container);
+
+        const getAccessor = generateGetAccessor(fieldName, accessorName, type, accessorModifiers, isStatic, container);
+        const setAccessor = generateSetAccessor(fieldName, accessorName, type, accessorModifiers, isStatic, container);
+
+        insertAccessor(changeTracker, file, getAccessor, declaration, container);
+        insertAccessor(changeTracker, file, setAccessor, declaration, container);
+
+        const edits = changeTracker.getChanges();
+        const renameFilename = file.fileName;
+        const renameLocationOffset = isIdentifier(fieldName) ? 0 : -1;
+        const renameLocation = renameLocationOffset + getRenameLocation(edits, renameFilename, fieldName.text, /*isDeclaredBeforeUse*/ false);
+        return { renameFilename, renameLocation, edits };
+    }
+
+    function isConvertableName (name: DeclarationName): name is AcceptedNameType {
+        return isIdentifier(name) || isStringLiteral(name);
+    }
+
+    function isAcceptedDeclaration(node: Node): node is AcceptedDeclaration {
+        return isParameterPropertyDeclaration(node) || isPropertyDeclaration(node) || isPropertyAssignment(node);
+    }
+
+    function createPropertyName (name: string, originalName: AcceptedNameType) {
+        return isIdentifier(originalName) ? createIdentifier(name) : createLiteral(name);
+    }
+
+    function createAccessorAccessExpression (fieldName: AcceptedNameType, isStatic: boolean, container: ContainerDeclaration) {
+        const leftHead = isStatic ? (<ClassLikeDeclaration>container).name : createThis();
+        return isIdentifier(fieldName) ? createPropertyAccess(leftHead, fieldName) : createElementAccess(leftHead, createLiteral(fieldName));
+    }
+
+    function getModifiers(isJS: boolean, isStatic: boolean, accessModifier: SyntaxKind.PublicKeyword | SyntaxKind.PrivateKeyword): NodeArray<Modifier> {
+        const modifiers = append<Modifier>(
+            !isJS ? [createToken(accessModifier) as Token<SyntaxKind.PublicKeyword> | Token<SyntaxKind.PrivateKeyword>] : undefined,
+            isStatic ? createToken(SyntaxKind.StaticKeyword) : undefined
+        );
+        return modifiers && createNodeArray(modifiers);
+    }
+
+    function getConvertibleFieldAtPosition(file: SourceFile, startPosition: number): Info | undefined {
+        const node = getTokenAtPosition(file, startPosition, /*includeJsDocComment*/ false);
+        const declaration = findAncestor(node.parent, isAcceptedDeclaration);
+        // make sure propertyDeclaration have AccessibilityModifier or Static Modifier
+        const meaning = ModifierFlags.AccessibilityModifier | ModifierFlags.Static;
+        if (!declaration || !isConvertableName(declaration.name) || (getModifierFlags(declaration) | meaning) !== meaning) return undefined;
+
+        const fieldName = createPropertyName(getUniqueName(`_${declaration.name.text}`, file.text), declaration.name);
+        const accessorName = createPropertyName(declaration.name.text, declaration.name);
+        suppressLeadingAndTrailingTrivia(fieldName);
+        suppressLeadingAndTrailingTrivia(declaration);
+        return {
+            isStatic: hasStaticModifier(declaration),
+            type: getTypeAnnotationNode(declaration),
+            container: declaration.kind === SyntaxKind.Parameter ? declaration.parent.parent : declaration.parent,
+            declaration,
+            fieldName,
+            accessorName,
+        };
+    }
+
+    function generateGetAccessor(fieldName: AcceptedNameType, accessorName: AcceptedNameType, type: TypeNode, modifiers: ModifiersArray | undefined, isStatic: boolean, container: ContainerDeclaration) {
+        return createGetAccessor(
+            /*decorators*/ undefined,
+            modifiers,
+            accessorName,
+            /*parameters*/ undefined,
+            type,
+            createBlock([
+                createReturn(
+                    createAccessorAccessExpression(fieldName, isStatic, container)
+                )
+            ], /*multiLine*/ true)
+        );
+    }
+
+    function generateSetAccessor(fieldName: AcceptedNameType, accessorName: AcceptedNameType, type: TypeNode, modifiers: ModifiersArray | undefined, isStatic: boolean, container: ContainerDeclaration) {
+        return createSetAccessor(
+            /*decorators*/ undefined,
+            modifiers,
+            accessorName,
+            [createParameter(
+                /*decorators*/ undefined,
+                /*modifiers*/ undefined,
+                /*dotDotDotToken*/ undefined,
+                createIdentifier("value"),
+                /*questionToken*/ undefined,
+                type
+            )],
+            createBlock([
+                createStatement(
+                    createAssignment(
+                        createAccessorAccessExpression(fieldName, isStatic, container),
+                        createIdentifier("value")
+                    )
+                )
+            ], /*multiLine*/ true)
+        );
+    }
+
+    function updatePropertyDeclaration(changeTracker: textChanges.ChangeTracker, file: SourceFile, declaration: PropertyDeclaration, fieldName: AcceptedNameType, modifiers: ModifiersArray | undefined) {
+        const property = updateProperty(
+            declaration,
+            declaration.decorators,
+            modifiers,
+            fieldName,
+            declaration.questionToken || declaration.exclamationToken,
+            declaration.type,
+            declaration.initializer
+        );
+
+        changeTracker.replaceNode(file, declaration, property);
+    }
+
+    function updateParameterPropertyDeclaration(changeTracker: textChanges.ChangeTracker, file: SourceFile, declaration: ParameterDeclaration, fieldName: AcceptedNameType, modifiers: ModifiersArray | undefined, classLikeContainer: ClassLikeDeclaration) {
+        const property = createProperty(
+            declaration.decorators,
+            modifiers,
+            fieldName,
+            declaration.questionToken,
+            declaration.type,
+            declaration.initializer
+        );
+
+        changeTracker.insertNodeAtClassStart(file, classLikeContainer, property);
+        changeTracker.deleteNodeInList(file, declaration);
+    }
+
+    function updatePropertyAssignmentDeclaration (changeTracker: textChanges.ChangeTracker, file: SourceFile, declaration: PropertyAssignment, fieldName: AcceptedNameType) {
+        const assignment = updatePropertyAssignment(declaration, fieldName, declaration.initializer);
+        changeTracker.replacePropertyAssignment(file, declaration, assignment);
+    }
+
+    function updateFieldDeclaration(changeTracker: textChanges.ChangeTracker, file: SourceFile, declaration: AcceptedDeclaration, fieldName: AcceptedNameType, modifiers: ModifiersArray | undefined, container: ContainerDeclaration) {
+        if (isPropertyDeclaration(declaration)) {
+            updatePropertyDeclaration(changeTracker, file, declaration, fieldName, modifiers);
+        }
+        else if (isPropertyAssignment(declaration)) {
+            updatePropertyAssignmentDeclaration(changeTracker, file, declaration, fieldName);
+        }
+        else {
+            updateParameterPropertyDeclaration(changeTracker, file, declaration, fieldName, modifiers, <ClassLikeDeclaration>container);
+        }
+    }
+
+    function insertAccessor(changeTracker: textChanges.ChangeTracker, file: SourceFile, accessor: AccessorDeclaration, declaration: AcceptedDeclaration, container: ContainerDeclaration) {
+        isParameterPropertyDeclaration(declaration)
+            ? changeTracker.insertNodeAtClassStart(file, <ClassLikeDeclaration>container, accessor)
+            : changeTracker.insertNodeAfter(file, declaration, accessor);
+    }
+}
diff --git a/src/services/refactors/refactors.ts b/src/services/refactors/refactors.ts
deleted file mode 100644
index da2f08a8e9f..00000000000
--- a/src/services/refactors/refactors.ts
+++ /dev/null
@@ -1 +0,0 @@
-/// <reference path="extractSymbol.ts" />
diff --git a/src/services/rename.ts b/src/services/rename.ts
index c40f7908776..2f9de0c0cad 100644
--- a/src/services/rename.ts
+++ b/src/services/rename.ts
@@ -2,7 +2,7 @@
 namespace ts.Rename {
     export function getRenameInfo(typeChecker: TypeChecker, defaultLibFileName: string, getCanonicalFileName: GetCanonicalFileName, sourceFile: SourceFile, position: number): RenameInfo {
         const getCanonicalDefaultLibName = memoize(() => getCanonicalFileName(normalizePath(defaultLibFileName)));
-        const node = getTouchingWord(sourceFile, position, /*includeJsDocComment*/ true);
+        const node = getTouchingPropertyName(sourceFile, position, /*includeJsDocComment*/ true);
         const renameInfo = node && nodeIsEligibleForRename(node)
             ? getRenameInfoForNode(node, typeChecker, sourceFile, isDefinedInLibraryFile)
             : undefined;
diff --git a/src/services/services.ts b/src/services/services.ts
index d6405b8e732..f17b7698a87 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -1,37 +1,3 @@
-/// <reference path="..\compiler\program.ts"/>
-/// <reference path="..\compiler\commandLineParser.ts"/>
-
-/// <reference path='types.ts' />
-/// <reference path='utilities.ts' />
-/// <reference path='breakpoints.ts' />
-/// <reference path='classifier.ts' />
-/// <reference path='completions.ts' />
-/// <reference path='documentHighlights.ts' />
-/// <reference path='documentRegistry.ts' />
-/// <reference path='findAllReferences.ts' />
-/// <reference path='goToDefinition.ts' />
-/// <reference path='jsDoc.ts' />
-/// <reference path='jsTyping.ts' />
-/// <reference path='navigateTo.ts' />
-/// <reference path='navigationBar.ts' />
-/// <reference path='organizeImports.ts' />
-/// <reference path='outliningElementsCollector.ts' />
-/// <reference path='patternMatcher.ts' />
-/// <reference path='preProcess.ts' />
-/// <reference path='rename.ts' />
-/// <reference path='signatureHelp.ts' />
-/// <reference path='suggestionDiagnostics.ts' />
-/// <reference path='symbolDisplay.ts' />
-/// <reference path='transpile.ts' />
-/// <reference path='formatting\formatting.ts' />
-/// <reference path='formatting\smartIndenter.ts' />
-/// <reference path='textChanges.ts' />
-/// <reference path='codeFixProvider.ts' />
-/// <reference path='refactorProvider.ts' />
-/// <reference path='codefixes\fixes.ts' />
-/// <reference path='refactors\refactors.ts' />
-/// <reference path="sourcemaps.ts" />
-
 namespace ts {
     /** The version of the language service API */
     export const servicesVersion = "0.8";
@@ -580,7 +546,6 @@ namespace ts {
         public typeReferenceDirectives: FileReference[];
 
         public syntacticDiagnostics: Diagnostic[];
-        public referenceDiagnostics: Diagnostic[];
         public parseDiagnostics: Diagnostic[];
         public bindDiagnostics: Diagnostic[];
 
@@ -1162,7 +1127,6 @@ namespace ts {
         let lastProjectVersion: string;
         let lastTypesRootVersion = 0;
 
-        const useCaseSensitivefileNames = host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames();
         const cancellationToken = new CancellationTokenObject(host.getCancellationToken && host.getCancellationToken());
 
         const currentDirectory = host.getCurrentDirectory();
@@ -1179,7 +1143,8 @@ namespace ts {
             }
         }
 
-        const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitivefileNames);
+        const useCaseSensitiveFileNames = hostUsesCaseSensitiveFileNames(host);
+        const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames);
 
         function getValidSourceFile(fileName: string): SourceFile {
             const sourceFile = program.getSourceFile(fileName);
@@ -1236,7 +1201,7 @@ namespace ts {
                 getSourceFileByPath: getOrCreateSourceFileByPath,
                 getCancellationToken: () => cancellationToken,
                 getCanonicalFileName,
-                useCaseSensitiveFileNames: () => useCaseSensitivefileNames,
+                useCaseSensitiveFileNames: () => useCaseSensitiveFileNames,
                 getNewLine: () => getNewLineCharacter(newSettings, () => getNewLineOrDefaultFromHost(host)),
                 getDefaultLibFileName: (options) => host.getDefaultLibFileName(options),
                 writeFile: noop,
@@ -1443,7 +1408,8 @@ namespace ts {
                 log,
                 getValidSourceFile(fileName),
                 position,
-                fullPreferences);
+                fullPreferences,
+                options.triggerCharacter);
         }
 
         function getCompletionEntryDetails(fileName: string, position: number, name: string, formattingOptions: FormatCodeSettings | undefined, source: string | undefined, preferences: UserPreferences = defaultPreferences): CompletionEntryDetails {
@@ -1457,7 +1423,9 @@ namespace ts {
                 host,
                 formattingOptions && formatting.getFormatContext(formattingOptions),
                 getCanonicalFileName,
-                preferences);
+                preferences,
+                cancellationToken,
+            );
         }
 
         function getCompletionEntrySymbol(fileName: string, position: number, name: string, source?: string): Symbol {
@@ -1498,7 +1466,7 @@ namespace ts {
                             kind: ScriptElementKind.unknown,
                             kindModifiers: ScriptElementKindModifier.none,
                             textSpan: createTextSpanFromNode(node, sourceFile),
-                            displayParts: typeToDisplayParts(typeChecker, type, getContainerNode(node)),
+                            displayParts: typeChecker.runWithCancellationToken(cancellationToken, typeChecker => typeToDisplayParts(typeChecker, type, getContainerNode(node))),
                             documentation: type.symbol ? type.symbol.getDocumentationComment(typeChecker) : undefined,
                             tags: type.symbol ? type.symbol.getJsDocTags() : undefined
                         };
@@ -1507,7 +1475,9 @@ namespace ts {
                 return undefined;
             }
 
-            const { symbolKind, displayParts, documentation, tags } = SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, sourceFile, getContainerNode(node), node);
+            const { symbolKind, displayParts, documentation, tags } = typeChecker.runWithCancellationToken(cancellationToken, typeChecker =>
+                SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, sourceFile, getContainerNode(node), node)
+            );
             return {
                 kind: symbolKind,
                 kindModifiers: SymbolDisplay.getSymbolModifiers(symbol),
@@ -1697,20 +1667,17 @@ namespace ts {
 
         /// References and Occurrences
         function getOccurrencesAtPosition(fileName: string, position: number): ReferenceEntry[] {
-            const canonicalFileName = getCanonicalFileName(normalizeSlashes(fileName));
-            return flatMap(getDocumentHighlights(fileName, position, [fileName]), entry => entry.highlightSpans.map<ReferenceEntry>(highlightSpan => {
-                Debug.assert(getCanonicalFileName(normalizeSlashes(entry.fileName)) === canonicalFileName); // Get occurrences only supports reporting occurrences for the file queried.
-                return {
-                    fileName: entry.fileName,
-                    textSpan: highlightSpan.textSpan,
-                    isWriteAccess: highlightSpan.kind === HighlightSpanKind.writtenReference,
-                    isDefinition: false,
-                    isInString: highlightSpan.isInString,
-                };
-            }));
+            return flatMap(getDocumentHighlights(fileName, position, [fileName]), entry => entry.highlightSpans.map<ReferenceEntry>(highlightSpan => ({
+                fileName: entry.fileName,
+                textSpan: highlightSpan.textSpan,
+                isWriteAccess: highlightSpan.kind === HighlightSpanKind.writtenReference,
+                isDefinition: false,
+                isInString: highlightSpan.isInString,
+            })));
         }
 
         function getDocumentHighlights(fileName: string, position: number, filesToSearch: ReadonlyArray<string>): DocumentHighlights[] {
+            Debug.assert(filesToSearch.some(f => normalizePath(f) === fileName));
             synchronizeHostData();
             const sourceFilesToSearch = map(filesToSearch, f => Debug.assertDefined(program.getSourceFile(f)));
             const sourceFile = getValidSourceFile(fileName);
@@ -1987,6 +1954,10 @@ namespace ts {
             return OrganizeImports.organizeImports(sourceFile, formatContext, host, program, preferences);
         }
 
+        function getEditsForFileRename(oldFilePath: string, newFilePath: string, formatOptions: FormatCodeSettings): ReadonlyArray<FileTextChanges> {
+            return ts.getEditsForFileRename(getProgram(), oldFilePath, newFilePath, host, formatting.getFormatContext(formatOptions));
+        }
+
         function applyCodeActionCommand(action: CodeActionCommand): Promise<ApplyCodeActionCommandResult>;
         function applyCodeActionCommand(action: CodeActionCommand[]): Promise<ApplyCodeActionCommandResult[]>;
         function applyCodeActionCommand(action: CodeActionCommand | CodeActionCommand[]): Promise<ApplyCodeActionCommandResult | ApplyCodeActionCommandResult[]>;
@@ -2287,6 +2258,7 @@ namespace ts {
             getCombinedCodeFix,
             applyCodeActionCommand,
             organizeImports,
+            getEditsForFileRename,
             getEmitOutput,
             getNonBoundSourceFile,
             getSourceFile,
diff --git a/src/services/shims.ts b/src/services/shims.ts
index 4ed1afb8813..d0735cc1717 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -13,8 +13,6 @@
 // limitations under the License.
 //
 
-/// <reference path='services.ts' />
-
 /* @internal */
 let debugObjectHost: { CollectGarbage(): void } = (function (this: any) { return this; })();
 
@@ -914,7 +912,7 @@ namespace ts {
          * to provide at the given source position and providing a member completion
          * list if requested.
          */
-        public getCompletionsAtPosition(fileName: string, position: number, preferences: UserPreferences | undefined) {
+        public getCompletionsAtPosition(fileName: string, position: number, preferences: GetCompletionsAtPositionOptions | undefined) {
             return this.forwardJSONCall(
                 `getCompletionsAtPosition('${fileName}', ${position}, ${preferences})`,
                 () => this.languageService.getCompletionsAtPosition(fileName, position, preferences)
diff --git a/src/services/signatureHelp.ts b/src/services/signatureHelp.ts
index 250127ecfc6..45cd828f5d7 100644
--- a/src/services/signatureHelp.ts
+++ b/src/services/signatureHelp.ts
@@ -1,4 +1,3 @@
-///<reference path='services.ts' />
 /* @internal */
 namespace ts.SignatureHelp {
     export const enum ArgumentListKind {
@@ -42,16 +41,16 @@ namespace ts.SignatureHelp {
             // We didn't have any sig help items produced by the TS compiler.  If this is a JS
             // file, then see if we can figure out anything better.
             if (isSourceFileJavaScript(sourceFile)) {
-                return createJavaScriptSignatureHelpItems(argumentInfo, program);
+                return createJavaScriptSignatureHelpItems(argumentInfo, program, cancellationToken);
             }
 
             return undefined;
         }
 
-        return createSignatureHelpItems(candidates, resolvedSignature, argumentInfo, typeChecker);
+        return typeChecker.runWithCancellationToken(cancellationToken, typeChecker => createSignatureHelpItems(candidates, resolvedSignature, argumentInfo, typeChecker));
     }
 
-    function createJavaScriptSignatureHelpItems(argumentInfo: ArgumentListInfo, program: Program): SignatureHelpItems {
+    function createJavaScriptSignatureHelpItems(argumentInfo: ArgumentListInfo, program: Program, cancellationToken: CancellationToken): SignatureHelpItems {
         if (argumentInfo.invocation.kind !== SyntaxKind.CallExpression) {
             return undefined;
         }
@@ -77,7 +76,7 @@ namespace ts.SignatureHelp {
                         if (type) {
                             const callSignatures = type.getCallSignatures();
                             if (callSignatures && callSignatures.length) {
-                                return createSignatureHelpItems(callSignatures, callSignatures[0], argumentInfo, typeChecker);
+                                return typeChecker.runWithCancellationToken(cancellationToken, typeChecker => createSignatureHelpItems(callSignatures, callSignatures[0], argumentInfo, typeChecker));
                             }
                         }
                     }
diff --git a/src/services/suggestionDiagnostics.ts b/src/services/suggestionDiagnostics.ts
index 1fc1d671e43..d04f3f15cf9 100644
--- a/src/services/suggestionDiagnostics.ts
+++ b/src/services/suggestionDiagnostics.ts
@@ -5,8 +5,8 @@ namespace ts {
         const checker = program.getDiagnosticsProducingTypeChecker();
         const diags: Diagnostic[] = [];
 
-        if (sourceFile.commonJsModuleIndicator) {
-            diags.push(createDiagnosticForNode(sourceFile.commonJsModuleIndicator, Diagnostics.File_is_a_CommonJS_module_it_may_be_converted_to_an_ES6_module));
+        if (sourceFile.commonJsModuleIndicator && (programContainsEs6Modules(program) || compilerOptionsIndicateEs6Modules(program.getCompilerOptions()))) {
+            diags.push(createDiagnosticForNode(getErrorNodeFromCommonJsIndicator(sourceFile.commonJsModuleIndicator), Diagnostics.File_is_a_CommonJS_module_it_may_be_converted_to_an_ES6_module));
         }
 
         const isJsFile = isSourceFileJavaScript(sourceFile);
@@ -61,4 +61,8 @@ namespace ts {
                 return undefined;
         }
     }
+
+    function getErrorNodeFromCommonJsIndicator(commonJsModuleIndicator: Node): Node {
+        return isBinaryExpression(commonJsModuleIndicator) ? commonJsModuleIndicator.left : commonJsModuleIndicator;
+    }
 }
diff --git a/src/services/symbolDisplay.ts b/src/services/symbolDisplay.ts
index 4693a5089f1..854f5297d68 100644
--- a/src/services/symbolDisplay.ts
+++ b/src/services/symbolDisplay.ts
@@ -26,6 +26,15 @@ namespace ts.SymbolDisplay {
     }
 
     function getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(typeChecker: TypeChecker, symbol: Symbol, location: Node): ScriptElementKind {
+        const roots = typeChecker.getRootSymbols(symbol);
+        // If this is a method from a mapped type, leave as a method so long as it still has a call signature.
+        if (roots.length === 1
+            && first(roots).flags & SymbolFlags.Method
+            // Ensure the mapped version is still a method, as opposed to `{ [K in keyof I]: number }`.
+            && typeChecker.getTypeOfSymbolAtLocation(symbol, location).getNonNullableType().getCallSignatures().length !== 0) {
+            return ScriptElementKind.memberFunctionElement;
+        }
+
         if (typeChecker.isUndefinedSymbol(symbol)) {
             return ScriptElementKind.variableElement;
         }
@@ -125,6 +134,7 @@ namespace ts.SymbolDisplay {
         let type: Type;
         let printer: Printer;
         let documentationFromAlias: SymbolDisplayPart[];
+        let tagsFromAlias: JSDocTagInfo[];
 
         // Class at constructor site need to be shown as constructor apart from property,method, vars
         if (symbolKind !== ScriptElementKind.unknown || symbolFlags & SymbolFlags.Class || symbolFlags & SymbolFlags.Alias) {
@@ -178,7 +188,7 @@ namespace ts.SymbolDisplay {
                     }
                     else if (symbolFlags & SymbolFlags.Alias) {
                         symbolKind = ScriptElementKind.alias;
-                        pushTypePart(symbolKind);
+                        pushSymbolKind(symbolKind);
                         displayParts.push(spacePart());
                         if (useConstructSignatures) {
                             displayParts.push(keywordPart(SyntaxKind.NewKeyword));
@@ -258,7 +268,7 @@ namespace ts.SymbolDisplay {
                 // Special case for class expressions because we would like to indicate that
                 // the class name is local to the class body (similar to function expression)
                 //      (local class) class <className>
-                pushTypePart(ScriptElementKind.localClassElement);
+                pushSymbolKind(ScriptElementKind.localClassElement);
             }
             else {
                 // Class declaration has name which is not local.
@@ -387,6 +397,7 @@ namespace ts.SymbolDisplay {
                         displayParts.push(...resolvedInfo.displayParts);
                         displayParts.push(lineBreakPart());
                         documentationFromAlias = resolvedInfo.documentation;
+                        tagsFromAlias = resolvedInfo.tags;
                     }
                 }
             }
@@ -402,6 +413,9 @@ namespace ts.SymbolDisplay {
                     displayParts.push(spacePart());
                     displayParts.push(keywordPart((symbol.declarations[0] as ExportAssignment).isExportEquals ? SyntaxKind.EqualsToken : SyntaxKind.DefaultKeyword));
                     break;
+                case SyntaxKind.ExportSpecifier:
+                    displayParts.push(keywordPart(SyntaxKind.ExportKeyword));
+                    break;
                 default:
                     displayParts.push(keywordPart(SyntaxKind.ImportKeyword));
             }
@@ -512,6 +526,9 @@ namespace ts.SymbolDisplay {
         if (documentation.length === 0 && documentationFromAlias) {
             documentation = documentationFromAlias;
         }
+        if (tags.length === 0 && tagsFromAlias) {
+            tags = tagsFromAlias;
+        }
 
         return { displayParts, documentation, symbolKind, tags };
 
@@ -531,7 +548,7 @@ namespace ts.SymbolDisplay {
 
         function addAliasPrefixIfNecessary() {
             if (alias) {
-                pushTypePart(ScriptElementKind.alias);
+                pushSymbolKind(ScriptElementKind.alias);
                 displayParts.push(spacePart());
             }
         }
@@ -549,12 +566,16 @@ namespace ts.SymbolDisplay {
             const fullSymbolDisplayParts = symbolToDisplayParts(typeChecker, symbolToDisplay, enclosingDeclaration || sourceFile, /*meaning*/ undefined,
                 SymbolFormatFlags.WriteTypeParametersOrArguments | SymbolFormatFlags.UseOnlyExternalAliasing | SymbolFormatFlags.AllowAnyNodeKind);
             addRange(displayParts, fullSymbolDisplayParts);
+
+            if (symbol.flags & SymbolFlags.Optional) {
+                displayParts.push(punctuationPart(SyntaxKind.QuestionToken));
+            }
         }
 
         function addPrefixForAnyFunctionOrVar(symbol: Symbol, symbolKind: string) {
             prefixNextMeaning();
             if (symbolKind) {
-                pushTypePart(symbolKind);
+                pushSymbolKind(symbolKind);
                 if (symbol && !some(symbol.declarations, d => isArrowFunction(d) || (isFunctionExpression(d) || isClassExpression(d)) && !d.name)) {
                     displayParts.push(spacePart());
                     addFullSymbolName(symbol);
@@ -562,7 +583,7 @@ namespace ts.SymbolDisplay {
             }
         }
 
-        function pushTypePart(symbolKind: string) {
+        function pushSymbolKind(symbolKind: string) {
             switch (symbolKind) {
                 case ScriptElementKind.variableElement:
                 case ScriptElementKind.functionElement:
diff --git a/src/services/textChanges.ts b/src/services/textChanges.ts
index 0a48bcf6228..4f431e28e0e 100644
--- a/src/services/textChanges.ts
+++ b/src/services/textChanges.ts
@@ -100,6 +100,10 @@ namespace ts.textChanges {
         preserveLeadingWhitespace?: boolean;
     }
 
+    export interface ReplaceWithMultipleNodesOptions extends InsertNodeOptions {
+        readonly joiner?: string;
+    }
+
     enum ChangeKind {
         Remove,
         ReplaceWithSingleNode,
@@ -130,7 +134,7 @@ namespace ts.textChanges {
     interface ReplaceWithMultipleNodes extends BaseChange {
         readonly kind: ChangeKind.ReplaceWithMultipleNodes;
         readonly nodes: ReadonlyArray<Node>;
-        readonly options?: InsertNodeOptions;
+        readonly options?: ReplaceWithMultipleNodesOptions;
     }
 
     interface ChangeText extends BaseChange {
@@ -303,7 +307,7 @@ namespace ts.textChanges {
             this.replaceRange(sourceFile, getAdjustedRange(sourceFile, startNode, endNode, options), newNode, options);
         }
 
-        private replaceRangeWithNodes(sourceFile: SourceFile, range: TextRange, newNodes: ReadonlyArray<Node>, options: InsertNodeOptions = {}) {
+        private replaceRangeWithNodes(sourceFile: SourceFile, range: TextRange, newNodes: ReadonlyArray<Node>, options: ReplaceWithMultipleNodesOptions & ConfigurableStartEnd = {}) {
             this.changes.push({ kind: ChangeKind.ReplaceWithMultipleNodes, sourceFile, range, options, nodes: newNodes });
             return this;
         }
@@ -312,15 +316,21 @@ namespace ts.textChanges {
             return this.replaceRangeWithNodes(sourceFile, getAdjustedRange(sourceFile, oldNode, oldNode, options), newNodes, options);
         }
 
-        public replaceNodeRangeWithNodes(sourceFile: SourceFile, startNode: Node, endNode: Node, newNodes: ReadonlyArray<Node>, options: ChangeNodeOptions = useNonAdjustedPositions) {
+        public replaceNodeRangeWithNodes(sourceFile: SourceFile, startNode: Node, endNode: Node, newNodes: ReadonlyArray<Node>, options: ReplaceWithMultipleNodesOptions & ConfigurableStartEnd = useNonAdjustedPositions) {
             return this.replaceRangeWithNodes(sourceFile, getAdjustedRange(sourceFile, startNode, endNode, options), newNodes, options);
         }
 
+        public replacePropertyAssignment(sourceFile: SourceFile, oldNode: PropertyAssignment, newNode: PropertyAssignment) {
+            return this.replaceNode(sourceFile, oldNode, newNode, {
+                suffix: "," + this.newLineCharacter
+            });
+        }
+
         private insertNodeAt(sourceFile: SourceFile, pos: number, newNode: Node, options: InsertNodeOptions = {}) {
             this.replaceRange(sourceFile, createTextRange(pos), newNode, options);
         }
 
-        private insertNodesAt(sourceFile: SourceFile, pos: number, newNodes: ReadonlyArray<Node>, options: InsertNodeOptions = {}): void {
+        private insertNodesAt(sourceFile: SourceFile, pos: number, newNodes: ReadonlyArray<Node>, options: ReplaceWithMultipleNodesOptions = {}): void {
             this.changes.push({ kind: ChangeKind.ReplaceWithMultipleNodes, sourceFile, options, nodes: newNodes, range: { pos, end: pos } });
         }
 
@@ -355,8 +365,12 @@ namespace ts.textChanges {
             this.insertText(sourceFile, token.getStart(sourceFile), text);
         }
 
+        public replaceRangeWithText(sourceFile: SourceFile, range: TextRange, text: string) {
+            this.changes.push({ kind: ChangeKind.Text, sourceFile, range, text });
+        }
+
         private insertText(sourceFile: SourceFile, pos: number, text: string): void {
-            this.changes.push({ kind: ChangeKind.Text, sourceFile, range: { pos, end: pos }, text });
+            this.replaceRangeWithText(sourceFile, createTextRange(pos), text);
         }
 
         /** Prefer this over replacing a node with another that has a type annotation, as it avoids reformatting the other parts of the node. */
@@ -447,10 +461,7 @@ namespace ts.textChanges {
         }
 
         public insertNodeAfter(sourceFile: SourceFile, after: Node, newNode: Node): this {
-            if (isStatementButNotDeclaration(after) ||
-                after.kind === SyntaxKind.PropertyDeclaration ||
-                after.kind === SyntaxKind.PropertySignature ||
-                after.kind === SyntaxKind.MethodSignature) {
+            if (needSemicolonBetween(after, newNode)) {
                 // check if previous statement ends with semicolon
                 // if not - insert semicolon to preserve the code from changing the meaning due to ASI
                 if (sourceFile.text.charCodeAt(after.end - 1) !== CharacterCodes.semicolon) {
@@ -465,18 +476,50 @@ namespace ts.textChanges {
             if (isClassDeclaration(node) || isModuleDeclaration(node)) {
                 return { prefix: this.newLineCharacter, suffix: this.newLineCharacter };
             }
-            else if (isStatement(node) || isClassElement(node) || isTypeElement(node)) {
+            else if (isStatement(node) || isClassOrTypeElement(node)) {
                 return { suffix: this.newLineCharacter };
             }
             else if (isVariableDeclaration(node)) {
                 return { prefix: ", " };
             }
+            else if (isPropertyAssignment(node)) {
+                return { suffix: "," + this.newLineCharacter };
+            }
             else if (isParameter(node)) {
                 return {};
             }
             return Debug.failBadSyntaxKind(node); // We haven't handled this kind of node yet -- add it
         }
 
+        public insertName(sourceFile: SourceFile, node: FunctionExpression | ClassExpression | ArrowFunction, name: string): void {
+            Debug.assert(!node.name);
+            if (node.kind === SyntaxKind.ArrowFunction) {
+                const arrow = findChildOfKind(node, SyntaxKind.EqualsGreaterThanToken, sourceFile)!;
+                const lparen = findChildOfKind(node, SyntaxKind.OpenParenToken, sourceFile);
+                if (lparen) {
+                    // `() => {}` --> `function f() {}`
+                    this.insertNodesAt(sourceFile, lparen.getStart(sourceFile), [createToken(SyntaxKind.FunctionKeyword), createIdentifier(name)], { joiner: " " });
+                    this.deleteNode(sourceFile, arrow);
+                }
+                else {
+                    // `x => {}` -> `function f(x) {}`
+                    this.insertText(sourceFile, first(node.parameters).getStart(sourceFile), `function ${name}(`);
+                    // Replacing full range of arrow to get rid of the leading space -- replace ` =>` with `)`
+                    this.replaceRange(sourceFile, arrow, createToken(SyntaxKind.CloseParenToken));
+                }
+
+                if (node.body.kind !== SyntaxKind.Block) {
+                    // `() => 0` => `function f() { return 0; }`
+                    this.insertNodesAt(sourceFile, node.body.getStart(sourceFile), [createToken(SyntaxKind.OpenBraceToken), createToken(SyntaxKind.ReturnKeyword)], { joiner: " ", suffix: " " });
+                    this.insertNodesAt(sourceFile, node.body.end, [createToken(SyntaxKind.SemicolonToken), createToken(SyntaxKind.CloseBraceToken)], { joiner: " " });
+                }
+            }
+            else {
+                const pos = findChildOfKind(node, node.kind === SyntaxKind.FunctionExpression ? SyntaxKind.FunctionKeyword : SyntaxKind.ClassKeyword, sourceFile)!.end;
+                this.insertNodeAt(sourceFile, pos, createIdentifier(name), { prefix: " " });
+            }
+        }
+
         /**
          * This function should be used to insert nodes in lists when nodes don't carry separators as the part of the node range,
          * i.e. arguments in arguments lists, parameters in parameter lists etc.
@@ -646,7 +689,7 @@ namespace ts.textChanges {
             const { options = {}, range: { pos } } = change;
             const format = (n: Node) => getFormattedTextOfNode(n, sourceFile, pos, options, newLineCharacter, formatContext, validate);
             const text = change.kind === ChangeKind.ReplaceWithMultipleNodes
-                ? change.nodes.map(n => removeSuffix(format(n), newLineCharacter)).join(newLineCharacter)
+                ? change.nodes.map(n => removeSuffix(format(n), newLineCharacter)).join(change.options.joiner || newLineCharacter)
                 : format(change.node);
             // strip initial indentation (spaces or tabs) if text will be inserted in the middle of the line
             const noIndent = (options.preserveLeadingWhitespace || options.indentation !== undefined || getLineStartPositionForPosition(pos, sourceFile) === pos) ? text : text.replace(/^\s+/, "");
@@ -893,4 +936,9 @@ namespace ts.textChanges {
     export function isValidLocationToAddComment(sourceFile: SourceFile, position: number) {
         return !isInComment(sourceFile, position) && !isInString(sourceFile, position) && !isInTemplateString(sourceFile, position);
     }
+
+    function needSemicolonBetween(a: Node, b: Node): boolean {
+        return (isPropertySignature(a) || isPropertyDeclaration(a)) && isClassOrTypeElement(b) && b.name.kind === SyntaxKind.ComputedPropertyName
+            || isStatementButNotDeclaration(a) && isStatementButNotDeclaration(b); // TODO: only if b would start with a `(` or `[`
+    }
 }
diff --git a/src/services/transform.ts b/src/services/transform.ts
index 07fc3c759e2..200fb9aacb2 100644
--- a/src/services/transform.ts
+++ b/src/services/transform.ts
@@ -1,5 +1,3 @@
-/// <reference path="..\compiler\transformer.ts"/>
-/// <reference path="transpile.ts"/>
 namespace ts {
     /**
      * Transform one or more nodes using the supplied transformers.
diff --git a/src/services/tsconfig.json b/src/services/tsconfig.json
index 4f838df6341..75b46a5c49b 100644
--- a/src/services/tsconfig.json
+++ b/src/services/tsconfig.json
@@ -6,81 +6,112 @@
         "declaration": true
     },
     "files": [
-        "../compiler/core.ts",
-        "../compiler/performance.ts",
-        "../compiler/sys.ts",
         "../compiler/types.ts",
+        "../compiler/performance.ts",
+        "../compiler/core.ts",
+        "../compiler/sys.ts",
+        "../compiler/diagnosticInformationMap.generated.ts",
         "../compiler/scanner.ts",
-        "../compiler/parser.ts",
         "../compiler/utilities.ts",
+        "../compiler/parser.ts",
         "../compiler/binder.ts",
         "../compiler/symbolWalker.ts",
+        "../compiler/moduleNameResolver.ts",
         "../compiler/checker.ts",
         "../compiler/factory.ts",
         "../compiler/visitor.ts",
         "../compiler/transformers/utilities.ts",
+        "../compiler/transformers/destructuring.ts",
         "../compiler/transformers/ts.ts",
-        "../compiler/transformers/jsx.ts",
-        "../compiler/transformers/esnext.ts",
         "../compiler/transformers/es2017.ts",
+        "../compiler/transformers/esnext.ts",
+        "../compiler/transformers/jsx.ts",
         "../compiler/transformers/es2016.ts",
         "../compiler/transformers/es2015.ts",
         "../compiler/transformers/es5.ts",
         "../compiler/transformers/generators.ts",
-        "../compiler/transformers/destructuring.ts",
         "../compiler/transformers/module/module.ts",
         "../compiler/transformers/module/system.ts",
         "../compiler/transformers/module/es2015.ts",
         "../compiler/transformers/declarations/diagnostics.ts",
         "../compiler/transformers/declarations.ts",
         "../compiler/transformer.ts",
-        "../compiler/comments.ts",
         "../compiler/sourcemap.ts",
+        "../compiler/comments.ts",
         "../compiler/emitter.ts",
+        "../compiler/watchUtilities.ts",
         "../compiler/program.ts",
         "../compiler/builderState.ts",
         "../compiler/builder.ts",
         "../compiler/resolutionCache.ts",
         "../compiler/watch.ts",
-        "../compiler/watchUtilities.ts",
         "../compiler/commandLineParser.ts",
-        "../compiler/diagnosticInformationMap.generated.ts",
+
         "types.ts",
         "utilities.ts",
-        "breakpoints.ts",
         "classifier.ts",
+        "pathCompletions.ts",
         "completions.ts",
         "documentHighlights.ts",
         "documentRegistry.ts",
-        "findAllReferences.ts",
         "importTracker.ts",
+        "findAllReferences.ts",
         "goToDefinition.ts",
         "jsDoc.ts",
+        "semver.ts",
         "jsTyping.ts",
         "navigateTo.ts",
         "navigationBar.ts",
         "organizeImports.ts",
+        "getEditsForFileRename.ts",
         "outliningElementsCollector.ts",
-        "pathCompletions.ts",
         "patternMatcher.ts",
         "preProcess.ts",
         "rename.ts",
-        "services.ts",
-        "transform.ts",
-        "transpile.ts",
-        "semver.ts",
-        "shims.ts",
         "signatureHelp.ts",
         "suggestionDiagnostics.ts",
-        "sourcemaps.ts",
         "symbolDisplay.ts",
+        "transpile.ts",
+        "formatting/formattingContext.ts",
+        "formatting/formattingScanner.ts",
+        "formatting/rule.ts",
+        "formatting/rules.ts",
+        "formatting/rulesMap.ts",
+        "formatting/formatting.ts",
+        "formatting/smartIndenter.ts",
         "textChanges.ts",
+        "codeFixProvider.ts",
         "refactorProvider.ts",
-        "codeFixProvider.ts"
-    ],
-    "include": [
-        "formatting/*",
-        "codefixes/*",
-        "refactors/*"
+        "codefixes/addMissingInvocationForDecorator.ts",
+        "codefixes/annotateWithTypeFromJSDoc.ts",
+        "codefixes/convertFunctionToEs6Class.ts",
+        "codefixes/convertToEs6Module.ts",
+        "codefixes/correctQualifiedNameToIndexedAccessType.ts",
+        "codefixes/fixClassIncorrectlyImplementsInterface.ts",
+        "codefixes/importFixes.ts",
+        "codefixes/fixSpelling.ts",
+        "codefixes/fixAddMissingMember.ts",
+        "codefixes/fixCannotFindModule.ts",
+        "codefixes/fixClassDoesntImplementInheritedAbstractMember.ts",
+        "codefixes/fixClassSuperMustPrecedeThisAccess.ts",
+        "codefixes/fixConstructorForDerivedNeedSuperCall.ts",
+        "codefixes/fixExtendsInterfaceBecomesImplements.ts",
+        "codefixes/fixForgottenThisPropertyAccess.ts",
+        "codefixes/fixUnusedIdentifier.ts",
+        "codefixes/fixJSDocTypes.ts",
+        "codefixes/fixAwaitInSyncFunction.ts",
+        "codefixes/disableJsDiagnostics.ts",
+        "codefixes/helpers.ts",
+        "codefixes/inferFromUsage.ts",
+        "codefixes/fixInvalidImportSyntax.ts",
+        "codefixes/fixStrictClassInitialization.ts",
+        "codefixes/useDefaultImport.ts",
+        "refactors/extractSymbol.ts",
+        "refactors/generateGetAccessorAndSetAccessor.ts",
+        "sourcemaps.ts",
+        "services.ts",
+        "breakpoints.ts",
+        "transform.ts",
+        "shims.ts"
     ]
 }
diff --git a/src/services/types.ts b/src/services/types.ts
index 0c3e6a90314..e835d0cdef6 100644
--- a/src/services/types.ts
+++ b/src/services/types.ts
@@ -228,6 +228,7 @@ namespace ts {
     }
 
     export interface UserPreferences {
+        readonly disableSuggestions?: boolean;
         readonly quotePreference?: "double" | "single";
         readonly includeCompletionsForModuleExports?: boolean;
         readonly includeCompletionsWithInsertText?: boolean;
@@ -333,6 +334,7 @@ namespace ts {
         getApplicableRefactors(fileName: string, positionOrRaneg: number | TextRange, preferences: UserPreferences | undefined): ApplicableRefactorInfo[];
         getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string, preferences: UserPreferences | undefined): RefactorEditInfo | undefined;
         organizeImports(scope: OrganizeImportsScope, formatOptions: FormatCodeSettings, preferences: UserPreferences | undefined): ReadonlyArray<FileTextChanges>;
+        getEditsForFileRename(oldFilePath: string, newFilePath: string, formatOptions: FormatCodeSettings): ReadonlyArray<FileTextChanges>;
 
         getEmitOutput(fileName: string, emitOnlyDtsFiles?: boolean): EmitOutput;
 
@@ -353,8 +355,9 @@ namespace ts {
 
     export type OrganizeImportsScope = CombinedCodeFixScope;
 
-    /** @deprecated Use UserPreferences */
     export interface GetCompletionsAtPositionOptions extends UserPreferences {
+        /** If the editor is asking for completions because a certain character was typed, and not because the user explicitly requested them, this should be set. */
+        triggerCharacter?: string;
         /** @deprecated Use includeCompletionsForModuleExports */
         includeExternalModuleExports?: boolean;
         /** @deprecated Use includeCompletionsWithInsertText */
@@ -445,6 +448,8 @@ namespace ts {
     }
 
     export interface CodeFixAction extends CodeAction {
+        /** Short name to identify the fix, for use by telemetry. */
+        fixName: string;
         /**
          * If present, one may call 'getCombinedCodeFix' with this fixId.
          * This may be omitted to indicate that the code fix can't be applied in a group.
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index 378a711e0c9..78f18869b37 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -627,18 +627,12 @@ namespace ts {
         return syntaxList;
     }
 
-    /* Gets the token whose text has range [start, end) and
-     * position >= start and (position < end or (position === end && token is keyword or identifier))
-     */
-    export function getTouchingWord(sourceFile: SourceFile, position: number, includeJsDocComment: boolean): Node {
-        return getTouchingToken(sourceFile, position, includeJsDocComment, n => isWord(n.kind));
-    }
-
-    /* Gets the token whose text has range [start, end) and position >= start
-     * and (position < end or (position === end && token is keyword or identifier or numeric/string literal))
+    /**
+     * Gets the token whose text has range [start, end) and
+     * position >= start and (position < end or (position === end && token is literal or keyword or identifier))
      */
     export function getTouchingPropertyName(sourceFile: SourceFile, position: number, includeJsDocComment: boolean): Node {
-        return getTouchingToken(sourceFile, position, includeJsDocComment, n => isPropertyName(n.kind));
+        return getTouchingToken(sourceFile, position, includeJsDocComment, n => isPropertyNameLiteral(n) || isKeyword(n.kind));
     }
 
     /**
@@ -1059,14 +1053,6 @@ namespace ts {
         return undefined;
     }
 
-    export function isWord(kind: SyntaxKind): boolean {
-        return kind === SyntaxKind.Identifier || isKeyword(kind);
-    }
-
-    function isPropertyName(kind: SyntaxKind): boolean {
-        return kind === SyntaxKind.StringLiteral || kind === SyntaxKind.NumericLiteral || isWord(kind);
-    }
-
     export function isComment(kind: SyntaxKind): boolean {
         return kind === SyntaxKind.SingleLineCommentTrivia || kind === SyntaxKind.MultiLineCommentTrivia;
     }
@@ -1227,6 +1213,21 @@ namespace ts {
             ? isStringOrNumericLiteral(name.expression) ? name.expression.text : undefined
             : getTextOfIdentifierOrLiteral(name);
     }
+
+    export function programContainsEs6Modules(program: Program): boolean {
+        return program.getSourceFiles().some(s => !s.isDeclarationFile && !program.isSourceFileFromExternalLibrary(s) && !!s.externalModuleIndicator);
+    }
+    export function compilerOptionsIndicateEs6Modules(compilerOptions: CompilerOptions): boolean {
+        return !!compilerOptions.module || compilerOptions.target >= ScriptTarget.ES2015 || !!compilerOptions.noEmit;
+    }
+
+    export function hostUsesCaseSensitiveFileNames(host: LanguageServiceHost): boolean {
+        return host.useCaseSensitiveFileNames ? host.useCaseSensitiveFileNames() : false;
+    }
+
+    export function hostGetCanonicalFileName(host: LanguageServiceHost): GetCanonicalFileName {
+        return createGetCanonicalFileName(hostUsesCaseSensitiveFileNames(host));
+    }
 }
 
 // Display-part writer helpers
@@ -1459,11 +1460,13 @@ namespace ts {
      * WARNING: This is an expensive operation and is only intended to be used in refactorings
      * and code fixes (because those are triggered by explicit user actions).
      */
-    export function getSynthesizedDeepClone<T extends Node>(node: T | undefined): T | undefined {
-        if (node === undefined) {
-            return undefined;
-        }
+    export function getSynthesizedDeepClone<T extends Node>(node: T | undefined, includeTrivia = true): T | undefined {
+        const clone = node && getSynthesizedDeepCloneWorker(node);
+        if (clone && !includeTrivia) suppressLeadingAndTrailingTrivia(clone);
+        return clone;
+    }
 
+    function getSynthesizedDeepCloneWorker<T extends Node>(node: T): T | undefined {
         const visited = visitEachChild(node, getSynthesizedDeepClone, nullTransformationContext);
         if (visited === node) {
             // This only happens for leaf nodes - internal nodes always see their children change.
@@ -1474,22 +1477,18 @@ namespace ts {
             else if (isNumericLiteral(clone)) {
                 clone.numericLiteralFlags = (node as any).numericLiteralFlags;
             }
-            clone.pos = node.pos;
-            clone.end = node.end;
-            return clone;
+            return setTextRange(clone, node);
         }
 
         // PERF: As an optimization, rather than calling getSynthesizedClone, we'll update
         // the new node created by visitEachChild with the extra changes getSynthesizedClone
         // would have made.
-
         visited.parent = undefined;
-
         return visited;
     }
 
-    export function getSynthesizedDeepClones<T extends Node>(nodes: NodeArray<T> | undefined): NodeArray<T> | undefined {
-        return nodes && createNodeArray(nodes.map(getSynthesizedDeepClone), nodes.hasTrailingComma);
+    export function getSynthesizedDeepClones<T extends Node>(nodes: NodeArray<T> | undefined, includeTrivia = true): NodeArray<T> | undefined {
+        return nodes && createNodeArray(nodes.map(n => getSynthesizedDeepClone(n, includeTrivia)), nodes.hasTrailingComma);
     }
 
     /**
@@ -1526,4 +1525,45 @@ namespace ts {
     function getFirstChild(node: Node): Node | undefined {
         return node.forEachChild(child => child);
     }
+
+    /* @internal */
+    export function getUniqueName(baseName: string, fileText: string): string {
+        let nameText = baseName;
+        for (let i = 1; stringContains(fileText, nameText); i++) {
+            nameText = `${baseName}_${i}`;
+        }
+        return nameText;
+    }
+
+    /**
+     * @return The index of the (only) reference to the extracted symbol.  We want the cursor
+     * to be on the reference, rather than the declaration, because it's closer to where the
+     * user was before extracting it.
+     */
+    /* @internal */
+    export function getRenameLocation(edits: ReadonlyArray<FileTextChanges>, renameFilename: string, name: string, isDeclaredBeforeUse: boolean): number {
+        let delta = 0;
+        let lastPos = -1;
+        for (const { fileName, textChanges } of edits) {
+            Debug.assert(fileName === renameFilename);
+            for (const change of textChanges) {
+                const { span, newText } = change;
+                const index = newText.indexOf(name);
+                if (index !== -1) {
+                    lastPos = span.start + delta + index;
+
+                    // If the reference comes first, return immediately.
+                    if (!isDeclaredBeforeUse) {
+                        return lastPos;
+                    }
+                }
+                delta += newText.length - span.length;
+            }
+        }
+
+        // If the declaration comes first, return the position of the last occurrence.
+        Debug.assert(isDeclaredBeforeUse);
+        Debug.assert(lastPos >= 0);
+        return lastPos;
+    }
 }
diff --git a/tests/baselines/reference/aliasDoesNotDuplicateSignatures.errors.txt b/tests/baselines/reference/aliasDoesNotDuplicateSignatures.errors.txt
new file mode 100644
index 00000000000..38e2c8cfe17
--- /dev/null
+++ b/tests/baselines/reference/aliasDoesNotDuplicateSignatures.errors.txt
@@ -0,0 +1,21 @@
+tests/cases/compiler/user.ts(3,5): error TS2322: Type '() => void' is not assignable to type 'string'.
+tests/cases/compiler/user.ts(4,5): error TS2322: Type '() => void' is not assignable to type 'string'.
+
+
+==== tests/cases/compiler/demo.d.ts (0 errors) ====
+    declare namespace demoNS {
+        function f(): void;
+    }
+    declare module 'demoModule' {
+        import alias = demoNS;
+        export = alias;
+    }
+==== tests/cases/compiler/user.ts (2 errors) ====
+    import { f } from 'demoModule';
+    // Assign an incorrect type here to see the type of 'f'.
+    let x1: string = demoNS.f;
+        ~~
+!!! error TS2322: Type '() => void' is not assignable to type 'string'.
+    let x2: string = f;
+        ~~
+!!! error TS2322: Type '() => void' is not assignable to type 'string'.
\ No newline at end of file
diff --git a/tests/baselines/reference/aliasDoesNotDuplicateSignatures.js b/tests/baselines/reference/aliasDoesNotDuplicateSignatures.js
new file mode 100644
index 00000000000..0ae878bebc5
--- /dev/null
+++ b/tests/baselines/reference/aliasDoesNotDuplicateSignatures.js
@@ -0,0 +1,23 @@
+//// [tests/cases/compiler/aliasDoesNotDuplicateSignatures.ts] ////
+
+//// [demo.d.ts]
+declare namespace demoNS {
+    function f(): void;
+}
+declare module 'demoModule' {
+    import alias = demoNS;
+    export = alias;
+}
+//// [user.ts]
+import { f } from 'demoModule';
+// Assign an incorrect type here to see the type of 'f'.
+let x1: string = demoNS.f;
+let x2: string = f;
+
+//// [user.js]
+"use strict";
+exports.__esModule = true;
+var demoModule_1 = require("demoModule");
+// Assign an incorrect type here to see the type of 'f'.
+var x1 = demoNS.f;
+var x2 = demoModule_1.f;
diff --git a/tests/baselines/reference/aliasDoesNotDuplicateSignatures.symbols b/tests/baselines/reference/aliasDoesNotDuplicateSignatures.symbols
new file mode 100644
index 00000000000..21ae7940f96
--- /dev/null
+++ b/tests/baselines/reference/aliasDoesNotDuplicateSignatures.symbols
@@ -0,0 +1,32 @@
+=== tests/cases/compiler/demo.d.ts ===
+declare namespace demoNS {
+>demoNS : Symbol(demoNS, Decl(demo.d.ts, 0, 0))
+
+    function f(): void;
+>f : Symbol(f, Decl(demo.d.ts, 0, 26))
+}
+declare module 'demoModule' {
+>'demoModule' : Symbol('demoModule', Decl(demo.d.ts, 2, 1))
+
+    import alias = demoNS;
+>alias : Symbol(alias, Decl(demo.d.ts, 3, 29))
+>demoNS : Symbol(alias, Decl(demo.d.ts, 0, 0))
+
+    export = alias;
+>alias : Symbol(alias, Decl(demo.d.ts, 3, 29))
+}
+=== tests/cases/compiler/user.ts ===
+import { f } from 'demoModule';
+>f : Symbol(f, Decl(user.ts, 0, 8))
+
+// Assign an incorrect type here to see the type of 'f'.
+let x1: string = demoNS.f;
+>x1 : Symbol(x1, Decl(user.ts, 2, 3))
+>demoNS.f : Symbol(f, Decl(demo.d.ts, 0, 26))
+>demoNS : Symbol(demoNS, Decl(demo.d.ts, 0, 0))
+>f : Symbol(f, Decl(demo.d.ts, 0, 26))
+
+let x2: string = f;
+>x2 : Symbol(x2, Decl(user.ts, 3, 3))
+>f : Symbol(f, Decl(user.ts, 0, 8))
+
diff --git a/tests/baselines/reference/aliasDoesNotDuplicateSignatures.types b/tests/baselines/reference/aliasDoesNotDuplicateSignatures.types
new file mode 100644
index 00000000000..ada54494a83
--- /dev/null
+++ b/tests/baselines/reference/aliasDoesNotDuplicateSignatures.types
@@ -0,0 +1,32 @@
+=== tests/cases/compiler/demo.d.ts ===
+declare namespace demoNS {
+>demoNS : typeof demoNS
+
+    function f(): void;
+>f : () => void
+}
+declare module 'demoModule' {
+>'demoModule' : typeof 'demoModule'
+
+    import alias = demoNS;
+>alias : typeof alias
+>demoNS : typeof alias
+
+    export = alias;
+>alias : typeof alias
+}
+=== tests/cases/compiler/user.ts ===
+import { f } from 'demoModule';
+>f : () => void
+
+// Assign an incorrect type here to see the type of 'f'.
+let x1: string = demoNS.f;
+>x1 : string
+>demoNS.f : () => void
+>demoNS : typeof demoNS
+>f : () => void
+
+let x2: string = f;
+>x2 : string
+>f : () => void
+
diff --git a/tests/baselines/reference/allowJscheckJsTypeParameterNoCrash.errors.txt b/tests/baselines/reference/allowJscheckJsTypeParameterNoCrash.errors.txt
new file mode 100644
index 00000000000..5548bc5e3dc
--- /dev/null
+++ b/tests/baselines/reference/allowJscheckJsTypeParameterNoCrash.errors.txt
@@ -0,0 +1,23 @@
+tests/cases/compiler/app.js(6,7): error TS2322: Type '1' is not assignable to type 'WatchHandler<any>'.
+
+
+==== tests/cases/compiler/func.ts (0 errors) ====
+    interface ComponentOptions<V> {
+        watch: Record<string, WatchHandler<any>>;
+    }
+    type WatchHandler<T> = (val: T) => void;
+    declare function extend(options: ComponentOptions<{}>): void;
+    export var vextend = extend;
+==== tests/cases/compiler/app.js (1 errors) ====
+    import {vextend} from './func';
+    // hover on vextend
+    export var a = vextend({
+      watch: {
+        data1(val) {
+          this.data2 = 1;
+          ~~~~~~~~~~
+!!! error TS2322: Type '1' is not assignable to type 'WatchHandler<any>'.
+        },
+        data2(val) { },
+      }
+    });
\ No newline at end of file
diff --git a/tests/baselines/reference/allowJscheckJsTypeParameterNoCrash.js b/tests/baselines/reference/allowJscheckJsTypeParameterNoCrash.js
new file mode 100644
index 00000000000..c2b9ddb5556
--- /dev/null
+++ b/tests/baselines/reference/allowJscheckJsTypeParameterNoCrash.js
@@ -0,0 +1,38 @@
+//// [tests/cases/compiler/allowJscheckJsTypeParameterNoCrash.ts] ////
+
+//// [func.ts]
+interface ComponentOptions<V> {
+    watch: Record<string, WatchHandler<any>>;
+}
+type WatchHandler<T> = (val: T) => void;
+declare function extend(options: ComponentOptions<{}>): void;
+export var vextend = extend;
+//// [app.js]
+import {vextend} from './func';
+// hover on vextend
+export var a = vextend({
+  watch: {
+    data1(val) {
+      this.data2 = 1;
+    },
+    data2(val) { },
+  }
+});
+
+//// [func.js]
+"use strict";
+exports.__esModule = true;
+exports.vextend = extend;
+//// [app.js]
+"use strict";
+exports.__esModule = true;
+var func_1 = require("./func");
+// hover on vextend
+exports.a = func_1.vextend({
+    watch: {
+        data1: function (val) {
+            this.data2 = 1;
+        },
+        data2: function (val) { }
+    }
+});
diff --git a/tests/baselines/reference/allowJscheckJsTypeParameterNoCrash.symbols b/tests/baselines/reference/allowJscheckJsTypeParameterNoCrash.symbols
new file mode 100644
index 00000000000..2ca59a3dc60
--- /dev/null
+++ b/tests/baselines/reference/allowJscheckJsTypeParameterNoCrash.symbols
@@ -0,0 +1,51 @@
+=== tests/cases/compiler/func.ts ===
+interface ComponentOptions<V> {
+>ComponentOptions : Symbol(ComponentOptions, Decl(func.ts, 0, 0))
+>V : Symbol(V, Decl(func.ts, 0, 27))
+
+    watch: Record<string, WatchHandler<any>>;
+>watch : Symbol(ComponentOptions.watch, Decl(func.ts, 0, 31))
+>Record : Symbol(Record, Decl(lib.d.ts, --, --))
+>WatchHandler : Symbol(WatchHandler, Decl(func.ts, 2, 1))
+}
+type WatchHandler<T> = (val: T) => void;
+>WatchHandler : Symbol(WatchHandler, Decl(func.ts, 2, 1))
+>T : Symbol(T, Decl(func.ts, 3, 18))
+>val : Symbol(val, Decl(func.ts, 3, 24))
+>T : Symbol(T, Decl(func.ts, 3, 18))
+
+declare function extend(options: ComponentOptions<{}>): void;
+>extend : Symbol(extend, Decl(func.ts, 3, 40))
+>options : Symbol(options, Decl(func.ts, 4, 24))
+>ComponentOptions : Symbol(ComponentOptions, Decl(func.ts, 0, 0))
+
+export var vextend = extend;
+>vextend : Symbol(vextend, Decl(func.ts, 5, 10))
+>extend : Symbol(extend, Decl(func.ts, 3, 40))
+
+=== tests/cases/compiler/app.js ===
+import {vextend} from './func';
+>vextend : Symbol(vextend, Decl(app.js, 0, 8))
+
+// hover on vextend
+export var a = vextend({
+>a : Symbol(a, Decl(app.js, 2, 10))
+>vextend : Symbol(vextend, Decl(app.js, 0, 8))
+
+  watch: {
+>watch : Symbol(watch, Decl(app.js, 2, 24))
+
+    data1(val) {
+>data1 : Symbol(data1, Decl(app.js, 3, 10))
+>val : Symbol(val, Decl(app.js, 4, 10))
+
+      this.data2 = 1;
+>this : Symbol(__type, Decl(lib.d.ts, --, --))
+>data2 : Symbol(data2, Decl(app.js, 4, 16), Decl(app.js, 6, 6))
+
+    },
+    data2(val) { },
+>data2 : Symbol(data2, Decl(app.js, 4, 16), Decl(app.js, 6, 6))
+>val : Symbol(val, Decl(app.js, 7, 10))
+  }
+});
diff --git a/tests/baselines/reference/allowJscheckJsTypeParameterNoCrash.types b/tests/baselines/reference/allowJscheckJsTypeParameterNoCrash.types
new file mode 100644
index 00000000000..396cdd4445e
--- /dev/null
+++ b/tests/baselines/reference/allowJscheckJsTypeParameterNoCrash.types
@@ -0,0 +1,57 @@
+=== tests/cases/compiler/func.ts ===
+interface ComponentOptions<V> {
+>ComponentOptions : ComponentOptions<V>
+>V : V
+
+    watch: Record<string, WatchHandler<any>>;
+>watch : Record<string, (val: any) => void>
+>Record : Record<K, T>
+>WatchHandler : (val: T) => void
+}
+type WatchHandler<T> = (val: T) => void;
+>WatchHandler : (val: T) => void
+>T : T
+>val : T
+>T : T
+
+declare function extend(options: ComponentOptions<{}>): void;
+>extend : (options: ComponentOptions<{}>) => void
+>options : ComponentOptions<{}>
+>ComponentOptions : ComponentOptions<V>
+
+export var vextend = extend;
+>vextend : (options: ComponentOptions<{}>) => void
+>extend : (options: ComponentOptions<{}>) => void
+
+=== tests/cases/compiler/app.js ===
+import {vextend} from './func';
+>vextend : (options: ComponentOptions<{}>) => void
+
+// hover on vextend
+export var a = vextend({
+>a : void
+>vextend({  watch: {    data1(val) {      this.data2 = 1;    },    data2(val) { },  }}) : void
+>vextend : (options: ComponentOptions<{}>) => void
+>{  watch: {    data1(val) {      this.data2 = 1;    },    data2(val) { },  }} : { watch: { data1(val: any): void; }; }
+
+  watch: {
+>watch : { data1(val: any): void; }
+>{    data1(val) {      this.data2 = 1;    },    data2(val) { },  } : { data1(val: any): void; }
+
+    data1(val) {
+>data1 : (val: any) => void
+>val : any
+
+      this.data2 = 1;
+>this.data2 = 1 : 1
+>this.data2 : (val: any) => void
+>this : Record<string, (val: any) => void>
+>data2 : (val: any) => void
+>1 : 1
+
+    },
+    data2(val) { },
+>data2 : any
+>val : any
+  }
+});
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
index 12231a0fa76..7a0a2b4676c 100644
--- a/tests/baselines/reference/api/tsserverlibrary.d.ts
+++ b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -585,6 +585,7 @@ declare namespace ts {
     }
     interface PropertyDeclaration extends ClassElement, JSDocContainer {
         kind: SyntaxKind.PropertyDeclaration;
+        parent: ClassLikeDeclaration;
         name: PropertyName;
         questionToken?: QuestionToken;
         exclamationToken?: ExclamationToken;
@@ -1018,7 +1019,7 @@ declare namespace ts {
     interface ElementAccessExpression extends MemberExpression {
         kind: SyntaxKind.ElementAccessExpression;
         expression: LeftHandSideExpression;
-        argumentExpression?: Expression;
+        argumentExpression: Expression;
     }
     interface SuperElementAccessExpression extends ElementAccessExpression {
         expression: SuperExpression;
@@ -1050,6 +1051,7 @@ declare namespace ts {
     interface TaggedTemplateExpression extends MemberExpression {
         kind: SyntaxKind.TaggedTemplateExpression;
         tag: LeftHandSideExpression;
+        typeArguments?: NodeArray<TypeNode>;
         template: TemplateLiteral;
     }
     type CallLikeExpression = CallExpression | NewExpression | TaggedTemplateExpression | Decorator | JsxOpeningLikeElement;
@@ -1159,7 +1161,7 @@ declare namespace ts {
     interface DebuggerStatement extends Statement {
         kind: SyntaxKind.DebuggerStatement;
     }
-    interface MissingDeclaration extends DeclarationStatement, ClassElement, ObjectLiteralElement, TypeElement {
+    interface MissingDeclaration extends DeclarationStatement {
         kind: SyntaxKind.MissingDeclaration;
         name?: Identifier;
     }
@@ -1492,7 +1494,7 @@ declare namespace ts {
         comment: string | undefined;
     }
     interface JSDocTag extends Node {
-        parent: JSDoc;
+        parent: JSDoc | JSDocTypeLiteral;
         atToken: AtToken;
         tagName: Identifier;
         comment: string | undefined;
@@ -1840,6 +1842,12 @@ declare namespace ts {
         getSuggestionForNonexistentModule(node: Identifier, target: Symbol): string | undefined;
         getBaseConstraintOfType(type: Type): Type | undefined;
         getDefaultFromTypeParameter(type: Type): Type | undefined;
+        /**
+         * Depending on the operation performed, it may be appropriate to throw away the checker
+         * if the cancellation token is triggered. Typically, if it is used for error checking
+         * and the operation is cancelled, then it should be discarded, otherwise it is safe to keep.
+         */
+        runWithCancellationToken<T>(token: CancellationToken, cb: (checker: TypeChecker) => T): T;
     }
     enum NodeBuilderFlags {
         None = 0,
@@ -2098,7 +2106,7 @@ declare namespace ts {
         Unit = 13536,
         StringOrNumberLiteral = 96,
         PossiblyFalsy = 14574,
-        StringLike = 524322,
+        StringLike = 34,
         NumberLike = 84,
         BooleanLike = 136,
         EnumLike = 272,
@@ -2275,7 +2283,7 @@ declare namespace ts {
         category: DiagnosticCategory;
         code: number;
         message: string;
-        unused?: {};
+        reportsUnnecessary?: {};
     }
     /**
      * A linked list of formatted diagnostic messages to be used as part of a multiline message.
@@ -2338,6 +2346,7 @@ declare namespace ts {
         inlineSources?: boolean;
         isolatedModules?: boolean;
         jsx?: JsxEmit;
+        keyofStringsOnly?: boolean;
         lib?: string[];
         locale?: string;
         mapRoot?: string;
@@ -2888,6 +2897,7 @@ declare namespace ts {
         newLine: string;
         useCaseSensitiveFileNames: boolean;
         write(s: string): void;
+        writeOutputIsTTY?(): boolean;
         readFile(path: string, encoding?: string): string | undefined;
         getFileSize?(path: string): number;
         writeFile(path: string, data: string, writeByteOrderMark?: boolean): void;
@@ -2926,6 +2936,61 @@ declare namespace ts {
     function getNodeMajorVersion(): number;
     let sys: System;
 }
+declare namespace ts {
+    type ErrorCallback = (message: DiagnosticMessage, length: number) => void;
+    interface Scanner {
+        getStartPos(): number;
+        getToken(): SyntaxKind;
+        getTextPos(): number;
+        getTokenPos(): number;
+        getTokenText(): string;
+        getTokenValue(): string;
+        hasExtendedUnicodeEscape(): boolean;
+        hasPrecedingLineBreak(): boolean;
+        isIdentifier(): boolean;
+        isReservedWord(): boolean;
+        isUnterminated(): boolean;
+        reScanGreaterToken(): SyntaxKind;
+        reScanSlashToken(): SyntaxKind;
+        reScanTemplateToken(): SyntaxKind;
+        scanJsxIdentifier(): SyntaxKind;
+        scanJsxAttributeValue(): SyntaxKind;
+        reScanJsxToken(): JsxTokenSyntaxKind;
+        scanJsxToken(): JsxTokenSyntaxKind;
+        scanJSDocToken(): JsDocSyntaxKind;
+        scan(): SyntaxKind;
+        getText(): string;
+        setText(text: string, start?: number, length?: number): void;
+        setOnError(onError: ErrorCallback): void;
+        setScriptTarget(scriptTarget: ScriptTarget): void;
+        setLanguageVariant(variant: LanguageVariant): void;
+        setTextPos(textPos: number): void;
+        lookAhead<T>(callback: () => T): T;
+        scanRange<T>(start: number, length: number, callback: () => T): T;
+        tryScan<T>(callback: () => T): T;
+    }
+    function tokenToString(t: SyntaxKind): string | undefined;
+    function getPositionOfLineAndCharacter(sourceFile: SourceFileLike, line: number, character: number): number;
+    function getLineAndCharacterOfPosition(sourceFile: SourceFileLike, position: number): LineAndCharacter;
+    function isWhiteSpaceLike(ch: number): boolean;
+    /** Does not include line breaks. For that, see isWhiteSpaceLike. */
+    function isWhiteSpaceSingleLine(ch: number): boolean;
+    function isLineBreak(ch: number): boolean;
+    function couldStartTrivia(text: string, pos: number): boolean;
+    function forEachLeadingCommentRange<U>(text: string, pos: number, cb: (pos: number, end: number, kind: CommentKind, hasTrailingNewLine: boolean) => U): U | undefined;
+    function forEachLeadingCommentRange<T, U>(text: string, pos: number, cb: (pos: number, end: number, kind: CommentKind, hasTrailingNewLine: boolean, state: T) => U, state: T): U | undefined;
+    function forEachTrailingCommentRange<U>(text: string, pos: number, cb: (pos: number, end: number, kind: CommentKind, hasTrailingNewLine: boolean) => U): U | undefined;
+    function forEachTrailingCommentRange<T, U>(text: string, pos: number, cb: (pos: number, end: number, kind: CommentKind, hasTrailingNewLine: boolean, state: T) => U, state: T): U | undefined;
+    function reduceEachLeadingCommentRange<T, U>(text: string, pos: number, cb: (pos: number, end: number, kind: CommentKind, hasTrailingNewLine: boolean, state: T, memo: U) => U, state: T, initial: U): U;
+    function reduceEachTrailingCommentRange<T, U>(text: string, pos: number, cb: (pos: number, end: number, kind: CommentKind, hasTrailingNewLine: boolean, state: T, memo: U) => U, state: T, initial: U): U;
+    function getLeadingCommentRanges(text: string, pos: number): CommentRange[] | undefined;
+    function getTrailingCommentRanges(text: string, pos: number): CommentRange[] | undefined;
+    /** Optionally, get the shebang */
+    function getShebang(text: string): string | undefined;
+    function isIdentifierStart(ch: number, languageVersion: ScriptTarget): boolean;
+    function isIdentifierPart(ch: number, languageVersion: ScriptTarget): boolean;
+    function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean, languageVariant?: LanguageVariant, text?: string, onError?: ErrorCallback, start?: number, length?: number): Scanner;
+}
 declare namespace ts {
     function getDefaultLibFileName(options: CompilerOptions): string;
     function textSpanEnd(span: TextSpan): number;
@@ -2955,7 +3020,11 @@ declare namespace ts {
      */
     function collapseTextChangeRangesAcrossMultipleVersions(changes: ReadonlyArray<TextChangeRange>): TextChangeRange;
     function getTypeParameterOwner(d: Declaration): Declaration;
-    function isParameterPropertyDeclaration(node: Node): boolean;
+    type ParameterPropertyDeclaration = ParameterDeclaration & {
+        parent: ConstructorDeclaration;
+        name: Identifier;
+    };
+    function isParameterPropertyDeclaration(node: Node): node is ParameterPropertyDeclaration;
     function isEmptyBindingPattern(node: BindingName): node is BindingPattern;
     function isEmptyBindingElement(node: BindingElement): boolean;
     function getCombinedModifierFlags(node: Node): ModifierFlags;
@@ -3109,6 +3178,7 @@ declare namespace ts {
     function isIndexedAccessTypeNode(node: Node): node is IndexedAccessTypeNode;
     function isMappedTypeNode(node: Node): node is MappedTypeNode;
     function isLiteralTypeNode(node: Node): node is LiteralTypeNode;
+    function isImportTypeNode(node: Node): node is ImportTypeNode;
     function isObjectBindingPattern(node: Node): node is ObjectBindingPattern;
     function isArrayBindingPattern(node: Node): node is ArrayBindingPattern;
     function isBindingElement(node: Node): node is BindingElement;
@@ -3247,6 +3317,7 @@ declare namespace ts {
     function isClassLike(node: Node): node is ClassLikeDeclaration;
     function isAccessor(node: Node): node is AccessorDeclaration;
     function isTypeElement(node: Node): node is TypeElement;
+    function isClassOrTypeElement(node: Node): node is ClassElement | TypeElement;
     function isObjectLiteralElementLike(node: Node): node is ObjectLiteralElementLike;
     /**
      * Node test that determines whether a node is a valid type node.
@@ -3271,61 +3342,6 @@ declare namespace ts {
     function isObjectLiteralElement(node: Node): node is ObjectLiteralElement;
     function isStringLiteralLike(node: Node): node is StringLiteralLike;
 }
-declare namespace ts {
-    type ErrorCallback = (message: DiagnosticMessage, length: number) => void;
-    interface Scanner {
-        getStartPos(): number;
-        getToken(): SyntaxKind;
-        getTextPos(): number;
-        getTokenPos(): number;
-        getTokenText(): string;
-        getTokenValue(): string;
-        hasExtendedUnicodeEscape(): boolean;
-        hasPrecedingLineBreak(): boolean;
-        isIdentifier(): boolean;
-        isReservedWord(): boolean;
-        isUnterminated(): boolean;
-        reScanGreaterToken(): SyntaxKind;
-        reScanSlashToken(): SyntaxKind;
-        reScanTemplateToken(): SyntaxKind;
-        scanJsxIdentifier(): SyntaxKind;
-        scanJsxAttributeValue(): SyntaxKind;
-        reScanJsxToken(): JsxTokenSyntaxKind;
-        scanJsxToken(): JsxTokenSyntaxKind;
-        scanJSDocToken(): JsDocSyntaxKind;
-        scan(): SyntaxKind;
-        getText(): string;
-        setText(text: string, start?: number, length?: number): void;
-        setOnError(onError: ErrorCallback): void;
-        setScriptTarget(scriptTarget: ScriptTarget): void;
-        setLanguageVariant(variant: LanguageVariant): void;
-        setTextPos(textPos: number): void;
-        lookAhead<T>(callback: () => T): T;
-        scanRange<T>(start: number, length: number, callback: () => T): T;
-        tryScan<T>(callback: () => T): T;
-    }
-    function tokenToString(t: SyntaxKind): string | undefined;
-    function getPositionOfLineAndCharacter(sourceFile: SourceFileLike, line: number, character: number): number;
-    function getLineAndCharacterOfPosition(sourceFile: SourceFileLike, position: number): LineAndCharacter;
-    function isWhiteSpaceLike(ch: number): boolean;
-    /** Does not include line breaks. For that, see isWhiteSpaceLike. */
-    function isWhiteSpaceSingleLine(ch: number): boolean;
-    function isLineBreak(ch: number): boolean;
-    function couldStartTrivia(text: string, pos: number): boolean;
-    function forEachLeadingCommentRange<U>(text: string, pos: number, cb: (pos: number, end: number, kind: CommentKind, hasTrailingNewLine: boolean) => U): U | undefined;
-    function forEachLeadingCommentRange<T, U>(text: string, pos: number, cb: (pos: number, end: number, kind: CommentKind, hasTrailingNewLine: boolean, state: T) => U, state: T): U | undefined;
-    function forEachTrailingCommentRange<U>(text: string, pos: number, cb: (pos: number, end: number, kind: CommentKind, hasTrailingNewLine: boolean) => U): U | undefined;
-    function forEachTrailingCommentRange<T, U>(text: string, pos: number, cb: (pos: number, end: number, kind: CommentKind, hasTrailingNewLine: boolean, state: T) => U, state: T): U | undefined;
-    function reduceEachLeadingCommentRange<T, U>(text: string, pos: number, cb: (pos: number, end: number, kind: CommentKind, hasTrailingNewLine: boolean, state: T, memo: U) => U, state: T, initial: U): U;
-    function reduceEachTrailingCommentRange<T, U>(text: string, pos: number, cb: (pos: number, end: number, kind: CommentKind, hasTrailingNewLine: boolean, state: T, memo: U) => U, state: T, initial: U): U;
-    function getLeadingCommentRanges(text: string, pos: number): CommentRange[] | undefined;
-    function getTrailingCommentRanges(text: string, pos: number): CommentRange[] | undefined;
-    /** Optionally, get the shebang */
-    function getShebang(text: string): string | undefined;
-    function isIdentifierStart(ch: number, languageVersion: ScriptTarget): boolean;
-    function isIdentifierPart(ch: number, languageVersion: ScriptTarget): boolean;
-    function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean, languageVariant?: LanguageVariant, text?: string, onError?: ErrorCallback, start?: number, length?: number): Scanner;
-}
 declare namespace ts {
     function createNode(kind: SyntaxKind, pos?: number, end?: number): Node;
     /**
@@ -3353,59 +3369,6 @@ declare namespace ts {
     function isExternalModule(file: SourceFile): boolean;
     function updateSourceFile(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
 }
-declare namespace ts {
-    function parseCommandLine(commandLine: ReadonlyArray<string>, readFile?: (path: string) => string | undefined): ParsedCommandLine;
-    /**
-     * Read tsconfig.json file
-     * @param fileName The path to the config file
-     */
-    function readConfigFile(fileName: string, readFile: (path: string) => string | undefined): {
-        config?: any;
-        error?: Diagnostic;
-    };
-    /**
-     * Parse the text of the tsconfig.json file
-     * @param fileName The path to the config file
-     * @param jsonText The text of the config file
-     */
-    function parseConfigFileTextToJson(fileName: string, jsonText: string): {
-        config?: any;
-        error?: Diagnostic;
-    };
-    /**
-     * Read tsconfig.json file
-     * @param fileName The path to the config file
-     */
-    function readJsonConfigFile(fileName: string, readFile: (path: string) => string | undefined): JsonSourceFile;
-    /**
-     * Convert the json syntax tree into the json value
-     */
-    function convertToObject(sourceFile: JsonSourceFile, errors: Push<Diagnostic>): any;
-    /**
-     * Parse the contents of a config file (tsconfig.json).
-     * @param json The contents of the config file to parse
-     * @param host Instance of ParseConfigHost used to enumerate files in folder.
-     * @param basePath A root directory to resolve relative path entries in the config
-     *    file to. e.g. outDir
-     */
-    function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<JsFileExtensionInfo>): ParsedCommandLine;
-    /**
-     * Parse the contents of a config file (tsconfig.json).
-     * @param jsonNode The contents of the config file to parse
-     * @param host Instance of ParseConfigHost used to enumerate files in folder.
-     * @param basePath A root directory to resolve relative path entries in the config
-     *    file to. e.g. outDir
-     */
-    function parseJsonSourceFileConfigFileContent(sourceFile: JsonSourceFile, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<JsFileExtensionInfo>): ParsedCommandLine;
-    function convertCompilerOptionsFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
-        options: CompilerOptions;
-        errors: Diagnostic[];
-    };
-    function convertTypeAcquisitionFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
-        options: TypeAcquisition;
-        errors: Diagnostic[];
-    };
-}
 declare namespace ts {
     interface GetEffectiveTypeRootsHost {
         directoryExists?(directoryName: string): boolean;
@@ -3446,6 +3409,7 @@ declare namespace ts {
         set(directory: string, result: ResolvedModuleWithFailedLookupLocations): void;
     }
     function createModuleResolutionCache(currentDirectory: string, getCanonicalFileName: (s: string) => string): ModuleResolutionCache;
+    function resolveModuleNameFromCache(moduleName: string, containingFile: string, cache: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations | undefined;
     function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations;
     function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations;
     function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: NonRelativeModuleNameResolutionCache): ResolvedModuleWithFailedLookupLocations;
@@ -3569,7 +3533,9 @@ declare namespace ts {
     function createNew(expression: Expression, typeArguments: ReadonlyArray<TypeNode> | undefined, argumentsArray: ReadonlyArray<Expression> | undefined): NewExpression;
     function updateNew(node: NewExpression, expression: Expression, typeArguments: ReadonlyArray<TypeNode> | undefined, argumentsArray: ReadonlyArray<Expression> | undefined): NewExpression;
     function createTaggedTemplate(tag: Expression, template: TemplateLiteral): TaggedTemplateExpression;
+    function createTaggedTemplate(tag: Expression, typeArguments: ReadonlyArray<TypeNode>, template: TemplateLiteral): TaggedTemplateExpression;
     function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, template: TemplateLiteral): TaggedTemplateExpression;
+    function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, typeArguments: ReadonlyArray<TypeNode>, template: TemplateLiteral): TaggedTemplateExpression;
     function createTypeAssertion(type: TypeNode, expression: Expression): TypeAssertion;
     function updateTypeAssertion(node: TypeAssertion, type: TypeNode, expression: Expression): TypeAssertion;
     function createParen(expression: Expression): ParenthesizedExpression;
@@ -3970,6 +3936,312 @@ declare namespace ts {
      */
     function createProgram(rootNames: ReadonlyArray<string>, options: CompilerOptions, host?: CompilerHost, oldProgram?: Program, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>): Program;
 }
+declare namespace ts {
+    interface EmitOutput {
+        outputFiles: OutputFile[];
+        emitSkipped: boolean;
+    }
+    interface OutputFile {
+        name: string;
+        writeByteOrderMark: boolean;
+        text: string;
+    }
+}
+declare namespace ts {
+    type AffectedFileResult<T> = {
+        result: T;
+        affected: SourceFile | Program;
+    } | undefined;
+    interface BuilderProgramHost {
+        /**
+         * return true if file names are treated with case sensitivity
+         */
+        useCaseSensitiveFileNames(): boolean;
+        /**
+         * If provided this would be used this hash instead of actual file shape text for detecting changes
+         */
+        createHash?: (data: string) => string;
+        /**
+         * When emit or emitNextAffectedFile are called without writeFile,
+         * this callback if present would be used to write files
+         */
+        writeFile?: WriteFileCallback;
+    }
+    /**
+     * Builder to manage the program state changes
+     */
+    interface BuilderProgram {
+        /**
+         * Returns current program
+         */
+        getProgram(): Program;
+        /**
+         * Get compiler options of the program
+         */
+        getCompilerOptions(): CompilerOptions;
+        /**
+         * Get the source file in the program with file name
+         */
+        getSourceFile(fileName: string): SourceFile | undefined;
+        /**
+         * Get a list of files in the program
+         */
+        getSourceFiles(): ReadonlyArray<SourceFile>;
+        /**
+         * Get the diagnostics for compiler options
+         */
+        getOptionsDiagnostics(cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        /**
+         * Get the diagnostics that dont belong to any file
+         */
+        getGlobalDiagnostics(cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        /**
+         * Get the diagnostics from config file parsing
+         */
+        getConfigFileParsingDiagnostics(): ReadonlyArray<Diagnostic>;
+        /**
+         * Get the syntax diagnostics, for all source files if source file is not supplied
+         */
+        getSyntacticDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        /**
+         * Get all the dependencies of the file
+         */
+        getAllDependencies(sourceFile: SourceFile): ReadonlyArray<string>;
+        /**
+         * Gets the semantic diagnostics from the program corresponding to this state of file (if provided) or whole program
+         * The semantic diagnostics are cached and managed here
+         * Note that it is assumed that when asked about semantic diagnostics through this API,
+         * the file has been taken out of affected files so it is safe to use cache or get from program and cache the diagnostics
+         * In case of SemanticDiagnosticsBuilderProgram if the source file is not provided,
+         * it will iterate through all the affected files, to ensure that cache stays valid and yet provide a way to get all semantic diagnostics
+         */
+        getSemanticDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        /**
+         * Emits the JavaScript and declaration files.
+         * When targetSource file is specified, emits the files corresponding to that source file,
+         * otherwise for the whole program.
+         * In case of EmitAndSemanticDiagnosticsBuilderProgram, when targetSourceFile is specified,
+         * it is assumed that that file is handled from affected file list. If targetSourceFile is not specified,
+         * it will only emit all the affected files instead of whole program
+         *
+         * The first of writeFile if provided, writeFile of BuilderProgramHost if provided, writeFile of compiler host
+         * in that order would be used to write the files
+         */
+        emit(targetSourceFile?: SourceFile, writeFile?: WriteFileCallback, cancellationToken?: CancellationToken, emitOnlyDtsFiles?: boolean, customTransformers?: CustomTransformers): EmitResult;
+        /**
+         * Get the current directory of the program
+         */
+        getCurrentDirectory(): string;
+    }
+    /**
+     * The builder that caches the semantic diagnostics for the program and handles the changed files and affected files
+     */
+    interface SemanticDiagnosticsBuilderProgram extends BuilderProgram {
+        /**
+         * Gets the semantic diagnostics from the program for the next affected file and caches it
+         * Returns undefined if the iteration is complete
+         */
+        getSemanticDiagnosticsOfNextAffectedFile(cancellationToken?: CancellationToken, ignoreSourceFile?: (sourceFile: SourceFile) => boolean): AffectedFileResult<ReadonlyArray<Diagnostic>>;
+    }
+    /**
+     * The builder that can handle the changes in program and iterate through changed file to emit the files
+     * The semantic diagnostics are cached per file and managed by clearing for the changed/affected files
+     */
+    interface EmitAndSemanticDiagnosticsBuilderProgram extends BuilderProgram {
+        /**
+         * Emits the next affected file's emit result (EmitResult and sourceFiles emitted) or returns undefined if iteration is complete
+         * The first of writeFile if provided, writeFile of BuilderProgramHost if provided, writeFile of compiler host
+         * in that order would be used to write the files
+         */
+        emitNextAffectedFile(writeFile?: WriteFileCallback, cancellationToken?: CancellationToken, emitOnlyDtsFiles?: boolean, customTransformers?: CustomTransformers): AffectedFileResult<EmitResult>;
+    }
+    /**
+     * Create the builder to manage semantic diagnostics and cache them
+     */
+    function createSemanticDiagnosticsBuilderProgram(newProgram: Program, host: BuilderProgramHost, oldProgram?: SemanticDiagnosticsBuilderProgram, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>): SemanticDiagnosticsBuilderProgram;
+    function createSemanticDiagnosticsBuilderProgram(rootNames: ReadonlyArray<string>, options: CompilerOptions, host?: CompilerHost, oldProgram?: SemanticDiagnosticsBuilderProgram, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>): SemanticDiagnosticsBuilderProgram;
+    /**
+     * Create the builder that can handle the changes in program and iterate through changed files
+     * to emit the those files and manage semantic diagnostics cache as well
+     */
+    function createEmitAndSemanticDiagnosticsBuilderProgram(newProgram: Program, host: BuilderProgramHost, oldProgram?: EmitAndSemanticDiagnosticsBuilderProgram, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>): EmitAndSemanticDiagnosticsBuilderProgram;
+    function createEmitAndSemanticDiagnosticsBuilderProgram(rootNames: ReadonlyArray<string>, options: CompilerOptions, host?: CompilerHost, oldProgram?: EmitAndSemanticDiagnosticsBuilderProgram, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>): EmitAndSemanticDiagnosticsBuilderProgram;
+    /**
+     * Creates a builder thats just abstraction over program and can be used with watch
+     */
+    function createAbstractBuilder(newProgram: Program, host: BuilderProgramHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>): BuilderProgram;
+    function createAbstractBuilder(rootNames: ReadonlyArray<string>, options: CompilerOptions, host?: CompilerHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>): BuilderProgram;
+}
+declare namespace ts {
+    type DiagnosticReporter = (diagnostic: Diagnostic) => void;
+    type WatchStatusReporter = (diagnostic: Diagnostic, newLine: string, options: CompilerOptions) => void;
+    /** Create the program with rootNames and options, if they are undefined, oldProgram and new configFile diagnostics create new program */
+    type CreateProgram<T extends BuilderProgram> = (rootNames: ReadonlyArray<string> | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: T, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>) => T;
+    interface WatchCompilerHost<T extends BuilderProgram> {
+        /**
+         * Used to create the program when need for program creation or recreation detected
+         */
+        createProgram: CreateProgram<T>;
+        /** If provided, callback to invoke after every new program creation */
+        afterProgramCreate?(program: T): void;
+        /** If provided, called with Diagnostic message that informs about change in watch status */
+        onWatchStatusChange?(diagnostic: Diagnostic, newLine: string, options: CompilerOptions): void;
+        useCaseSensitiveFileNames(): boolean;
+        getNewLine(): string;
+        getCurrentDirectory(): string;
+        getDefaultLibFileName(options: CompilerOptions): string;
+        getDefaultLibLocation?(): string;
+        createHash?(data: string): string;
+        /**
+         * Use to check file presence for source files and
+         * if resolveModuleNames is not provided (complier is in charge of module resolution) then module files as well
+         */
+        fileExists(path: string): boolean;
+        /**
+         * Use to read file text for source files and
+         * if resolveModuleNames is not provided (complier is in charge of module resolution) then module files as well
+         */
+        readFile(path: string, encoding?: string): string | undefined;
+        /** If provided, used for module resolution as well as to handle directory structure */
+        directoryExists?(path: string): boolean;
+        /** If provided, used in resolutions as well as handling directory structure */
+        getDirectories?(path: string): string[];
+        /** If provided, used to cache and handle directory structure modifications */
+        readDirectory?(path: string, extensions?: ReadonlyArray<string>, exclude?: ReadonlyArray<string>, include?: ReadonlyArray<string>, depth?: number): string[];
+        /** Symbol links resolution */
+        realpath?(path: string): string;
+        /** If provided would be used to write log about compilation */
+        trace?(s: string): void;
+        /** If provided is used to get the environment variable */
+        getEnvironmentVariable?(name: string): string;
+        /** If provided, used to resolve the module names, otherwise typescript's default module resolution */
+        resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames?: string[]): ResolvedModule[];
+        /** If provided, used to resolve type reference directives, otherwise typescript's default resolution */
+        resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string): (ResolvedTypeReferenceDirective | undefined)[];
+        /** Used to watch changes in source files, missing files needed to update the program or config file */
+        watchFile(path: string, callback: FileWatcherCallback, pollingInterval?: number): FileWatcher;
+        /** Used to watch resolved module's failed lookup locations, config file specs, type roots where auto type reference directives are added */
+        watchDirectory(path: string, callback: DirectoryWatcherCallback, recursive?: boolean): FileWatcher;
+        /** If provided, will be used to set delayed compilation, so that multiple changes in short span are compiled together */
+        setTimeout?(callback: (...args: any[]) => void, ms: number, ...args: any[]): any;
+        /** If provided, will be used to reset existing delayed compilation */
+        clearTimeout?(timeoutId: any): void;
+    }
+    /**
+     * Host to create watch with root files and options
+     */
+    interface WatchCompilerHostOfFilesAndCompilerOptions<T extends BuilderProgram> extends WatchCompilerHost<T> {
+        /** root files to use to generate program */
+        rootFiles: string[];
+        /** Compiler options */
+        options: CompilerOptions;
+    }
+    /**
+     * Reports config file diagnostics
+     */
+    interface ConfigFileDiagnosticsReporter {
+        /**
+         * Reports unrecoverable error when parsing config file
+         */
+        onUnRecoverableConfigFileDiagnostic: DiagnosticReporter;
+    }
+    /**
+     * Host to create watch with config file
+     */
+    interface WatchCompilerHostOfConfigFile<T extends BuilderProgram> extends WatchCompilerHost<T>, ConfigFileDiagnosticsReporter {
+        /** Name of the config file to compile */
+        configFileName: string;
+        /** Options to extend */
+        optionsToExtend?: CompilerOptions;
+        /**
+         * Used to generate source file names from the config file and its include, exclude, files rules
+         * and also to cache the directory stucture
+         */
+        readDirectory(path: string, extensions?: ReadonlyArray<string>, exclude?: ReadonlyArray<string>, include?: ReadonlyArray<string>, depth?: number): string[];
+    }
+    interface Watch<T> {
+        /** Synchronize with host and get updated program */
+        getProgram(): T;
+    }
+    /**
+     * Creates the watch what generates program using the config file
+     */
+    interface WatchOfConfigFile<T> extends Watch<T> {
+    }
+    /**
+     * Creates the watch that generates program using the root files and compiler options
+     */
+    interface WatchOfFilesAndCompilerOptions<T> extends Watch<T> {
+        /** Updates the root files in the program, only if this is not config file compilation */
+        updateRootFileNames(fileNames: string[]): void;
+    }
+    /**
+     * Create the watch compiler host for either configFile or fileNames and its options
+     */
+    function createWatchCompilerHost<T extends BuilderProgram>(rootFiles: string[], options: CompilerOptions, system: System, createProgram?: CreateProgram<T>, reportDiagnostic?: DiagnosticReporter, reportWatchStatus?: WatchStatusReporter): WatchCompilerHostOfFilesAndCompilerOptions<T>;
+    function createWatchCompilerHost<T extends BuilderProgram>(configFileName: string, optionsToExtend: CompilerOptions | undefined, system: System, createProgram?: CreateProgram<T>, reportDiagnostic?: DiagnosticReporter, reportWatchStatus?: WatchStatusReporter): WatchCompilerHostOfConfigFile<T>;
+    /**
+     * Creates the watch from the host for root files and compiler options
+     */
+    function createWatchProgram<T extends BuilderProgram>(host: WatchCompilerHostOfFilesAndCompilerOptions<T>): WatchOfFilesAndCompilerOptions<T>;
+    /**
+     * Creates the watch from the host for config file
+     */
+    function createWatchProgram<T extends BuilderProgram>(host: WatchCompilerHostOfConfigFile<T>): WatchOfConfigFile<T>;
+}
+declare namespace ts {
+    function parseCommandLine(commandLine: ReadonlyArray<string>, readFile?: (path: string) => string | undefined): ParsedCommandLine;
+    /**
+     * Read tsconfig.json file
+     * @param fileName The path to the config file
+     */
+    function readConfigFile(fileName: string, readFile: (path: string) => string | undefined): {
+        config?: any;
+        error?: Diagnostic;
+    };
+    /**
+     * Parse the text of the tsconfig.json file
+     * @param fileName The path to the config file
+     * @param jsonText The text of the config file
+     */
+    function parseConfigFileTextToJson(fileName: string, jsonText: string): {
+        config?: any;
+        error?: Diagnostic;
+    };
+    /**
+     * Read tsconfig.json file
+     * @param fileName The path to the config file
+     */
+    function readJsonConfigFile(fileName: string, readFile: (path: string) => string | undefined): JsonSourceFile;
+    /**
+     * Convert the json syntax tree into the json value
+     */
+    function convertToObject(sourceFile: JsonSourceFile, errors: Push<Diagnostic>): any;
+    /**
+     * Parse the contents of a config file (tsconfig.json).
+     * @param json The contents of the config file to parse
+     * @param host Instance of ParseConfigHost used to enumerate files in folder.
+     * @param basePath A root directory to resolve relative path entries in the config
+     *    file to. e.g. outDir
+     */
+    function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<JsFileExtensionInfo>): ParsedCommandLine;
+    /**
+     * Parse the contents of a config file (tsconfig.json).
+     * @param jsonNode The contents of the config file to parse
+     * @param host Instance of ParseConfigHost used to enumerate files in folder.
+     * @param basePath A root directory to resolve relative path entries in the config
+     *    file to. e.g. outDir
+     */
+    function parseJsonSourceFileConfigFileContent(sourceFile: JsonSourceFile, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<JsFileExtensionInfo>): ParsedCommandLine;
+    function convertCompilerOptionsFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
+        options: CompilerOptions;
+        errors: Diagnostic[];
+    };
+    function convertTypeAcquisitionFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
+        options: TypeAcquisition;
+        errors: Diagnostic[];
+    };
+}
 declare namespace ts {
     interface Node {
         getSourceFile(): SourceFile;
@@ -4115,6 +4387,7 @@ declare namespace ts {
         installPackage?(options: InstallPackageOptions): Promise<ApplyCodeActionCommandResult>;
     }
     interface UserPreferences {
+        readonly disableSuggestions?: boolean;
         readonly quotePreference?: "double" | "single";
         readonly includeCompletionsForModuleExports?: boolean;
         readonly includeCompletionsWithInsertText?: boolean;
@@ -4181,6 +4454,7 @@ declare namespace ts {
         getApplicableRefactors(fileName: string, positionOrRaneg: number | TextRange, preferences: UserPreferences | undefined): ApplicableRefactorInfo[];
         getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string, preferences: UserPreferences | undefined): RefactorEditInfo | undefined;
         organizeImports(scope: OrganizeImportsScope, formatOptions: FormatCodeSettings, preferences: UserPreferences | undefined): ReadonlyArray<FileTextChanges>;
+        getEditsForFileRename(oldFilePath: string, newFilePath: string, formatOptions: FormatCodeSettings): ReadonlyArray<FileTextChanges>;
         getEmitOutput(fileName: string, emitOnlyDtsFiles?: boolean): EmitOutput;
         getProgram(): Program;
         dispose(): void;
@@ -4190,8 +4464,9 @@ declare namespace ts {
         fileName: string;
     }
     type OrganizeImportsScope = CombinedCodeFixScope;
-    /** @deprecated Use UserPreferences */
     interface GetCompletionsAtPositionOptions extends UserPreferences {
+        /** If the editor is asking for completions because a certain character was typed, and not because the user explicitly requested them, this should be set. */
+        triggerCharacter?: string;
         /** @deprecated Use includeCompletionsForModuleExports */
         includeExternalModuleExports?: boolean;
         /** @deprecated Use includeCompletionsWithInsertText */
@@ -4271,6 +4546,8 @@ declare namespace ts {
         commands?: CodeActionCommand[];
     }
     interface CodeFixAction extends CodeAction {
+        /** Short name to identify the fix, for use by telemetry. */
+        fixName: string;
         /**
          * If present, one may call 'getCombinedCodeFix' with this fixId.
          * This may be omitted to indicate that the code fix can't be applied in a group.
@@ -4882,6 +5159,15 @@ declare namespace ts {
      */
     function getDefaultLibFilePath(options: CompilerOptions): string;
 }
+declare namespace ts {
+    /**
+     * Transform one or more nodes using the supplied transformers.
+     * @param source A single `Node` or an array of `Node` objects.
+     * @param transformers An array of `TransformerFactory` callbacks used to process the transformation.
+     * @param compilerOptions Optional compiler options.
+     */
+    function transform<T extends Node>(source: T | T[], transformers: TransformerFactory<T>[], compilerOptions?: CompilerOptions): TransformationResult<T>;
+}
 declare namespace ts.server {
     interface CompressedData {
         length: number;
@@ -5040,7 +5326,6 @@ declare namespace ts.server {
         function ThrowProjectDoesNotContainDocument(fileName: string, project: Project): never;
     }
     function getDefaultFormatCodeSettings(host: ServerHost): FormatCodeSettings;
-    function mergeMapLikes<T extends object>(target: T, source: Partial<T>): void;
     type NormalizedPath = string & {
         __normalizedPathTag: any;
     };
@@ -5134,7 +5419,8 @@ declare namespace ts.server.protocol {
         GetSupportedCodeFixes = "getSupportedCodeFixes",
         GetApplicableRefactors = "getApplicableRefactors",
         GetEditsForRefactor = "getEditsForRefactor",
-        OrganizeImports = "organizeImports"
+        OrganizeImports = "organizeImports",
+        GetEditsForFileRename = "getEditsForFileRename"
     }
     /**
      * A TypeScript Server message
@@ -5530,6 +5816,17 @@ declare namespace ts.server.protocol {
     interface OrganizeImportsResponse extends Response {
         edits: ReadonlyArray<FileCodeEdits>;
     }
+    interface GetEditsForFileRenameRequest extends Request {
+        command: CommandTypes.GetEditsForFileRename;
+        arguments: GetEditsForFileRenameRequestArgs;
+    }
+    interface GetEditsForFileRenameRequestArgs extends FileRequestArgs {
+        readonly oldFilePath: string;
+        readonly newFilePath: string;
+    }
+    interface GetEditsForFileRenameResponse extends Response {
+        edits: ReadonlyArray<FileCodeEdits>;
+    }
     /**
      * Request for the available codefixes at a specific position.
      */
@@ -6346,6 +6643,8 @@ declare namespace ts.server.protocol {
         commands?: ReadonlyArray<{}>;
     }
     interface CodeFixAction extends CodeAction {
+        /** Short name to identify the fix, for use by telemetry. */
+        fixName: string;
         /**
          * If present, one may call 'getCombinedCodeFix' with this fixId.
          * This may be omitted to indicate that the code fix can't be applied in a group.
@@ -6390,6 +6689,7 @@ declare namespace ts.server.protocol {
          * Optional prefix to apply to possible completions.
          */
         prefix?: string;
+        triggerCharacter?: string;
         /**
          * @deprecated Use UserPreferences.includeCompletionsForModuleExports
          */
@@ -6757,6 +7057,7 @@ declare namespace ts.server.protocol {
          * The category of the diagnostic message, e.g. "error", "warning", or "suggestion".
          */
         category: string;
+        reportsUnnecessary?: {};
         /**
          * The error code of the diagnostic message.
          */
@@ -7155,6 +7456,7 @@ declare namespace ts.server.protocol {
         insertSpaceBeforeTypeAnnotation?: boolean;
     }
     interface UserPreferences {
+        readonly disableSuggestions?: boolean;
         readonly quotePreference?: "double" | "single";
         /**
          * If enabled, TypeScript will search through all external modules' exports and add them to the completions list.
@@ -7271,181 +7573,6 @@ declare namespace ts.server.protocol {
         ESNext = "ESNext"
     }
 }
-declare namespace ts.server {
-    interface ServerCancellationToken extends HostCancellationToken {
-        setRequest(requestId: number): void;
-        resetRequest(requestId: number): void;
-    }
-    const nullCancellationToken: ServerCancellationToken;
-    interface PendingErrorCheck {
-        fileName: NormalizedPath;
-        project: Project;
-    }
-    type CommandNames = protocol.CommandTypes;
-    const CommandNames: any;
-    function formatMessage<T extends protocol.Message>(msg: T, logger: Logger, byteLength: (s: string, encoding: string) => number, newLine: string): string;
-    type Event = <T extends object>(body: T, eventName: string) => void;
-    interface EventSender {
-        event: Event;
-    }
-    interface SessionOptions {
-        host: ServerHost;
-        cancellationToken: ServerCancellationToken;
-        useSingleInferredProject: boolean;
-        useInferredProjectPerProjectRoot: boolean;
-        typingsInstaller: ITypingsInstaller;
-        byteLength: (buf: string, encoding?: string) => number;
-        hrtime: (start?: number[]) => number[];
-        logger: Logger;
-        /**
-         * If falsy, all events are suppressed.
-         */
-        canUseEvents: boolean;
-        eventHandler?: ProjectServiceEventHandler;
-        /** Has no effect if eventHandler is also specified. */
-        suppressDiagnosticEvents?: boolean;
-        syntaxOnly?: boolean;
-        throttleWaitMilliseconds?: number;
-        globalPlugins?: ReadonlyArray<string>;
-        pluginProbeLocations?: ReadonlyArray<string>;
-        allowLocalPluginLoads?: boolean;
-    }
-    class Session implements EventSender {
-        private readonly gcTimer;
-        protected projectService: ProjectService;
-        private changeSeq;
-        private currentRequestId;
-        private errorCheck;
-        protected host: ServerHost;
-        private readonly cancellationToken;
-        protected readonly typingsInstaller: ITypingsInstaller;
-        protected byteLength: (buf: string, encoding?: string) => number;
-        private hrtime;
-        protected logger: Logger;
-        protected canUseEvents: boolean;
-        private suppressDiagnosticEvents?;
-        private eventHandler;
-        constructor(opts: SessionOptions);
-        private sendRequestCompletedEvent;
-        private defaultEventHandler;
-        private projectsUpdatedInBackgroundEvent;
-        logError(err: Error, cmd: string): void;
-        send(msg: protocol.Message): void;
-        event<T extends object>(body: T, eventName: string): void;
-        /** @deprecated */
-        output(info: any, cmdName: string, reqSeq?: number, errorMsg?: string): void;
-        private doOutput;
-        private semanticCheck;
-        private syntacticCheck;
-        private suggestionCheck;
-        private sendDiagnosticsEvent;
-        /** It is the caller's responsibility to verify that `!this.suppressDiagnosticEvents`. */
-        private updateErrorCheck;
-        private cleanProjects;
-        private cleanup;
-        private getEncodedSemanticClassifications;
-        private getProject;
-        private getConfigFileAndProject;
-        private getConfigFileDiagnostics;
-        private convertToDiagnosticsWithLinePositionFromDiagnosticFile;
-        private getCompilerOptionsDiagnostics;
-        private convertToDiagnosticsWithLinePosition;
-        private getDiagnosticsWorker;
-        private getDefinition;
-        private getDefinitionAndBoundSpan;
-        private mapDefinitionInfo;
-        private toFileSpan;
-        private getTypeDefinition;
-        private getImplementation;
-        private getOccurrences;
-        private getSyntacticDiagnosticsSync;
-        private getSemanticDiagnosticsSync;
-        private getSuggestionDiagnosticsSync;
-        private getDocumentHighlights;
-        private setCompilerOptionsForInferredProjects;
-        private getProjectInfo;
-        private getProjectInfoWorker;
-        private getRenameInfo;
-        private getProjects;
-        private getDefaultProject;
-        private getRenameLocations;
-        private getReferences;
-        /**
-         * @param fileName is the name of the file to be opened
-         * @param fileContent is a version of the file content that is known to be more up to date than the one on disk
-         */
-        private openClientFile;
-        private getPosition;
-        private getPositionInFile;
-        private getFileAndProject;
-        private getFileAndLanguageServiceForSyntacticOperation;
-        private getFileAndProjectWorker;
-        private getOutliningSpans;
-        private getTodoComments;
-        private getDocCommentTemplate;
-        private getSpanOfEnclosingComment;
-        private getIndentation;
-        private getBreakpointStatement;
-        private getNameOrDottedNameSpan;
-        private isValidBraceCompletion;
-        private getQuickInfoWorker;
-        private getFormattingEditsForRange;
-        private getFormattingEditsForRangeFull;
-        private getFormattingEditsForDocumentFull;
-        private getFormattingEditsAfterKeystrokeFull;
-        private getFormattingEditsAfterKeystroke;
-        private getCompletions;
-        private getCompletionEntryDetails;
-        private getCompileOnSaveAffectedFileList;
-        private emitFile;
-        private getSignatureHelpItems;
-        private createCheckList;
-        private getDiagnostics;
-        private change;
-        private reload;
-        private saveToTmp;
-        private closeClientFile;
-        private mapLocationNavigationBarItems;
-        private getNavigationBarItems;
-        private toLocationNavigationTree;
-        private toLocationTextSpan;
-        private getNavigationTree;
-        private getNavigateToItems;
-        private getSupportedCodeFixes;
-        private isLocation;
-        private extractPositionAndRange;
-        private getApplicableRefactors;
-        private getEditsForRefactor;
-        private organizeImports;
-        private getCodeFixes;
-        private getCombinedCodeFix;
-        private applyCodeActionCommand;
-        private getStartAndEndPosition;
-        private mapCodeAction;
-        private mapTextChangesToCodeEdits;
-        private mapTextChangesToCodeEditsUsingScriptinfo;
-        private convertTextChangeToCodeEdit;
-        private getBraceMatching;
-        private getDiagnosticsForProject;
-        getCanonicalFileName(fileName: string): string;
-        exit(): void;
-        private notRequired;
-        private requiredResponse;
-        private handlers;
-        addProtocolHandler(command: string, handler: (request: protocol.Request) => HandlerResponse): void;
-        private setCurrentRequest;
-        private resetCurrentRequest;
-        executeWithRequestId<T>(requestId: number, f: () => T): T;
-        executeCommand(request: protocol.Request): HandlerResponse;
-        onMessage(message: string): void;
-        private getFormatOptions;
-        private getPreferences;
-    }
-    interface HandlerResponse {
-        response?: {};
-        responseRequired?: boolean;
-    }
-}
 declare namespace ts.server {
     class ScriptInfo {
         private readonly host;
@@ -7508,28 +7635,6 @@ declare namespace ts.server {
         readonly globalTypingsCacheLocation: string;
     }
     const nullTypingsInstaller: ITypingsInstaller;
-    class TypingsCache {
-        private readonly installer;
-        private readonly perProjectCache;
-        constructor(installer: ITypingsInstaller);
-        isKnownTypesPackageName(name: string): boolean;
-        installPackage(options: InstallPackageOptionsWithProject): Promise<ApplyCodeActionCommandResult>;
-        getTypingsForProject(project: Project, unresolvedImports: SortedReadonlyArray<string>, forceRefresh: boolean): SortedReadonlyArray<string>;
-        updateTypingsForProject(projectName: string, compilerOptions: CompilerOptions, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray<string>, newTypings: string[]): void;
-        deleteTypingsForProject(projectName: string): void;
-        onProjectClosed(project: Project): void;
-    }
-}
-declare namespace ts {
-    interface EmitOutput {
-        outputFiles: OutputFile[];
-        emitSkipped: boolean;
-    }
-    interface OutputFile {
-        name: string;
-        writeByteOrderMark: boolean;
-        text: string;
-    }
 }
 declare namespace ts.server {
     enum ProjectKind {
@@ -7539,15 +7644,6 @@ declare namespace ts.server {
     }
     function allRootFilesAreJsOrDts(project: Project): boolean;
     function allFilesAreJsOrDts(project: Project): boolean;
-    class UnresolvedImportsMap {
-        readonly perFileMap: Map<ReadonlyArray<string>>;
-        private version;
-        clear(): void;
-        getVersion(): number;
-        remove(path: Path): void;
-        get(path: Path): ReadonlyArray<string>;
-        set(path: Path, value: ReadonlyArray<string>): void;
-    }
     interface PluginCreateInfo {
         project: Project;
         languageService: LanguageService;
@@ -7580,8 +7676,6 @@ declare namespace ts.server {
         private externalFiles;
         private missingFilesMap;
         private plugins;
-        private cachedUnresolvedImportsPerFile;
-        private lastCachedUnresolvedImportsList;
         private lastFileExceededProgramSize;
         protected languageService: LanguageService;
         languageServiceEnabled: boolean;
@@ -7601,10 +7695,10 @@ declare namespace ts.server {
          */
         private lastReportedVersion;
         /**
-         * Current project structure version.
+         * Current project's program version. (incremented everytime new program is created that is not complete reuse from the old one)
          * This property is changed in 'updateGraph' based on the set of files in program
          */
-        private projectStructureVersion;
+        private projectProgramVersion;
         /**
          * Current version of the project state. It is changed when:
          * - new root file was added/removed
@@ -7612,11 +7706,9 @@ declare namespace ts.server {
          * This property is different from projectStructureVersion since in most cases edits don't affect set of files in the project
          */
         private projectStateVersion;
-        private typingFiles;
         private readonly cancellationToken;
         isNonTsProject(): boolean;
         isJsOnlyProject(): boolean;
-        getCachedUnresolvedImportsPerFile_TestOnly(): UnresolvedImportsMap;
         static resolveModule(moduleName: string, initialDir: string, host: ServerHost, log: (message: string) => void): {};
         isKnownTypesPackageName(name: string): boolean;
         installPackage(options: InstallPackageOptions): Promise<ApplyCodeActionCommandResult>;
@@ -7877,7 +7969,6 @@ declare namespace ts.server {
         syntaxOnly?: boolean;
     }
     class ProjectService {
-        readonly typingsCache: TypingsCache;
         private readonly documentRegistry;
         /**
          * Container of all known scripts
@@ -7965,7 +8056,6 @@ declare namespace ts.server {
          *   ensure that each open script info has project
          */
         private ensureProjectStructuresUptoDate;
-        private updateProjectIfDirty;
         getFormatCodeOptions(file: NormalizedPath): FormatCodeSettings;
         getPreferences(file: NormalizedPath): UserPreferences;
         private onSourceFileChanged;
@@ -8106,6 +8196,183 @@ declare namespace ts.server {
         openExternalProject(proj: protocol.ExternalProject): void;
     }
 }
+declare namespace ts.server {
+    interface ServerCancellationToken extends HostCancellationToken {
+        setRequest(requestId: number): void;
+        resetRequest(requestId: number): void;
+    }
+    const nullCancellationToken: ServerCancellationToken;
+    interface PendingErrorCheck {
+        fileName: NormalizedPath;
+        project: Project;
+    }
+    type CommandNames = protocol.CommandTypes;
+    const CommandNames: any;
+    function formatMessage<T extends protocol.Message>(msg: T, logger: Logger, byteLength: (s: string, encoding: string) => number, newLine: string): string;
+    type Event = <T extends object>(body: T, eventName: string) => void;
+    interface EventSender {
+        event: Event;
+    }
+    interface SessionOptions {
+        host: ServerHost;
+        cancellationToken: ServerCancellationToken;
+        useSingleInferredProject: boolean;
+        useInferredProjectPerProjectRoot: boolean;
+        typingsInstaller: ITypingsInstaller;
+        byteLength: (buf: string, encoding?: string) => number;
+        hrtime: (start?: number[]) => number[];
+        logger: Logger;
+        /**
+         * If falsy, all events are suppressed.
+         */
+        canUseEvents: boolean;
+        eventHandler?: ProjectServiceEventHandler;
+        /** Has no effect if eventHandler is also specified. */
+        suppressDiagnosticEvents?: boolean;
+        syntaxOnly?: boolean;
+        throttleWaitMilliseconds?: number;
+        globalPlugins?: ReadonlyArray<string>;
+        pluginProbeLocations?: ReadonlyArray<string>;
+        allowLocalPluginLoads?: boolean;
+    }
+    class Session implements EventSender {
+        private readonly gcTimer;
+        protected projectService: ProjectService;
+        private changeSeq;
+        private currentRequestId;
+        private errorCheck;
+        protected host: ServerHost;
+        private readonly cancellationToken;
+        protected readonly typingsInstaller: ITypingsInstaller;
+        protected byteLength: (buf: string, encoding?: string) => number;
+        private hrtime;
+        protected logger: Logger;
+        protected canUseEvents: boolean;
+        private suppressDiagnosticEvents?;
+        private eventHandler;
+        constructor(opts: SessionOptions);
+        private sendRequestCompletedEvent;
+        private defaultEventHandler;
+        private projectsUpdatedInBackgroundEvent;
+        logError(err: Error, cmd: string): void;
+        send(msg: protocol.Message): void;
+        event<T extends object>(body: T, eventName: string): void;
+        /** @deprecated */
+        output(info: any, cmdName: string, reqSeq?: number, errorMsg?: string): void;
+        private doOutput;
+        private semanticCheck;
+        private syntacticCheck;
+        private suggestionCheck;
+        private sendDiagnosticsEvent;
+        /** It is the caller's responsibility to verify that `!this.suppressDiagnosticEvents`. */
+        private updateErrorCheck;
+        private cleanProjects;
+        private cleanup;
+        private getEncodedSemanticClassifications;
+        private getProject;
+        private getConfigFileAndProject;
+        private getConfigFileDiagnostics;
+        private convertToDiagnosticsWithLinePositionFromDiagnosticFile;
+        private getCompilerOptionsDiagnostics;
+        private convertToDiagnosticsWithLinePosition;
+        private getDiagnosticsWorker;
+        private getDefinition;
+        private getDefinitionAndBoundSpan;
+        private mapDefinitionInfo;
+        private toFileSpan;
+        private getTypeDefinition;
+        private getImplementation;
+        private getOccurrences;
+        private getSyntacticDiagnosticsSync;
+        private getSemanticDiagnosticsSync;
+        private getSuggestionDiagnosticsSync;
+        private getDocumentHighlights;
+        private setCompilerOptionsForInferredProjects;
+        private getProjectInfo;
+        private getProjectInfoWorker;
+        private getRenameInfo;
+        private getProjects;
+        private getDefaultProject;
+        private getRenameLocations;
+        private getReferences;
+        /**
+         * @param fileName is the name of the file to be opened
+         * @param fileContent is a version of the file content that is known to be more up to date than the one on disk
+         */
+        private openClientFile;
+        private getPosition;
+        private getPositionInFile;
+        private getFileAndProject;
+        private getFileAndLanguageServiceForSyntacticOperation;
+        private getFileAndProjectWorker;
+        private getOutliningSpans;
+        private getTodoComments;
+        private getDocCommentTemplate;
+        private getSpanOfEnclosingComment;
+        private getIndentation;
+        private getBreakpointStatement;
+        private getNameOrDottedNameSpan;
+        private isValidBraceCompletion;
+        private getQuickInfoWorker;
+        private getFormattingEditsForRange;
+        private getFormattingEditsForRangeFull;
+        private getFormattingEditsForDocumentFull;
+        private getFormattingEditsAfterKeystrokeFull;
+        private getFormattingEditsAfterKeystroke;
+        private getCompletions;
+        private getCompletionEntryDetails;
+        private getCompileOnSaveAffectedFileList;
+        private emitFile;
+        private getSignatureHelpItems;
+        private createCheckList;
+        private getDiagnostics;
+        private change;
+        private reload;
+        private saveToTmp;
+        private closeClientFile;
+        private mapLocationNavigationBarItems;
+        private getNavigationBarItems;
+        private toLocationNavigationTree;
+        private toLocationTextSpan;
+        private getNavigationTree;
+        private getNavigateToItems;
+        private getSupportedCodeFixes;
+        private isLocation;
+        private extractPositionAndRange;
+        private getApplicableRefactors;
+        private getEditsForRefactor;
+        private organizeImports;
+        private getEditsForFileRename;
+        private getCodeFixes;
+        private getCombinedCodeFix;
+        private applyCodeActionCommand;
+        private getStartAndEndPosition;
+        private mapCodeAction;
+        private mapCodeFixAction;
+        private mapTextChangesToCodeEdits;
+        private mapTextChangesToCodeEditsUsingScriptinfo;
+        private convertTextChangeToCodeEdit;
+        private getBraceMatching;
+        private getDiagnosticsForProject;
+        getCanonicalFileName(fileName: string): string;
+        exit(): void;
+        private notRequired;
+        private requiredResponse;
+        private handlers;
+        addProtocolHandler(command: string, handler: (request: protocol.Request) => HandlerResponse): void;
+        private setCurrentRequest;
+        private resetCurrentRequest;
+        executeWithRequestId<T>(requestId: number, f: () => T): T;
+        executeCommand(request: protocol.Request): HandlerResponse;
+        onMessage(message: string): void;
+        private getFormatOptions;
+        private getPreferences;
+    }
+    interface HandlerResponse {
+        response?: {};
+        responseRequired?: boolean;
+    }
+}
 
 export = ts;
 export as namespace ts;
\ No newline at end of file
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index 3e20ece19b6..64b15eff9c0 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -585,6 +585,7 @@ declare namespace ts {
     }
     interface PropertyDeclaration extends ClassElement, JSDocContainer {
         kind: SyntaxKind.PropertyDeclaration;
+        parent: ClassLikeDeclaration;
         name: PropertyName;
         questionToken?: QuestionToken;
         exclamationToken?: ExclamationToken;
@@ -1018,7 +1019,7 @@ declare namespace ts {
     interface ElementAccessExpression extends MemberExpression {
         kind: SyntaxKind.ElementAccessExpression;
         expression: LeftHandSideExpression;
-        argumentExpression?: Expression;
+        argumentExpression: Expression;
     }
     interface SuperElementAccessExpression extends ElementAccessExpression {
         expression: SuperExpression;
@@ -1050,6 +1051,7 @@ declare namespace ts {
     interface TaggedTemplateExpression extends MemberExpression {
         kind: SyntaxKind.TaggedTemplateExpression;
         tag: LeftHandSideExpression;
+        typeArguments?: NodeArray<TypeNode>;
         template: TemplateLiteral;
     }
     type CallLikeExpression = CallExpression | NewExpression | TaggedTemplateExpression | Decorator | JsxOpeningLikeElement;
@@ -1159,7 +1161,7 @@ declare namespace ts {
     interface DebuggerStatement extends Statement {
         kind: SyntaxKind.DebuggerStatement;
     }
-    interface MissingDeclaration extends DeclarationStatement, ClassElement, ObjectLiteralElement, TypeElement {
+    interface MissingDeclaration extends DeclarationStatement {
         kind: SyntaxKind.MissingDeclaration;
         name?: Identifier;
     }
@@ -1492,7 +1494,7 @@ declare namespace ts {
         comment: string | undefined;
     }
     interface JSDocTag extends Node {
-        parent: JSDoc;
+        parent: JSDoc | JSDocTypeLiteral;
         atToken: AtToken;
         tagName: Identifier;
         comment: string | undefined;
@@ -1840,6 +1842,12 @@ declare namespace ts {
         getSuggestionForNonexistentModule(node: Identifier, target: Symbol): string | undefined;
         getBaseConstraintOfType(type: Type): Type | undefined;
         getDefaultFromTypeParameter(type: Type): Type | undefined;
+        /**
+         * Depending on the operation performed, it may be appropriate to throw away the checker
+         * if the cancellation token is triggered. Typically, if it is used for error checking
+         * and the operation is cancelled, then it should be discarded, otherwise it is safe to keep.
+         */
+        runWithCancellationToken<T>(token: CancellationToken, cb: (checker: TypeChecker) => T): T;
     }
     enum NodeBuilderFlags {
         None = 0,
@@ -2098,7 +2106,7 @@ declare namespace ts {
         Unit = 13536,
         StringOrNumberLiteral = 96,
         PossiblyFalsy = 14574,
-        StringLike = 524322,
+        StringLike = 34,
         NumberLike = 84,
         BooleanLike = 136,
         EnumLike = 272,
@@ -2275,7 +2283,7 @@ declare namespace ts {
         category: DiagnosticCategory;
         code: number;
         message: string;
-        unused?: {};
+        reportsUnnecessary?: {};
     }
     /**
      * A linked list of formatted diagnostic messages to be used as part of a multiline message.
@@ -2338,6 +2346,7 @@ declare namespace ts {
         inlineSources?: boolean;
         isolatedModules?: boolean;
         jsx?: JsxEmit;
+        keyofStringsOnly?: boolean;
         lib?: string[];
         locale?: string;
         mapRoot?: string;
@@ -2888,6 +2897,7 @@ declare namespace ts {
         newLine: string;
         useCaseSensitiveFileNames: boolean;
         write(s: string): void;
+        writeOutputIsTTY?(): boolean;
         readFile(path: string, encoding?: string): string | undefined;
         getFileSize?(path: string): number;
         writeFile(path: string, data: string, writeByteOrderMark?: boolean): void;
@@ -3010,7 +3020,11 @@ declare namespace ts {
      */
     function collapseTextChangeRangesAcrossMultipleVersions(changes: ReadonlyArray<TextChangeRange>): TextChangeRange;
     function getTypeParameterOwner(d: Declaration): Declaration;
-    function isParameterPropertyDeclaration(node: Node): boolean;
+    type ParameterPropertyDeclaration = ParameterDeclaration & {
+        parent: ConstructorDeclaration;
+        name: Identifier;
+    };
+    function isParameterPropertyDeclaration(node: Node): node is ParameterPropertyDeclaration;
     function isEmptyBindingPattern(node: BindingName): node is BindingPattern;
     function isEmptyBindingElement(node: BindingElement): boolean;
     function getCombinedModifierFlags(node: Node): ModifierFlags;
@@ -3164,6 +3178,7 @@ declare namespace ts {
     function isIndexedAccessTypeNode(node: Node): node is IndexedAccessTypeNode;
     function isMappedTypeNode(node: Node): node is MappedTypeNode;
     function isLiteralTypeNode(node: Node): node is LiteralTypeNode;
+    function isImportTypeNode(node: Node): node is ImportTypeNode;
     function isObjectBindingPattern(node: Node): node is ObjectBindingPattern;
     function isArrayBindingPattern(node: Node): node is ArrayBindingPattern;
     function isBindingElement(node: Node): node is BindingElement;
@@ -3302,6 +3317,7 @@ declare namespace ts {
     function isClassLike(node: Node): node is ClassLikeDeclaration;
     function isAccessor(node: Node): node is AccessorDeclaration;
     function isTypeElement(node: Node): node is TypeElement;
+    function isClassOrTypeElement(node: Node): node is ClassElement | TypeElement;
     function isObjectLiteralElementLike(node: Node): node is ObjectLiteralElementLike;
     /**
      * Node test that determines whether a node is a valid type node.
@@ -3393,6 +3409,7 @@ declare namespace ts {
         set(directory: string, result: ResolvedModuleWithFailedLookupLocations): void;
     }
     function createModuleResolutionCache(currentDirectory: string, getCanonicalFileName: (s: string) => string): ModuleResolutionCache;
+    function resolveModuleNameFromCache(moduleName: string, containingFile: string, cache: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations | undefined;
     function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations;
     function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations;
     function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: NonRelativeModuleNameResolutionCache): ResolvedModuleWithFailedLookupLocations;
@@ -3516,7 +3533,9 @@ declare namespace ts {
     function createNew(expression: Expression, typeArguments: ReadonlyArray<TypeNode> | undefined, argumentsArray: ReadonlyArray<Expression> | undefined): NewExpression;
     function updateNew(node: NewExpression, expression: Expression, typeArguments: ReadonlyArray<TypeNode> | undefined, argumentsArray: ReadonlyArray<Expression> | undefined): NewExpression;
     function createTaggedTemplate(tag: Expression, template: TemplateLiteral): TaggedTemplateExpression;
+    function createTaggedTemplate(tag: Expression, typeArguments: ReadonlyArray<TypeNode>, template: TemplateLiteral): TaggedTemplateExpression;
     function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, template: TemplateLiteral): TaggedTemplateExpression;
+    function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, typeArguments: ReadonlyArray<TypeNode>, template: TemplateLiteral): TaggedTemplateExpression;
     function createTypeAssertion(type: TypeNode, expression: Expression): TypeAssertion;
     function updateTypeAssertion(node: TypeAssertion, type: TypeNode, expression: Expression): TypeAssertion;
     function createParen(expression: Expression): ParenthesizedExpression;
@@ -4368,6 +4387,7 @@ declare namespace ts {
         installPackage?(options: InstallPackageOptions): Promise<ApplyCodeActionCommandResult>;
     }
     interface UserPreferences {
+        readonly disableSuggestions?: boolean;
         readonly quotePreference?: "double" | "single";
         readonly includeCompletionsForModuleExports?: boolean;
         readonly includeCompletionsWithInsertText?: boolean;
@@ -4434,6 +4454,7 @@ declare namespace ts {
         getApplicableRefactors(fileName: string, positionOrRaneg: number | TextRange, preferences: UserPreferences | undefined): ApplicableRefactorInfo[];
         getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string, preferences: UserPreferences | undefined): RefactorEditInfo | undefined;
         organizeImports(scope: OrganizeImportsScope, formatOptions: FormatCodeSettings, preferences: UserPreferences | undefined): ReadonlyArray<FileTextChanges>;
+        getEditsForFileRename(oldFilePath: string, newFilePath: string, formatOptions: FormatCodeSettings): ReadonlyArray<FileTextChanges>;
         getEmitOutput(fileName: string, emitOnlyDtsFiles?: boolean): EmitOutput;
         getProgram(): Program;
         dispose(): void;
@@ -4443,8 +4464,9 @@ declare namespace ts {
         fileName: string;
     }
     type OrganizeImportsScope = CombinedCodeFixScope;
-    /** @deprecated Use UserPreferences */
     interface GetCompletionsAtPositionOptions extends UserPreferences {
+        /** If the editor is asking for completions because a certain character was typed, and not because the user explicitly requested them, this should be set. */
+        triggerCharacter?: string;
         /** @deprecated Use includeCompletionsForModuleExports */
         includeExternalModuleExports?: boolean;
         /** @deprecated Use includeCompletionsWithInsertText */
@@ -4524,6 +4546,8 @@ declare namespace ts {
         commands?: CodeActionCommand[];
     }
     interface CodeFixAction extends CodeAction {
+        /** Short name to identify the fix, for use by telemetry. */
+        fixName: string;
         /**
          * If present, one may call 'getCombinedCodeFix' with this fixId.
          * This may be omitted to indicate that the code fix can't be applied in a group.
diff --git a/tests/baselines/reference/badArrayIndex.errors.txt b/tests/baselines/reference/badArrayIndex.errors.txt
index decfebeeac7..893ac8ee1aa 100644
--- a/tests/baselines/reference/badArrayIndex.errors.txt
+++ b/tests/baselines/reference/badArrayIndex.errors.txt
@@ -1,10 +1,10 @@
 tests/cases/compiler/badArrayIndex.ts(1,15): error TS2693: 'number' only refers to a type, but is being used as a value here.
-tests/cases/compiler/badArrayIndex.ts(1,22): error TS1109: Expression expected.
+tests/cases/compiler/badArrayIndex.ts(1,22): error TS1011: An element access expression should take an argument.
 
 
 ==== tests/cases/compiler/badArrayIndex.ts (2 errors) ====
     var results = number[];
                   ~~~~~~
 !!! error TS2693: 'number' only refers to a type, but is being used as a value here.
-                         ~
-!!! error TS1109: Expression expected.
\ No newline at end of file
+                         
+!!! error TS1011: An element access expression should take an argument.
\ No newline at end of file
diff --git a/tests/baselines/reference/badArrayIndex.types b/tests/baselines/reference/badArrayIndex.types
index a8b541124b6..05a52242290 100644
--- a/tests/baselines/reference/badArrayIndex.types
+++ b/tests/baselines/reference/badArrayIndex.types
@@ -3,4 +3,5 @@ var results = number[];
 >results : any
 >number[] : any
 >number : any
+> : any
 
diff --git a/tests/baselines/reference/badArraySyntax.errors.txt b/tests/baselines/reference/badArraySyntax.errors.txt
index 3c6b28408f2..428d67703b0 100644
--- a/tests/baselines/reference/badArraySyntax.errors.txt
+++ b/tests/baselines/reference/badArraySyntax.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/compiler/badArraySyntax.ts(6,15): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
-tests/cases/compiler/badArraySyntax.ts(7,15): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
-tests/cases/compiler/badArraySyntax.ts(8,20): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
-tests/cases/compiler/badArraySyntax.ts(9,20): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
-tests/cases/compiler/badArraySyntax.ts(10,36): error TS1109: Expression expected.
-tests/cases/compiler/badArraySyntax.ts(10,40): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+tests/cases/compiler/badArraySyntax.ts(6,16): error TS1011: An element access expression should take an argument.
+tests/cases/compiler/badArraySyntax.ts(7,16): error TS1011: An element access expression should take an argument.
+tests/cases/compiler/badArraySyntax.ts(8,21): error TS1011: An element access expression should take an argument.
+tests/cases/compiler/badArraySyntax.ts(9,21): error TS1011: An element access expression should take an argument.
+tests/cases/compiler/badArraySyntax.ts(10,30): error TS1011: An element access expression should take an argument.
+tests/cases/compiler/badArraySyntax.ts(10,41): error TS1011: An element access expression should take an argument.
 
 
 ==== tests/cases/compiler/badArraySyntax.ts (6 errors) ====
@@ -13,20 +13,20 @@ tests/cases/compiler/badArraySyntax.ts(10,40): error TS1150: 'new T[]' cannot be
     
     var a1: Z[] = [];
     var a2 = new Z[];
-                  ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                   
+!!! error TS1011: An element access expression should take an argument.
     var a3 = new Z[]();
-                  ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                   
+!!! error TS1011: An element access expression should take an argument.
     var a4: Z[] = new Z[];
-                       ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                        
+!!! error TS1011: An element access expression should take an argument.
     var a5: Z[] = new Z[]();
-                       ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                        
+!!! error TS1011: An element access expression should take an argument.
     var a6: Z[][] = new   Z     [      ]   [  ];
-                                       ~
-!!! error TS1109: Expression expected.
-                                           ~~~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                                 
+!!! error TS1011: An element access expression should take an argument.
+                                            
+!!! error TS1011: An element access expression should take an argument.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/badArraySyntax.types b/tests/baselines/reference/badArraySyntax.types
index f7982034d71..579dc76301f 100644
--- a/tests/baselines/reference/badArraySyntax.types
+++ b/tests/baselines/reference/badArraySyntax.types
@@ -17,12 +17,14 @@ var a2 = new Z[];
 >new Z[] : any
 >Z[] : any
 >Z : typeof Z
+> : any
 
 var a3 = new Z[]();
 >a3 : any
 >new Z[]() : any
 >Z[] : any
 >Z : typeof Z
+> : any
 
 var a4: Z[] = new Z[];
 >a4 : Z[]
@@ -30,6 +32,7 @@ var a4: Z[] = new Z[];
 >new Z[] : any
 >Z[] : any
 >Z : typeof Z
+> : any
 
 var a5: Z[] = new Z[]();
 >a5 : Z[]
@@ -37,6 +40,7 @@ var a5: Z[] = new Z[]();
 >new Z[]() : any
 >Z[] : any
 >Z : typeof Z
+> : any
 
 var a6: Z[][] = new   Z     [      ]   [  ];
 >a6 : Z[][]
@@ -45,4 +49,6 @@ var a6: Z[][] = new   Z     [      ]   [  ];
 >Z     [      ]   [  ] : any
 >Z     [      ] : any
 >Z : typeof Z
+> : any
+> : any
 
diff --git a/tests/baselines/reference/cannotInvokeNewOnErrorExpression.errors.txt b/tests/baselines/reference/cannotInvokeNewOnErrorExpression.errors.txt
index fab981a8571..87e02668182 100644
--- a/tests/baselines/reference/cannotInvokeNewOnErrorExpression.errors.txt
+++ b/tests/baselines/reference/cannotInvokeNewOnErrorExpression.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/cannotInvokeNewOnErrorExpression.ts(5,15): error TS2339: Property 'ClassA' does not exist on type 'typeof M'.
-tests/cases/compiler/cannotInvokeNewOnErrorExpression.ts(5,21): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+tests/cases/compiler/cannotInvokeNewOnErrorExpression.ts(5,22): error TS1011: An element access expression should take an argument.
 
 
 ==== tests/cases/compiler/cannotInvokeNewOnErrorExpression.ts (2 errors) ====
@@ -10,5 +10,5 @@ tests/cases/compiler/cannotInvokeNewOnErrorExpression.ts(5,21): error TS1150: 'n
     var t = new M.ClassA[];
                   ~~~~~~
 !!! error TS2339: Property 'ClassA' does not exist on type 'typeof M'.
-                        ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
\ No newline at end of file
+                         
+!!! error TS1011: An element access expression should take an argument.
\ No newline at end of file
diff --git a/tests/baselines/reference/cannotInvokeNewOnErrorExpression.types b/tests/baselines/reference/cannotInvokeNewOnErrorExpression.types
index 47ccb421623..2b5360feefd 100644
--- a/tests/baselines/reference/cannotInvokeNewOnErrorExpression.types
+++ b/tests/baselines/reference/cannotInvokeNewOnErrorExpression.types
@@ -12,4 +12,5 @@ var t = new M.ClassA[];
 >M.ClassA : any
 >M : typeof M
 >ClassA : any
+> : any
 
diff --git a/tests/baselines/reference/checkJsTypeDefNoUnusedLocalMarked.symbols b/tests/baselines/reference/checkJsTypeDefNoUnusedLocalMarked.symbols
new file mode 100644
index 00000000000..6826881b834
--- /dev/null
+++ b/tests/baselines/reference/checkJsTypeDefNoUnusedLocalMarked.symbols
@@ -0,0 +1,27 @@
+=== tests/cases/compiler/file.ts ===
+class Foo {
+>Foo : Symbol(Foo, Decl(file.ts, 0, 0))
+
+    x: number;
+>x : Symbol(Foo.x, Decl(file.ts, 0, 11))
+}
+
+declare global {
+>global : Symbol(global, Decl(file.ts, 2, 1))
+
+    var module: any; // Just here to remove unrelated error from test
+>module : Symbol(module, Decl(file.ts, 5, 7))
+}
+
+export = Foo;
+>Foo : Symbol(Foo, Decl(file.ts, 0, 0))
+
+=== tests/cases/compiler/something.js ===
+/** @typedef {typeof import("./file")} Foo */
+
+/** @typedef {(foo: Foo) => string} FooFun */
+
+module.exports = /** @type {FooFun} */(void 0);
+>module : Symbol(export=, Decl(something.js, 0, 0))
+>exports : Symbol(export=, Decl(something.js, 0, 0))
+
diff --git a/tests/baselines/reference/checkJsTypeDefNoUnusedLocalMarked.types b/tests/baselines/reference/checkJsTypeDefNoUnusedLocalMarked.types
new file mode 100644
index 00000000000..1428cce142b
--- /dev/null
+++ b/tests/baselines/reference/checkJsTypeDefNoUnusedLocalMarked.types
@@ -0,0 +1,32 @@
+=== tests/cases/compiler/file.ts ===
+class Foo {
+>Foo : Foo
+
+    x: number;
+>x : number
+}
+
+declare global {
+>global : typeof global
+
+    var module: any; // Just here to remove unrelated error from test
+>module : any
+}
+
+export = Foo;
+>Foo : Foo
+
+=== tests/cases/compiler/something.js ===
+/** @typedef {typeof import("./file")} Foo */
+
+/** @typedef {(foo: Foo) => string} FooFun */
+
+module.exports = /** @type {FooFun} */(void 0);
+>module.exports = /** @type {FooFun} */(void 0) : (foo: typeof Foo) => string
+>module.exports : any
+>module : any
+>exports : any
+>(void 0) : (foo: typeof Foo) => string
+>void 0 : undefined
+>0 : 0
+
diff --git a/tests/baselines/reference/classAppearsToHaveMembersOfObject.types b/tests/baselines/reference/classAppearsToHaveMembersOfObject.types
index 9c87fa18ecd..44aeedacba2 100644
--- a/tests/baselines/reference/classAppearsToHaveMembersOfObject.types
+++ b/tests/baselines/reference/classAppearsToHaveMembersOfObject.types
@@ -17,9 +17,9 @@ var r = c.toString();
 var r2 = c.hasOwnProperty('');
 >r2 : boolean
 >c.hasOwnProperty('') : boolean
->c.hasOwnProperty : (v: string) => boolean
+>c.hasOwnProperty : (v: string | number | symbol) => boolean
 >c : C
->hasOwnProperty : (v: string) => boolean
+>hasOwnProperty : (v: string | number | symbol) => boolean
 >'' : ""
 
 var o: Object = c;
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.errors.txt b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.errors.txt
index 58a660c1ee8..03aa27e91f8 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.errors.txt
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts(8,21): error TS2304: Cannot find name 'field1'.
+tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts(8,21): error TS2663: Cannot find name 'field1'. Did you mean the instance member 'this.field1'?
 
 
 ==== tests/cases/compiler/classMemberInitializerWithLamdaScoping3_0.ts (0 errors) ====
@@ -14,6 +14,6 @@ tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts(8,21): error T
         messageHandler = () => {
             console.log(field1); // Should be error that couldnt find symbol field1
                         ~~~~~~
-!!! error TS2304: Cannot find name 'field1'.
+!!! error TS2663: Cannot find name 'field1'. Did you mean the instance member 'this.field1'?
         };
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/commonJsImportClassExpression.js b/tests/baselines/reference/commonJsImportClassExpression.js
new file mode 100644
index 00000000000..b460814b872
--- /dev/null
+++ b/tests/baselines/reference/commonJsImportClassExpression.js
@@ -0,0 +1,25 @@
+//// [tests/cases/compiler/commonJsImportClassExpression.ts] ////
+
+//// [mod1.ts]
+export = class {
+    chunk = 1
+}
+
+//// [use.ts]
+import Chunk = require('./mod1')
+declare var c: Chunk;
+c.chunk;
+
+
+//// [mod1.js]
+"use strict";
+module.exports = /** @class */ (function () {
+    function class_1() {
+        this.chunk = 1;
+    }
+    return class_1;
+}());
+//// [use.js]
+"use strict";
+exports.__esModule = true;
+c.chunk;
diff --git a/tests/baselines/reference/commonJsImportClassExpression.symbols b/tests/baselines/reference/commonJsImportClassExpression.symbols
new file mode 100644
index 00000000000..5f6bc93188f
--- /dev/null
+++ b/tests/baselines/reference/commonJsImportClassExpression.symbols
@@ -0,0 +1,19 @@
+=== tests/cases/compiler/use.ts ===
+import Chunk = require('./mod1')
+>Chunk : Symbol(Chunk, Decl(use.ts, 0, 0))
+
+declare var c: Chunk;
+>c : Symbol(c, Decl(use.ts, 1, 11))
+>Chunk : Symbol(Chunk, Decl(use.ts, 0, 0))
+
+c.chunk;
+>c.chunk : Symbol(Chunk.chunk, Decl(mod1.ts, 0, 16))
+>c : Symbol(c, Decl(use.ts, 1, 11))
+>chunk : Symbol(Chunk.chunk, Decl(mod1.ts, 0, 16))
+
+=== tests/cases/compiler/mod1.ts ===
+export = class {
+    chunk = 1
+>chunk : Symbol((Anonymous class).chunk, Decl(mod1.ts, 0, 16))
+}
+
diff --git a/tests/baselines/reference/commonJsImportClassExpression.types b/tests/baselines/reference/commonJsImportClassExpression.types
new file mode 100644
index 00000000000..7bb32dea8e5
--- /dev/null
+++ b/tests/baselines/reference/commonJsImportClassExpression.types
@@ -0,0 +1,22 @@
+=== tests/cases/compiler/use.ts ===
+import Chunk = require('./mod1')
+>Chunk : typeof Chunk
+
+declare var c: Chunk;
+>c : Chunk
+>Chunk : Chunk
+
+c.chunk;
+>c.chunk : number
+>c : Chunk
+>chunk : number
+
+=== tests/cases/compiler/mod1.ts ===
+export = class {
+>class {    chunk = 1} : typeof (Anonymous class)
+
+    chunk = 1
+>chunk : number
+>1 : 1
+}
+
diff --git a/tests/baselines/reference/complexRecursiveCollections.symbols b/tests/baselines/reference/complexRecursiveCollections.symbols
index 4f1a675edaf..4c49735f01d 100644
--- a/tests/baselines/reference/complexRecursiveCollections.symbols
+++ b/tests/baselines/reference/complexRecursiveCollections.symbols
@@ -1689,7 +1689,7 @@ declare module Immutable {
     export interface Class<T extends Object> {
 >Class : Symbol(Class, Decl(immutable.ts, 214, 70))
 >T : Symbol(T, Decl(immutable.ts, 215, 27))
->Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
       (values?: Partial<T> | Iterable<[string, any]>): Instance<T> & Readonly<T>;
 >values : Symbol(values, Decl(immutable.ts, 216, 7))
@@ -1714,7 +1714,7 @@ declare module Immutable {
     export interface Instance<T extends Object> {
 >Instance : Symbol(Instance, Decl(immutable.ts, 218, 5))
 >T : Symbol(T, Decl(immutable.ts, 219, 30))
->Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
       readonly size: number;
 >size : Symbol(Instance.size, Decl(immutable.ts, 219, 49))
@@ -2005,7 +2005,7 @@ declare module Immutable {
 
       toJS(): Object;
 >toJS : Symbol(Keyed.toJS, Decl(immutable.ts, 269, 76))
->Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
       toJSON(): { [key: string]: V };
 >toJSON : Symbol(Keyed.toJSON, Decl(immutable.ts, 270, 21))
@@ -2594,7 +2594,7 @@ declare module Immutable {
 
       toJS(): Object;
 >toJS : Symbol(Keyed.toJS, Decl(immutable.ts, 340, 59))
->Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
       toJSON(): { [key: string]: V };
 >toJSON : Symbol(Keyed.toJSON, Decl(immutable.ts, 341, 21))
diff --git a/tests/baselines/reference/computedPropertyNames10_ES5.types b/tests/baselines/reference/computedPropertyNames10_ES5.types
index 717e12f7216..d12636585b6 100644
--- a/tests/baselines/reference/computedPropertyNames10_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames10_ES5.types
@@ -9,8 +9,8 @@ var a: any;
 >a : any
 
 var v = {
->v : { [x: string]: () => void; [x: number]: () => void; [""](): void; [0](): void; }
->{    [s]() { },    [n]() { },    [s + s]() { },    [s + n]() { },    [+s]() { },    [""]() { },    [0]() { },    [a]() { },    [<any>true]() { },    [`hello bye`]() { },    [`hello ${a} bye`]() { }} : { [x: string]: () => void; [x: number]: () => void; [""](): void; [0](): void; }
+>v : { [x: string]: () => void; [x: number]: () => void; [""](): void; [0](): void; [`hello bye`](): void; }
+>{    [s]() { },    [n]() { },    [s + s]() { },    [s + n]() { },    [+s]() { },    [""]() { },    [0]() { },    [a]() { },    [<any>true]() { },    [`hello bye`]() { },    [`hello ${a} bye`]() { }} : { [x: string]: () => void; [x: number]: () => void; [""](): void; [0](): void; [`hello bye`](): void; }
 
     [s]() { },
 >[s] : () => void
diff --git a/tests/baselines/reference/computedPropertyNames10_ES6.types b/tests/baselines/reference/computedPropertyNames10_ES6.types
index b615e9e4739..fab486ff57a 100644
--- a/tests/baselines/reference/computedPropertyNames10_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames10_ES6.types
@@ -9,8 +9,8 @@ var a: any;
 >a : any
 
 var v = {
->v : { [x: string]: () => void; [x: number]: () => void; [""](): void; [0](): void; }
->{    [s]() { },    [n]() { },    [s + s]() { },    [s + n]() { },    [+s]() { },    [""]() { },    [0]() { },    [a]() { },    [<any>true]() { },    [`hello bye`]() { },    [`hello ${a} bye`]() { }} : { [x: string]: () => void; [x: number]: () => void; [""](): void; [0](): void; }
+>v : { [x: string]: () => void; [x: number]: () => void; [""](): void; [0](): void; [`hello bye`](): void; }
+>{    [s]() { },    [n]() { },    [s + s]() { },    [s + n]() { },    [+s]() { },    [""]() { },    [0]() { },    [a]() { },    [<any>true]() { },    [`hello bye`]() { },    [`hello ${a} bye`]() { }} : { [x: string]: () => void; [x: number]: () => void; [""](): void; [0](): void; [`hello bye`](): void; }
 
     [s]() { },
 >[s] : () => void
diff --git a/tests/baselines/reference/computedPropertyNames28_ES5.types b/tests/baselines/reference/computedPropertyNames28_ES5.types
index b440f86c986..c353b1bdb83 100644
--- a/tests/baselines/reference/computedPropertyNames28_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames28_ES5.types
@@ -12,8 +12,8 @@ class C extends Base {
 >super : typeof Base
 
         var obj = {
->obj : { [x: string]: () => void; }
->{            [(super(), "prop")]() { }        } : { [x: string]: () => void; }
+>obj : { [(super(), "prop")](): void; }
+>{            [(super(), "prop")]() { }        } : { [(super(), "prop")](): void; }
 
             [(super(), "prop")]() { }
 >[(super(), "prop")] : () => void
diff --git a/tests/baselines/reference/computedPropertyNames28_ES6.types b/tests/baselines/reference/computedPropertyNames28_ES6.types
index a947b6f8a95..97d4f9d591f 100644
--- a/tests/baselines/reference/computedPropertyNames28_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames28_ES6.types
@@ -12,8 +12,8 @@ class C extends Base {
 >super : typeof Base
 
         var obj = {
->obj : { [x: string]: () => void; }
->{            [(super(), "prop")]() { }        } : { [x: string]: () => void; }
+>obj : { [(super(), "prop")](): void; }
+>{            [(super(), "prop")]() { }        } : { [(super(), "prop")](): void; }
 
             [(super(), "prop")]() { }
 >[(super(), "prop")] : () => void
diff --git a/tests/baselines/reference/computedPropertyNames30_ES5.types b/tests/baselines/reference/computedPropertyNames30_ES5.types
index 1d50a1d19f3..0344bc7924a 100644
--- a/tests/baselines/reference/computedPropertyNames30_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames30_ES5.types
@@ -15,8 +15,8 @@ class C extends Base {
 >() => {            var obj = {                // Ideally, we would capture this. But the reference is                // illegal, and not capturing this is consistent with                //treatment of other similar violations.                [(super(), "prop")]() { }            };        } : () => void
 
             var obj = {
->obj : { [x: string]: () => void; }
->{                // Ideally, we would capture this. But the reference is                // illegal, and not capturing this is consistent with                //treatment of other similar violations.                [(super(), "prop")]() { }            } : { [x: string]: () => void; }
+>obj : { [(super(), "prop")](): void; }
+>{                // Ideally, we would capture this. But the reference is                // illegal, and not capturing this is consistent with                //treatment of other similar violations.                [(super(), "prop")]() { }            } : { [(super(), "prop")](): void; }
 
                 // Ideally, we would capture this. But the reference is
                 // illegal, and not capturing this is consistent with
diff --git a/tests/baselines/reference/computedPropertyNames30_ES6.types b/tests/baselines/reference/computedPropertyNames30_ES6.types
index 3d2a39f4fe9..ef7e95f46f2 100644
--- a/tests/baselines/reference/computedPropertyNames30_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames30_ES6.types
@@ -15,8 +15,8 @@ class C extends Base {
 >() => {            var obj = {                // Ideally, we would capture this. But the reference is                // illegal, and not capturing this is consistent with                //treatment of other similar violations.                [(super(), "prop")]() { }            };        } : () => void
 
             var obj = {
->obj : { [x: string]: () => void; }
->{                // Ideally, we would capture this. But the reference is                // illegal, and not capturing this is consistent with                //treatment of other similar violations.                [(super(), "prop")]() { }            } : { [x: string]: () => void; }
+>obj : { [(super(), "prop")](): void; }
+>{                // Ideally, we would capture this. But the reference is                // illegal, and not capturing this is consistent with                //treatment of other similar violations.                [(super(), "prop")]() { }            } : { [(super(), "prop")](): void; }
 
                 // Ideally, we would capture this. But the reference is
                 // illegal, and not capturing this is consistent with
diff --git a/tests/baselines/reference/computedPropertyNames5_ES5.types b/tests/baselines/reference/computedPropertyNames5_ES5.types
index b185ee47f4d..64b51175c33 100644
--- a/tests/baselines/reference/computedPropertyNames5_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames5_ES5.types
@@ -3,8 +3,8 @@ var b: boolean;
 >b : boolean
 
 var v = {
->v : { [x: string]: number; [x: number]: any; [true]: number; }
->{    [b]: 0,    [true]: 1,    [[]]: 0,    [{}]: 0,    [undefined]: undefined,    [null]: null} : { [x: string]: number; [x: number]: null; [true]: number; }
+>v : { [x: number]: any; }
+>{    [b]: 0,    [true]: 1,    [[]]: 0,    [{}]: 0,    [undefined]: undefined,    [null]: null} : { [x: number]: null; }
 
     [b]: 0,
 >[b] : number
diff --git a/tests/baselines/reference/computedPropertyNames5_ES6.types b/tests/baselines/reference/computedPropertyNames5_ES6.types
index 62c798a8b08..5ffcba5cbc6 100644
--- a/tests/baselines/reference/computedPropertyNames5_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames5_ES6.types
@@ -3,8 +3,8 @@ var b: boolean;
 >b : boolean
 
 var v = {
->v : { [x: string]: number; [x: number]: any; [true]: number; }
->{    [b]: 0,    [true]: 1,    [[]]: 0,    [{}]: 0,    [undefined]: undefined,    [null]: null} : { [x: string]: number; [x: number]: null; [true]: number; }
+>v : { [x: number]: any; }
+>{    [b]: 0,    [true]: 1,    [[]]: 0,    [{}]: 0,    [undefined]: undefined,    [null]: null} : { [x: number]: null; }
 
     [b]: 0,
 >[b] : number
diff --git a/tests/baselines/reference/computedPropertyNames9_ES5.types b/tests/baselines/reference/computedPropertyNames9_ES5.types
index dd37aca47b9..d85aefa5f1c 100644
--- a/tests/baselines/reference/computedPropertyNames9_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames9_ES5.types
@@ -19,8 +19,8 @@ function f(x): any { }
 >x : any
 
 var v = {
->v : { [x: string]: number; [x: number]: number; [f(true)]: number; }
->{    [f("")]: 0,    [f(0)]: 0,    [f(true)]: 0} : { [x: string]: number; [x: number]: number; [f(true)]: number; }
+>v : { [x: string]: number; [x: number]: number; }
+>{    [f("")]: 0,    [f(0)]: 0,    [f(true)]: 0} : { [x: string]: number; [x: number]: number; }
 
     [f("")]: 0,
 >[f("")] : number
diff --git a/tests/baselines/reference/computedPropertyNames9_ES6.types b/tests/baselines/reference/computedPropertyNames9_ES6.types
index 02bd0eabb9a..35aac1bbea7 100644
--- a/tests/baselines/reference/computedPropertyNames9_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames9_ES6.types
@@ -19,8 +19,8 @@ function f(x): any { }
 >x : any
 
 var v = {
->v : { [x: string]: number; [x: number]: number; [f(true)]: number; }
->{    [f("")]: 0,    [f(0)]: 0,    [f(true)]: 0} : { [x: string]: number; [x: number]: number; [f(true)]: number; }
+>v : { [x: string]: number; [x: number]: number; }
+>{    [f("")]: 0,    [f(0)]: 0,    [f(true)]: 0} : { [x: string]: number; [x: number]: number; }
 
     [f("")]: 0,
 >[f("")] : number
diff --git a/tests/baselines/reference/conditionalTypes1.errors.txt b/tests/baselines/reference/conditionalTypes1.errors.txt
index 9599cc1bcba..7ba3a2aa934 100644
--- a/tests/baselines/reference/conditionalTypes1.errors.txt
+++ b/tests/baselines/reference/conditionalTypes1.errors.txt
@@ -5,9 +5,8 @@ tests/cases/conformance/types/conditional/conditionalTypes1.ts(17,5): error TS23
 tests/cases/conformance/types/conditional/conditionalTypes1.ts(18,9): error TS2322: Type 'T' is not assignable to type 'string'.
   Type 'string | undefined' is not assignable to type 'string'.
     Type 'undefined' is not assignable to type 'string'.
-tests/cases/conformance/types/conditional/conditionalTypes1.ts(24,5): error TS2322: Type 'Partial<T>[keyof T]' is not assignable to type 'NonNullable<Partial<T>[keyof T]>'.
-  Type 'T[keyof T] | undefined' is not assignable to type 'NonNullable<Partial<T>[keyof T]>'.
-    Type 'undefined' is not assignable to type 'NonNullable<Partial<T>[keyof T]>'.
+tests/cases/conformance/types/conditional/conditionalTypes1.ts(24,5): error TS2322: Type 'T[keyof T] | undefined' is not assignable to type 'NonNullable<Partial<T>[keyof T]>'.
+  Type 'undefined' is not assignable to type 'NonNullable<Partial<T>[keyof T]>'.
 tests/cases/conformance/types/conditional/conditionalTypes1.ts(29,5): error TS2322: Type 'T["x"]' is not assignable to type 'NonNullable<T["x"]>'.
   Type 'string | undefined' is not assignable to type 'NonNullable<T["x"]>'.
     Type 'undefined' is not assignable to type 'NonNullable<T["x"]>'.
@@ -17,41 +16,25 @@ tests/cases/conformance/types/conditional/conditionalTypes1.ts(30,9): error TS23
 tests/cases/conformance/types/conditional/conditionalTypes1.ts(103,5): error TS2322: Type 'Pick<T, { [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]>' is not assignable to type 'T'.
 tests/cases/conformance/types/conditional/conditionalTypes1.ts(104,5): error TS2322: Type 'Pick<T, { [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]>' is not assignable to type 'T'.
 tests/cases/conformance/types/conditional/conditionalTypes1.ts(106,5): error TS2322: Type 'Pick<T, { [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]>' is not assignable to type 'Pick<T, { [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]>'.
-  Type '{ [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]'.
-    Type 'T[keyof T] extends Function ? keyof T : never' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]'.
-      Type 'keyof T' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]'.
-        Type 'keyof T' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
-          Type 'T[keyof T] extends Function ? keyof T : never' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
-            Type '{ [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
-              Type 'T[keyof T] extends Function ? keyof T : never' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
-                Type 'keyof T' is not assignable to type 'never'.
+  Type 'T[keyof T] extends Function ? keyof T : never' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
+    Type 'keyof T' is not assignable to type 'never'.
+      Type 'string | number | symbol' is not assignable to type 'never'.
+        Type 'string' is not assignable to type 'never'.
 tests/cases/conformance/types/conditional/conditionalTypes1.ts(108,5): error TS2322: Type 'Pick<T, { [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]>' is not assignable to type 'Pick<T, { [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]>'.
-  Type '{ [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]'.
-    Type 'T[keyof T] extends Function ? never : keyof T' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]'.
-      Type 'keyof T' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]'.
-        Type 'keyof T' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
-          Type 'T[keyof T] extends Function ? never : keyof T' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
-            Type '{ [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
-              Type 'T[keyof T] extends Function ? never : keyof T' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
-                Type 'keyof T' is not assignable to type 'never'.
-tests/cases/conformance/types/conditional/conditionalTypes1.ts(114,5): error TS2322: Type 'keyof T' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]'.
-  Type 'keyof T' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
-tests/cases/conformance/types/conditional/conditionalTypes1.ts(115,5): error TS2322: Type '{ [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]'.
-  Type 'T[keyof T] extends Function ? never : keyof T' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]'.
-    Type 'keyof T' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]'.
-      Type 'T[keyof T] extends Function ? never : keyof T' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
-        Type '{ [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
-          Type 'T[keyof T] extends Function ? never : keyof T' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
-            Type 'keyof T' is not assignable to type 'never'.
-tests/cases/conformance/types/conditional/conditionalTypes1.ts(116,5): error TS2322: Type 'keyof T' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]'.
-  Type 'keyof T' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
-tests/cases/conformance/types/conditional/conditionalTypes1.ts(117,5): error TS2322: Type '{ [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]'.
-  Type 'T[keyof T] extends Function ? keyof T : never' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]'.
-    Type 'keyof T' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]'.
-      Type 'T[keyof T] extends Function ? keyof T : never' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
-        Type '{ [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
-          Type 'T[keyof T] extends Function ? keyof T : never' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
-            Type 'keyof T' is not assignable to type 'never'.
+  Type 'T[keyof T] extends Function ? never : keyof T' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
+    Type 'keyof T' is not assignable to type 'never'.
+tests/cases/conformance/types/conditional/conditionalTypes1.ts(114,5): error TS2322: Type 'keyof T' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
+  Type 'string | number | symbol' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
+    Type 'string' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
+tests/cases/conformance/types/conditional/conditionalTypes1.ts(115,5): error TS2322: Type 'T[keyof T] extends Function ? never : keyof T' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
+  Type 'keyof T' is not assignable to type 'never'.
+    Type 'string | number | symbol' is not assignable to type 'never'.
+      Type 'string' is not assignable to type 'never'.
+tests/cases/conformance/types/conditional/conditionalTypes1.ts(116,5): error TS2322: Type 'keyof T' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
+  Type 'string | number | symbol' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
+    Type 'string' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
+tests/cases/conformance/types/conditional/conditionalTypes1.ts(117,5): error TS2322: Type 'T[keyof T] extends Function ? keyof T : never' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
+  Type 'keyof T' is not assignable to type 'never'.
 tests/cases/conformance/types/conditional/conditionalTypes1.ts(134,10): error TS2540: Cannot assign to 'id' because it is a constant or a read-only property.
 tests/cases/conformance/types/conditional/conditionalTypes1.ts(135,5): error TS2542: Index signature in type 'DeepReadonlyArray<Part>' only permits reading.
 tests/cases/conformance/types/conditional/conditionalTypes1.ts(136,22): error TS2540: Cannot assign to 'id' because it is a constant or a read-only property.
@@ -105,9 +88,8 @@ tests/cases/conformance/types/conditional/conditionalTypes1.ts(288,43): error TS
         x = y;
         y = x;  // Error
         ~
-!!! error TS2322: Type 'Partial<T>[keyof T]' is not assignable to type 'NonNullable<Partial<T>[keyof T]>'.
-!!! error TS2322:   Type 'T[keyof T] | undefined' is not assignable to type 'NonNullable<Partial<T>[keyof T]>'.
-!!! error TS2322:     Type 'undefined' is not assignable to type 'NonNullable<Partial<T>[keyof T]>'.
+!!! error TS2322: Type 'T[keyof T] | undefined' is not assignable to type 'NonNullable<Partial<T>[keyof T]>'.
+!!! error TS2322:   Type 'undefined' is not assignable to type 'NonNullable<Partial<T>[keyof T]>'.
     }
     
     function f4<T extends { x: string | undefined }>(x: T["x"], y: NonNullable<T["x"]>) {
@@ -204,26 +186,16 @@ tests/cases/conformance/types/conditional/conditionalTypes1.ts(288,43): error TS
         y = z;  // Error
         ~
 !!! error TS2322: Type 'Pick<T, { [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]>' is not assignable to type 'Pick<T, { [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]>'.
-!!! error TS2322:   Type '{ [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]'.
-!!! error TS2322:     Type 'T[keyof T] extends Function ? keyof T : never' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]'.
-!!! error TS2322:       Type 'keyof T' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]'.
-!!! error TS2322:         Type 'keyof T' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
-!!! error TS2322:           Type 'T[keyof T] extends Function ? keyof T : never' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
-!!! error TS2322:             Type '{ [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
-!!! error TS2322:               Type 'T[keyof T] extends Function ? keyof T : never' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
-!!! error TS2322:                 Type 'keyof T' is not assignable to type 'never'.
+!!! error TS2322:   Type 'T[keyof T] extends Function ? keyof T : never' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
+!!! error TS2322:     Type 'keyof T' is not assignable to type 'never'.
+!!! error TS2322:       Type 'string | number | symbol' is not assignable to type 'never'.
+!!! error TS2322:         Type 'string' is not assignable to type 'never'.
         z = x;
         z = y;  // Error
         ~
 !!! error TS2322: Type 'Pick<T, { [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]>' is not assignable to type 'Pick<T, { [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]>'.
-!!! error TS2322:   Type '{ [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]'.
-!!! error TS2322:     Type 'T[keyof T] extends Function ? never : keyof T' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]'.
-!!! error TS2322:       Type 'keyof T' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]'.
-!!! error TS2322:         Type 'keyof T' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
-!!! error TS2322:           Type 'T[keyof T] extends Function ? never : keyof T' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
-!!! error TS2322:             Type '{ [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
-!!! error TS2322:               Type 'T[keyof T] extends Function ? never : keyof T' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
-!!! error TS2322:                 Type 'keyof T' is not assignable to type 'never'.
+!!! error TS2322:   Type 'T[keyof T] extends Function ? never : keyof T' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
+!!! error TS2322:     Type 'keyof T' is not assignable to type 'never'.
     }
     
     function f8<T>(x: keyof T, y: FunctionPropertyNames<T>, z: NonFunctionPropertyNames<T>) {
@@ -231,30 +203,24 @@ tests/cases/conformance/types/conditional/conditionalTypes1.ts(288,43): error TS
         x = z;
         y = x;  // Error
         ~
-!!! error TS2322: Type 'keyof T' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]'.
-!!! error TS2322:   Type 'keyof T' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
+!!! error TS2322: Type 'keyof T' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
+!!! error TS2322:   Type 'string | number | symbol' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
+!!! error TS2322:     Type 'string' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
         y = z;  // Error
         ~
-!!! error TS2322: Type '{ [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]'.
-!!! error TS2322:   Type 'T[keyof T] extends Function ? never : keyof T' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]'.
-!!! error TS2322:     Type 'keyof T' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]'.
-!!! error TS2322:       Type 'T[keyof T] extends Function ? never : keyof T' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
-!!! error TS2322:         Type '{ [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
-!!! error TS2322:           Type 'T[keyof T] extends Function ? never : keyof T' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
-!!! error TS2322:             Type 'keyof T' is not assignable to type 'never'.
+!!! error TS2322: Type 'T[keyof T] extends Function ? never : keyof T' is not assignable to type 'T[keyof T] extends Function ? keyof T : never'.
+!!! error TS2322:   Type 'keyof T' is not assignable to type 'never'.
+!!! error TS2322:     Type 'string | number | symbol' is not assignable to type 'never'.
+!!! error TS2322:       Type 'string' is not assignable to type 'never'.
         z = x;  // Error
         ~
-!!! error TS2322: Type 'keyof T' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]'.
-!!! error TS2322:   Type 'keyof T' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
+!!! error TS2322: Type 'keyof T' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
+!!! error TS2322:   Type 'string | number | symbol' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
+!!! error TS2322:     Type 'string' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
         z = y;  // Error
         ~
-!!! error TS2322: Type '{ [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]'.
-!!! error TS2322:   Type 'T[keyof T] extends Function ? keyof T : never' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]'.
-!!! error TS2322:     Type 'keyof T' is not assignable to type '{ [K in keyof T]: T[K] extends Function ? never : K; }[keyof T]'.
-!!! error TS2322:       Type 'T[keyof T] extends Function ? keyof T : never' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
-!!! error TS2322:         Type '{ [K in keyof T]: T[K] extends Function ? K : never; }[keyof T]' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
-!!! error TS2322:           Type 'T[keyof T] extends Function ? keyof T : never' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
-!!! error TS2322:             Type 'keyof T' is not assignable to type 'never'.
+!!! error TS2322: Type 'T[keyof T] extends Function ? keyof T : never' is not assignable to type 'T[keyof T] extends Function ? never : keyof T'.
+!!! error TS2322:   Type 'keyof T' is not assignable to type 'never'.
     }
     
     type DeepReadonly<T> =
@@ -463,7 +429,7 @@ tests/cases/conformance/types/conditional/conditionalTypes1.ts(288,43): error TS
     
     // Repro from #21862
     
-    type OldDiff<T extends string, U extends string> = (
+    type OldDiff<T extends keyof any, U extends keyof any> = (
         & { [P in T]: P; }
         & { [P in U]: never; }
         & { [x: string]: never; }
diff --git a/tests/baselines/reference/conditionalTypes1.js b/tests/baselines/reference/conditionalTypes1.js
index 3e5e385625b..552a80d58a5 100644
--- a/tests/baselines/reference/conditionalTypes1.js
+++ b/tests/baselines/reference/conditionalTypes1.js
@@ -301,7 +301,7 @@ function f50() {
 
 // Repro from #21862
 
-type OldDiff<T extends string, U extends string> = (
+type OldDiff<T extends keyof any, U extends keyof any> = (
     & { [P in T]: P; }
     & { [P in U]: never; }
     & { [x: string]: never; }
@@ -656,7 +656,7 @@ declare type T95<T> = T extends string ? boolean : number;
 declare const f44: <U>(value: T94<U>) => T95<U>;
 declare const f45: <U>(value: T95<U>) => T94<U>;
 declare function f50(): void;
-declare type OldDiff<T extends string, U extends string> = ({
+declare type OldDiff<T extends keyof any, U extends keyof any> = ({
     [P in T]: P;
 } & {
     [P in U]: never;
diff --git a/tests/baselines/reference/conditionalTypes1.symbols b/tests/baselines/reference/conditionalTypes1.symbols
index fb0ce83e0a7..5f6bb75514d 100644
--- a/tests/baselines/reference/conditionalTypes1.symbols
+++ b/tests/baselines/reference/conditionalTypes1.symbols
@@ -1186,10 +1186,10 @@ function f50() {
 
 // Repro from #21862
 
-type OldDiff<T extends string, U extends string> = (
+type OldDiff<T extends keyof any, U extends keyof any> = (
 >OldDiff : Symbol(OldDiff, Decl(conditionalTypes1.ts, 298, 1))
 >T : Symbol(T, Decl(conditionalTypes1.ts, 302, 13))
->U : Symbol(U, Decl(conditionalTypes1.ts, 302, 30))
+>U : Symbol(U, Decl(conditionalTypes1.ts, 302, 33))
 
     & { [P in T]: P; }
 >P : Symbol(P, Decl(conditionalTypes1.ts, 303, 9))
@@ -1198,7 +1198,7 @@ type OldDiff<T extends string, U extends string> = (
 
     & { [P in U]: never; }
 >P : Symbol(P, Decl(conditionalTypes1.ts, 304, 9))
->U : Symbol(U, Decl(conditionalTypes1.ts, 302, 30))
+>U : Symbol(U, Decl(conditionalTypes1.ts, 302, 33))
 
     & { [x: string]: never; }
 >x : Symbol(x, Decl(conditionalTypes1.ts, 305, 9))
diff --git a/tests/baselines/reference/conditionalTypes1.types b/tests/baselines/reference/conditionalTypes1.types
index 2ba376781a5..90d2703d034 100644
--- a/tests/baselines/reference/conditionalTypes1.types
+++ b/tests/baselines/reference/conditionalTypes1.types
@@ -1343,7 +1343,7 @@ function f50() {
 
 // Repro from #21862
 
-type OldDiff<T extends string, U extends string> = (
+type OldDiff<T extends keyof any, U extends keyof any> = (
 >OldDiff : ({ [P in T]: P; } & { [P in U]: never; } & { [x: string]: never; })[T]
 >T : T
 >U : U
diff --git a/tests/baselines/reference/conditionalTypes2.errors.txt b/tests/baselines/reference/conditionalTypes2.errors.txt
index c0c4211174c..49a36be96db 100644
--- a/tests/baselines/reference/conditionalTypes2.errors.txt
+++ b/tests/baselines/reference/conditionalTypes2.errors.txt
@@ -6,6 +6,8 @@ tests/cases/conformance/types/conditional/conditionalTypes2.ts(24,5): error TS23
   Types of property 'foo' are incompatible.
     Type 'B extends string ? keyof B : B' is not assignable to type 'A extends string ? keyof A : A'.
       Type 'keyof B' is not assignable to type 'keyof A'.
+        Type 'string | number | symbol' is not assignable to type 'keyof A'.
+          Type 'string' is not assignable to type 'keyof A'.
 tests/cases/conformance/types/conditional/conditionalTypes2.ts(25,5): error TS2322: Type 'Invariant<A>' is not assignable to type 'Invariant<B>'.
   Types of property 'foo' are incompatible.
     Type 'A extends string ? keyof A : A' is not assignable to type 'B extends string ? keyof B : B'.
@@ -60,6 +62,8 @@ tests/cases/conformance/types/conditional/conditionalTypes2.ts(75,12): error TS2
 !!! error TS2322:   Types of property 'foo' are incompatible.
 !!! error TS2322:     Type 'B extends string ? keyof B : B' is not assignable to type 'A extends string ? keyof A : A'.
 !!! error TS2322:       Type 'keyof B' is not assignable to type 'keyof A'.
+!!! error TS2322:         Type 'string | number | symbol' is not assignable to type 'keyof A'.
+!!! error TS2322:           Type 'string' is not assignable to type 'keyof A'.
         b = a;  // Error
         ~
 !!! error TS2322: Type 'Invariant<A>' is not assignable to type 'Invariant<B>'.
diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt
index 1150fe0ff29..a55c3af6555 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt
@@ -77,6 +77,7 @@ tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(257,33): error T
 tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(257,35): error TS2693: 'string' only refers to a type, but is being used as a value here.
 tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(257,43): error TS1109: Expression expected.
 tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(257,52): error TS2693: 'string' only refers to a type, but is being used as a value here.
+tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(257,59): error TS1011: An element access expression should take an argument.
 tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(257,60): error TS1005: ';' expected.
 tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(257,65): error TS1109: Expression expected.
 tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(259,9): error TS2304: Cannot find name 'public'.
@@ -89,7 +90,7 @@ tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(259,55): error T
 tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(261,1): error TS1128: Declaration or statement expected.
 
 
-==== tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts (89 errors) ====
+==== tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts (90 errors) ====
     declare module "fs" {
         export class File {
             constructor(filename: string);
@@ -508,6 +509,8 @@ tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(261,1): error TS
 !!! error TS1109: Expression expected.
                                                        ~~~~~~
 !!! error TS2693: 'string' only refers to a type, but is being used as a value here.
+                                                              
+!!! error TS1011: An element access expression should take an argument.
                                                                ~
 !!! error TS1005: ';' expected.
                                                                     ~
diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
index df80419ca16..24f9b2639a8 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
@@ -929,6 +929,7 @@ module TypeScriptAllInOne {
 >rest : any
 >string[] : any
 >string : any
+> : any
 >&         public : number
 > : any
 
diff --git a/tests/baselines/reference/controlFlowIIFE.errors.txt b/tests/baselines/reference/controlFlowIIFE.errors.txt
new file mode 100644
index 00000000000..50053a90f2c
--- /dev/null
+++ b/tests/baselines/reference/controlFlowIIFE.errors.txt
@@ -0,0 +1,82 @@
+tests/cases/conformance/controlFlow/controlFlowIIFE.ts(64,5): error TS2454: Variable 'v' is used before being assigned.
+tests/cases/conformance/controlFlow/controlFlowIIFE.ts(72,5): error TS2454: Variable 'v' is used before being assigned.
+
+
+==== tests/cases/conformance/controlFlow/controlFlowIIFE.ts (2 errors) ====
+    declare function getStringOrNumber(): string | number;
+    
+    function f1() {
+        let x = getStringOrNumber();
+        if (typeof x === "string") {
+            let n = function() {
+                return x.length;
+            }();
+        }
+    }
+    
+    function f2() {
+        let x = getStringOrNumber();
+        if (typeof x === "string") {
+            let n = (function() {
+                return x.length;
+            })();
+        }
+    }
+    
+    function f3() {
+        let x = getStringOrNumber();
+        let y: number;
+        if (typeof x === "string") {
+            let n = (z => x.length + y + z)(y = 1);
+        }
+    }
+    
+    // Repros from #8381
+    
+    let maybeNumber: number | undefined;
+    (function () {
+        maybeNumber = 1;
+    })();
+    maybeNumber++;
+    if (maybeNumber !== undefined) {
+        maybeNumber++;
+    }
+    
+    let test: string | undefined;
+    if (!test) {
+        throw new Error('Test is not defined');
+    }
+    (() => {
+        test.slice(1); // No error
+    })();
+    
+    // Repro from #23565
+    
+    function f4() {
+        let v: number;
+        (function() {
+            v = 1;
+        })();
+        v;
+    }
+    
+    function f5() {
+        let v: number;
+        (function*() {
+            yield 1;
+            v = 1;
+        })();
+        v; // still undefined
+        ~
+!!! error TS2454: Variable 'v' is used before being assigned.
+    }
+    
+    function f6() {
+        let v: number;
+        (async function() {
+            v = await 1;
+        })();
+        v; // still undefined
+        ~
+!!! error TS2454: Variable 'v' is used before being assigned.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/controlFlowIIFE.js b/tests/baselines/reference/controlFlowIIFE.js
index 20bde01cba6..5c7fcb4bd52 100644
--- a/tests/baselines/reference/controlFlowIIFE.js
+++ b/tests/baselines/reference/controlFlowIIFE.js
@@ -44,34 +44,61 @@ if (!test) {
 }
 (() => {
     test.slice(1); // No error
-})();
+})();
+
+// Repro from #23565
+
+function f4() {
+    let v: number;
+    (function() {
+        v = 1;
+    })();
+    v;
+}
+
+function f5() {
+    let v: number;
+    (function*() {
+        yield 1;
+        v = 1;
+    })();
+    v; // still undefined
+}
+
+function f6() {
+    let v: number;
+    (async function() {
+        v = await 1;
+    })();
+    v; // still undefined
+}
 
 //// [controlFlowIIFE.js]
 function f1() {
-    var x = getStringOrNumber();
+    let x = getStringOrNumber();
     if (typeof x === "string") {
-        var n = function () {
+        let n = function () {
             return x.length;
         }();
     }
 }
 function f2() {
-    var x = getStringOrNumber();
+    let x = getStringOrNumber();
     if (typeof x === "string") {
-        var n = (function () {
+        let n = (function () {
             return x.length;
         })();
     }
 }
 function f3() {
-    var x = getStringOrNumber();
-    var y;
+    let x = getStringOrNumber();
+    let y;
     if (typeof x === "string") {
-        var n = (function (z) { return x.length + y + z; })(y = 1);
+        let n = (z => x.length + y + z)(y = 1);
     }
 }
 // Repros from #8381
-var maybeNumber;
+let maybeNumber;
 (function () {
     maybeNumber = 1;
 })();
@@ -79,10 +106,33 @@ maybeNumber++;
 if (maybeNumber !== undefined) {
     maybeNumber++;
 }
-var test;
+let test;
 if (!test) {
     throw new Error('Test is not defined');
 }
-(function () {
+(() => {
     test.slice(1); // No error
 })();
+// Repro from #23565
+function f4() {
+    let v;
+    (function () {
+        v = 1;
+    })();
+    v;
+}
+function f5() {
+    let v;
+    (function* () {
+        yield 1;
+        v = 1;
+    })();
+    v; // still undefined
+}
+function f6() {
+    let v;
+    (async function () {
+        v = await 1;
+    })();
+    v; // still undefined
+}
diff --git a/tests/baselines/reference/controlFlowIIFE.symbols b/tests/baselines/reference/controlFlowIIFE.symbols
index 4df906e0684..038d398c649 100644
--- a/tests/baselines/reference/controlFlowIIFE.symbols
+++ b/tests/baselines/reference/controlFlowIIFE.symbols
@@ -16,9 +16,9 @@ function f1() {
 >n : Symbol(n, Decl(controlFlowIIFE.ts, 5, 11))
 
             return x.length;
->x.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>x.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >x : Symbol(x, Decl(controlFlowIIFE.ts, 3, 7))
->length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 
         }();
     }
@@ -38,9 +38,9 @@ function f2() {
 >n : Symbol(n, Decl(controlFlowIIFE.ts, 14, 11))
 
             return x.length;
->x.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>x.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >x : Symbol(x, Decl(controlFlowIIFE.ts, 12, 7))
->length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 
         })();
     }
@@ -62,9 +62,9 @@ function f3() {
         let n = (z => x.length + y + z)(y = 1);
 >n : Symbol(n, Decl(controlFlowIIFE.ts, 24, 11))
 >z : Symbol(z, Decl(controlFlowIIFE.ts, 24, 17))
->x.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>x.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >x : Symbol(x, Decl(controlFlowIIFE.ts, 21, 7))
->length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >y : Symbol(y, Decl(controlFlowIIFE.ts, 22, 7))
 >z : Symbol(z, Decl(controlFlowIIFE.ts, 24, 17))
 >y : Symbol(y, Decl(controlFlowIIFE.ts, 22, 7))
@@ -99,12 +99,60 @@ if (!test) {
 >test : Symbol(test, Decl(controlFlowIIFE.ts, 39, 3))
 
     throw new Error('Test is not defined');
->Error : Symbol(Error, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 }
 (() => {
     test.slice(1); // No error
->test.slice : Symbol(String.slice, Decl(lib.d.ts, --, --))
+>test.slice : Symbol(String.slice, Decl(lib.es5.d.ts, --, --))
 >test : Symbol(test, Decl(controlFlowIIFE.ts, 39, 3))
->slice : Symbol(String.slice, Decl(lib.d.ts, --, --))
+>slice : Symbol(String.slice, Decl(lib.es5.d.ts, --, --))
 
 })();
+
+// Repro from #23565
+
+function f4() {
+>f4 : Symbol(f4, Decl(controlFlowIIFE.ts, 45, 5))
+
+    let v: number;
+>v : Symbol(v, Decl(controlFlowIIFE.ts, 50, 7))
+
+    (function() {
+        v = 1;
+>v : Symbol(v, Decl(controlFlowIIFE.ts, 50, 7))
+
+    })();
+    v;
+>v : Symbol(v, Decl(controlFlowIIFE.ts, 50, 7))
+}
+
+function f5() {
+>f5 : Symbol(f5, Decl(controlFlowIIFE.ts, 55, 1))
+
+    let v: number;
+>v : Symbol(v, Decl(controlFlowIIFE.ts, 58, 7))
+
+    (function*() {
+        yield 1;
+        v = 1;
+>v : Symbol(v, Decl(controlFlowIIFE.ts, 58, 7))
+
+    })();
+    v; // still undefined
+>v : Symbol(v, Decl(controlFlowIIFE.ts, 58, 7))
+}
+
+function f6() {
+>f6 : Symbol(f6, Decl(controlFlowIIFE.ts, 64, 1))
+
+    let v: number;
+>v : Symbol(v, Decl(controlFlowIIFE.ts, 67, 7))
+
+    (async function() {
+        v = await 1;
+>v : Symbol(v, Decl(controlFlowIIFE.ts, 67, 7))
+
+    })();
+    v; // still undefined
+>v : Symbol(v, Decl(controlFlowIIFE.ts, 67, 7))
+}
diff --git a/tests/baselines/reference/controlFlowIIFE.types b/tests/baselines/reference/controlFlowIIFE.types
index 1132649ae09..7aaaad159fc 100644
--- a/tests/baselines/reference/controlFlowIIFE.types
+++ b/tests/baselines/reference/controlFlowIIFE.types
@@ -150,3 +150,73 @@ if (!test) {
 >1 : 1
 
 })();
+
+// Repro from #23565
+
+function f4() {
+>f4 : () => void
+
+    let v: number;
+>v : number
+
+    (function() {
+>(function() {        v = 1;    })() : void
+>(function() {        v = 1;    }) : () => void
+>function() {        v = 1;    } : () => void
+
+        v = 1;
+>v = 1 : 1
+>v : number
+>1 : 1
+
+    })();
+    v;
+>v : number
+}
+
+function f5() {
+>f5 : () => void
+
+    let v: number;
+>v : number
+
+    (function*() {
+>(function*() {        yield 1;        v = 1;    })() : IterableIterator<number>
+>(function*() {        yield 1;        v = 1;    }) : () => IterableIterator<number>
+>function*() {        yield 1;        v = 1;    } : () => IterableIterator<number>
+
+        yield 1;
+>yield 1 : any
+>1 : 1
+
+        v = 1;
+>v = 1 : 1
+>v : number
+>1 : 1
+
+    })();
+    v; // still undefined
+>v : number
+}
+
+function f6() {
+>f6 : () => void
+
+    let v: number;
+>v : number
+
+    (async function() {
+>(async function() {        v = await 1;    })() : Promise<void>
+>(async function() {        v = await 1;    }) : () => Promise<void>
+>async function() {        v = await 1;    } : () => Promise<void>
+
+        v = await 1;
+>v = await 1 : 1
+>v : number
+>await 1 : 1
+>1 : 1
+
+    })();
+    v; // still undefined
+>v : number
+}
diff --git a/tests/baselines/reference/controlFlowPropertyDeclarations.types b/tests/baselines/reference/controlFlowPropertyDeclarations.types
index 286124ca346..0e698b72608 100644
--- a/tests/baselines/reference/controlFlowPropertyDeclarations.types
+++ b/tests/baselines/reference/controlFlowPropertyDeclarations.types
@@ -371,11 +371,11 @@ export class StyleParser {
       if (!this.styles.hasOwnProperty(key)) {
 >!this.styles.hasOwnProperty(key) : boolean
 >this.styles.hasOwnProperty(key) : boolean
->this.styles.hasOwnProperty : (v: string) => boolean
+>this.styles.hasOwnProperty : (v: string | number | symbol) => boolean
 >this.styles : {}
 >this : this
 >styles : {}
->hasOwnProperty : (v: string) => boolean
+>hasOwnProperty : (v: string | number | symbol) => boolean
 >key : string
       }
     }
diff --git a/tests/baselines/reference/createArray.errors.txt b/tests/baselines/reference/createArray.errors.txt
index 082e8dc03e2..84f93a727eb 100644
--- a/tests/baselines/reference/createArray.errors.txt
+++ b/tests/baselines/reference/createArray.errors.txt
@@ -1,35 +1,35 @@
 tests/cases/compiler/createArray.ts(1,12): error TS2693: 'number' only refers to a type, but is being used as a value here.
-tests/cases/compiler/createArray.ts(1,18): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
-tests/cases/compiler/createArray.ts(6,6): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+tests/cases/compiler/createArray.ts(1,19): error TS1011: An element access expression should take an argument.
+tests/cases/compiler/createArray.ts(6,7): error TS1011: An element access expression should take an argument.
 tests/cases/compiler/createArray.ts(7,12): error TS2693: 'boolean' only refers to a type, but is being used as a value here.
-tests/cases/compiler/createArray.ts(7,19): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+tests/cases/compiler/createArray.ts(7,20): error TS1011: An element access expression should take an argument.
 tests/cases/compiler/createArray.ts(8,12): error TS2693: 'string' only refers to a type, but is being used as a value here.
-tests/cases/compiler/createArray.ts(8,18): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+tests/cases/compiler/createArray.ts(8,19): error TS1011: An element access expression should take an argument.
 
 
 ==== tests/cases/compiler/createArray.ts (7 errors) ====
     var na=new number[];
                ~~~~~~
 !!! error TS2693: 'number' only refers to a type, but is being used as a value here.
-                     ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                      
+!!! error TS1011: An element access expression should take an argument.
     
     class C {
     }
     
     new C[];
-         ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+          
+!!! error TS1011: An element access expression should take an argument.
     var ba=new boolean[];
                ~~~~~~~
 !!! error TS2693: 'boolean' only refers to a type, but is being used as a value here.
-                      ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                       
+!!! error TS1011: An element access expression should take an argument.
     var sa=new string[];
                ~~~~~~
 !!! error TS2693: 'string' only refers to a type, but is being used as a value here.
-                     ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                      
+!!! error TS1011: An element access expression should take an argument.
     function f(s:string):number { return 0;
     }
     if (ba[14]) {
diff --git a/tests/baselines/reference/createArray.types b/tests/baselines/reference/createArray.types
index b7c9ada8068..8d140f3e3d8 100644
--- a/tests/baselines/reference/createArray.types
+++ b/tests/baselines/reference/createArray.types
@@ -4,6 +4,7 @@ var na=new number[];
 >new number[] : any
 >number[] : any
 >number : any
+> : any
 
 class C {
 >C : C
@@ -13,18 +14,21 @@ new C[];
 >new C[] : any
 >C[] : any
 >C : typeof C
+> : any
 
 var ba=new boolean[];
 >ba : any
 >new boolean[] : any
 >boolean[] : any
 >boolean : any
+> : any
 
 var sa=new string[];
 >sa : any
 >new string[] : any
 >string[] : any
 >string : any
+> : any
 
 function f(s:string):number { return 0;
 >f : (s: string) => number
diff --git a/tests/baselines/reference/decoratorOnClassMethodParameter1.es6.symbols b/tests/baselines/reference/decoratorOnClassMethodParameter1.es6.symbols
index aee56f5a4f8..e33f0e8f7b9 100644
--- a/tests/baselines/reference/decoratorOnClassMethodParameter1.es6.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethodParameter1.es6.symbols
@@ -2,7 +2,7 @@
 declare function dec(target: Object, propertyKey: string | symbol, parameterIndex: number): void;
 >dec : Symbol(dec, Decl(decoratorOnClassMethodParameter1.es6.ts, 0, 0))
 >target : Symbol(target, Decl(decoratorOnClassMethodParameter1.es6.ts, 0, 21))
->Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >propertyKey : Symbol(propertyKey, Decl(decoratorOnClassMethodParameter1.es6.ts, 0, 36))
 >parameterIndex : Symbol(parameterIndex, Decl(decoratorOnClassMethodParameter1.es6.ts, 0, 66))
 
diff --git a/tests/baselines/reference/decoratorsOnComputedProperties.symbols b/tests/baselines/reference/decoratorsOnComputedProperties.symbols
index 65652b4524e..dc069f22c56 100644
--- a/tests/baselines/reference/decoratorsOnComputedProperties.symbols
+++ b/tests/baselines/reference/decoratorsOnComputedProperties.symbols
@@ -3,7 +3,7 @@ function x(o: object, k: PropertyKey) { }
 >x : Symbol(x, Decl(decoratorsOnComputedProperties.ts, 0, 0))
 >o : Symbol(o, Decl(decoratorsOnComputedProperties.ts, 0, 11))
 >k : Symbol(k, Decl(decoratorsOnComputedProperties.ts, 0, 21))
->PropertyKey : Symbol(PropertyKey, Decl(lib.es2015.core.d.ts, --, --))
+>PropertyKey : Symbol(PropertyKey, Decl(lib.es5.d.ts, --, --))
 
 let i = 0;
 >i : Symbol(i, Decl(decoratorsOnComputedProperties.ts, 1, 3))
diff --git a/tests/baselines/reference/decoratorsOnComputedProperties.types b/tests/baselines/reference/decoratorsOnComputedProperties.types
index 24ed343c298..efbf9c5d263 100644
--- a/tests/baselines/reference/decoratorsOnComputedProperties.types
+++ b/tests/baselines/reference/decoratorsOnComputedProperties.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/decoratorsOnComputedProperties.ts ===
 function x(o: object, k: PropertyKey) { }
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >o : object
->k : PropertyKey
->PropertyKey : PropertyKey
+>k : string | number | symbol
+>PropertyKey : string | number | symbol
 
 let i = 0;
 >i : number
@@ -32,25 +32,25 @@ class A {
 >A : A
 
     @x ["property"]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >["property"] : any
 >"property" : "property"
 
     @x [Symbol.toStringTag]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[Symbol.toStringTag] : any
 >Symbol.toStringTag : symbol
 >Symbol : SymbolConstructor
 >toStringTag : symbol
 
     @x ["property2"]: any = 2;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >["property2"] : any
 >"property2" : "property2"
 >2 : 2
 
     @x [Symbol.iterator]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[Symbol.iterator] : any
 >Symbol.iterator : symbol
 >Symbol : SymbolConstructor
@@ -85,13 +85,13 @@ class A {
 >foo : () => string
 
     @x [foo()]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[foo()] : any
 >foo() : string
 >foo : () => string
 
     @x [foo()]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[foo()] : any
 >foo() : string
 >foo : () => string
@@ -102,12 +102,12 @@ class A {
 >fieldNameA : string
 
     @x [fieldNameB]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[fieldNameB] : any
 >fieldNameB : string
 
     @x [fieldNameC]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[fieldNameC] : any
 >fieldNameC : string
 >null : null
@@ -119,25 +119,25 @@ void class B {
 >B : typeof B
 
     @x ["property"]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >["property"] : any
 >"property" : "property"
 
     @x [Symbol.toStringTag]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[Symbol.toStringTag] : any
 >Symbol.toStringTag : symbol
 >Symbol : SymbolConstructor
 >toStringTag : symbol
 
     @x ["property2"]: any = 2;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >["property2"] : any
 >"property2" : "property2"
 >2 : 2
 
     @x [Symbol.iterator]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[Symbol.iterator] : any
 >Symbol.iterator : symbol
 >Symbol : SymbolConstructor
@@ -172,13 +172,13 @@ void class B {
 >foo : () => string
 
     @x [foo()]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[foo()] : any
 >foo() : string
 >foo : () => string
 
     @x [foo()]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[foo()] : any
 >foo() : string
 >foo : () => string
@@ -189,12 +189,12 @@ void class B {
 >fieldNameA : string
 
     @x [fieldNameB]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[fieldNameB] : any
 >fieldNameB : string
 
     @x [fieldNameC]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[fieldNameC] : any
 >fieldNameC : string
 >null : null
@@ -205,25 +205,25 @@ class C {
 >C : C
 
     @x ["property"]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >["property"] : any
 >"property" : "property"
 
     @x [Symbol.toStringTag]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[Symbol.toStringTag] : any
 >Symbol.toStringTag : symbol
 >Symbol : SymbolConstructor
 >toStringTag : symbol
 
     @x ["property2"]: any = 2;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >["property2"] : any
 >"property2" : "property2"
 >2 : 2
 
     @x [Symbol.iterator]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[Symbol.iterator] : any
 >Symbol.iterator : symbol
 >Symbol : SymbolConstructor
@@ -258,13 +258,13 @@ class C {
 >foo : () => string
 
     @x [foo()]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[foo()] : any
 >foo() : string
 >foo : () => string
 
     @x [foo()]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[foo()] : any
 >foo() : string
 >foo : () => string
@@ -275,12 +275,12 @@ class C {
 >fieldNameA : string
 
     @x [fieldNameB]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[fieldNameB] : any
 >fieldNameB : string
 
     @x [fieldNameC]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[fieldNameC] : any
 >fieldNameC : string
 >null : null
@@ -298,25 +298,25 @@ void class D {
 >D : typeof D
 
     @x ["property"]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >["property"] : any
 >"property" : "property"
 
     @x [Symbol.toStringTag]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[Symbol.toStringTag] : any
 >Symbol.toStringTag : symbol
 >Symbol : SymbolConstructor
 >toStringTag : symbol
 
     @x ["property2"]: any = 2;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >["property2"] : any
 >"property2" : "property2"
 >2 : 2
 
     @x [Symbol.iterator]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[Symbol.iterator] : any
 >Symbol.iterator : symbol
 >Symbol : SymbolConstructor
@@ -351,13 +351,13 @@ void class D {
 >foo : () => string
 
     @x [foo()]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[foo()] : any
 >foo() : string
 >foo : () => string
 
     @x [foo()]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[foo()] : any
 >foo() : string
 >foo : () => string
@@ -368,12 +368,12 @@ void class D {
 >fieldNameA : string
 
     @x [fieldNameB]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[fieldNameB] : any
 >fieldNameB : string
 
     @x [fieldNameC]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[fieldNameC] : any
 >fieldNameC : string
 >null : null
@@ -390,25 +390,25 @@ class E {
 >E : E
 
     @x ["property"]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >["property"] : any
 >"property" : "property"
 
     @x [Symbol.toStringTag]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[Symbol.toStringTag] : any
 >Symbol.toStringTag : symbol
 >Symbol : SymbolConstructor
 >toStringTag : symbol
 
     @x ["property2"]: any = 2;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >["property2"] : any
 >"property2" : "property2"
 >2 : 2
 
     @x [Symbol.iterator]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[Symbol.iterator] : any
 >Symbol.iterator : symbol
 >Symbol : SymbolConstructor
@@ -443,13 +443,13 @@ class E {
 >foo : () => string
 
     @x [foo()]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[foo()] : any
 >foo() : string
 >foo : () => string
 
     @x [foo()]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[foo()] : any
 >foo() : string
 >foo : () => string
@@ -466,12 +466,12 @@ class E {
 >fieldNameA : string
 
     @x [fieldNameB]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[fieldNameB] : any
 >fieldNameB : string
 
     @x [fieldNameC]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[fieldNameC] : any
 >fieldNameC : string
 >null : null
@@ -483,25 +483,25 @@ void class F {
 >F : typeof F
 
     @x ["property"]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >["property"] : any
 >"property" : "property"
 
     @x [Symbol.toStringTag]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[Symbol.toStringTag] : any
 >Symbol.toStringTag : symbol
 >Symbol : SymbolConstructor
 >toStringTag : symbol
 
     @x ["property2"]: any = 2;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >["property2"] : any
 >"property2" : "property2"
 >2 : 2
 
     @x [Symbol.iterator]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[Symbol.iterator] : any
 >Symbol.iterator : symbol
 >Symbol : SymbolConstructor
@@ -536,13 +536,13 @@ void class F {
 >foo : () => string
 
     @x [foo()]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[foo()] : any
 >foo() : string
 >foo : () => string
 
     @x [foo()]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[foo()] : any
 >foo() : string
 >foo : () => string
@@ -559,12 +559,12 @@ void class F {
 >fieldNameA : string
 
     @x [fieldNameB]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[fieldNameB] : any
 >fieldNameB : string
 
     @x [fieldNameC]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[fieldNameC] : any
 >fieldNameC : string
 >null : null
@@ -575,25 +575,25 @@ class G {
 >G : G
 
     @x ["property"]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >["property"] : any
 >"property" : "property"
 
     @x [Symbol.toStringTag]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[Symbol.toStringTag] : any
 >Symbol.toStringTag : symbol
 >Symbol : SymbolConstructor
 >toStringTag : symbol
 
     @x ["property2"]: any = 2;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >["property2"] : any
 >"property2" : "property2"
 >2 : 2
 
     @x [Symbol.iterator]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[Symbol.iterator] : any
 >Symbol.iterator : symbol
 >Symbol : SymbolConstructor
@@ -628,13 +628,13 @@ class G {
 >foo : () => string
 
     @x [foo()]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[foo()] : any
 >foo() : string
 >foo : () => string
 
     @x [foo()]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[foo()] : any
 >foo() : string
 >foo : () => string
@@ -651,7 +651,7 @@ class G {
 >fieldNameA : string
 
     @x [fieldNameB]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[fieldNameB] : any
 >fieldNameB : string
 
@@ -662,7 +662,7 @@ class G {
 >"method2" : "method2"
 
     @x [fieldNameC]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[fieldNameC] : any
 >fieldNameC : string
 >null : null
@@ -674,25 +674,25 @@ void class H {
 >H : typeof H
 
     @x ["property"]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >["property"] : any
 >"property" : "property"
 
     @x [Symbol.toStringTag]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[Symbol.toStringTag] : any
 >Symbol.toStringTag : symbol
 >Symbol : SymbolConstructor
 >toStringTag : symbol
 
     @x ["property2"]: any = 2;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >["property2"] : any
 >"property2" : "property2"
 >2 : 2
 
     @x [Symbol.iterator]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[Symbol.iterator] : any
 >Symbol.iterator : symbol
 >Symbol : SymbolConstructor
@@ -727,13 +727,13 @@ void class H {
 >foo : () => string
 
     @x [foo()]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[foo()] : any
 >foo() : string
 >foo : () => string
 
     @x [foo()]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[foo()] : any
 >foo() : string
 >foo : () => string
@@ -750,7 +750,7 @@ void class H {
 >fieldNameA : string
 
     @x [fieldNameB]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[fieldNameB] : any
 >fieldNameB : string
 
@@ -761,7 +761,7 @@ void class H {
 >"method2" : "method2"
 
     @x [fieldNameC]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[fieldNameC] : any
 >fieldNameC : string
 >null : null
@@ -772,25 +772,25 @@ class I {
 >I : I
 
     @x ["property"]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >["property"] : any
 >"property" : "property"
 
     @x [Symbol.toStringTag]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[Symbol.toStringTag] : any
 >Symbol.toStringTag : symbol
 >Symbol : SymbolConstructor
 >toStringTag : symbol
 
     @x ["property2"]: any = 2;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >["property2"] : any
 >"property2" : "property2"
 >2 : 2
 
     @x [Symbol.iterator]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[Symbol.iterator] : any
 >Symbol.iterator : symbol
 >Symbol : SymbolConstructor
@@ -825,20 +825,20 @@ class I {
 >foo : () => string
 
     @x [foo()]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[foo()] : any
 >foo() : string
 >foo : () => string
 
     @x [foo()]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[foo()] : any
 >foo() : string
 >foo : () => string
 >null : null
 
     @x ["some" + "method"]() {}
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >["some" + "method"] : () => void
 >"some" + "method" : string
 >"some" : "some"
@@ -849,7 +849,7 @@ class I {
 >fieldNameA : string
 
     @x [fieldNameB]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[fieldNameB] : any
 >fieldNameB : string
 
@@ -860,7 +860,7 @@ class I {
 >"method2" : "method2"
 
     @x [fieldNameC]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[fieldNameC] : any
 >fieldNameC : string
 >null : null
@@ -872,25 +872,25 @@ void class J {
 >J : typeof J
 
     @x ["property"]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >["property"] : any
 >"property" : "property"
 
     @x [Symbol.toStringTag]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[Symbol.toStringTag] : any
 >Symbol.toStringTag : symbol
 >Symbol : SymbolConstructor
 >toStringTag : symbol
 
     @x ["property2"]: any = 2;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >["property2"] : any
 >"property2" : "property2"
 >2 : 2
 
     @x [Symbol.iterator]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[Symbol.iterator] : any
 >Symbol.iterator : symbol
 >Symbol : SymbolConstructor
@@ -925,20 +925,20 @@ void class J {
 >foo : () => string
 
     @x [foo()]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[foo()] : any
 >foo() : string
 >foo : () => string
 
     @x [foo()]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[foo()] : any
 >foo() : string
 >foo : () => string
 >null : null
 
     @x ["some" + "method"]() {}
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >["some" + "method"] : () => void
 >"some" + "method" : string
 >"some" : "some"
@@ -949,7 +949,7 @@ void class J {
 >fieldNameA : string
 
     @x [fieldNameB]: any;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[fieldNameB] : any
 >fieldNameB : string
 
@@ -960,7 +960,7 @@ void class J {
 >"method2" : "method2"
 
     @x [fieldNameC]: any = null;
->x : (o: object, k: PropertyKey) => void
+>x : (o: object, k: string | number | symbol) => void
 >[fieldNameC] : any
 >fieldNameC : string
 >null : null
diff --git a/tests/baselines/reference/deeplyNestedCheck.js b/tests/baselines/reference/deeplyNestedCheck.js
index 466ae94f12d..ccd234e2580 100644
--- a/tests/baselines/reference/deeplyNestedCheck.js
+++ b/tests/baselines/reference/deeplyNestedCheck.js
@@ -6,7 +6,7 @@ interface DataSnapshot<X = {}> {
 }
 
 interface Snapshot<T> extends DataSnapshot {
-  child<U extends keyof T>(path: U): Snapshot<T[U]>;
+  child<U extends Extract<keyof T, string>>(path: U): Snapshot<T[U]>;
 }
 
 
diff --git a/tests/baselines/reference/deeplyNestedCheck.symbols b/tests/baselines/reference/deeplyNestedCheck.symbols
index a8b5af60880..80c531cd6d0 100644
--- a/tests/baselines/reference/deeplyNestedCheck.symbols
+++ b/tests/baselines/reference/deeplyNestedCheck.symbols
@@ -16,11 +16,12 @@ interface Snapshot<T> extends DataSnapshot {
 >T : Symbol(T, Decl(deeplyNestedCheck.ts, 6, 19))
 >DataSnapshot : Symbol(DataSnapshot, Decl(deeplyNestedCheck.ts, 0, 0))
 
-  child<U extends keyof T>(path: U): Snapshot<T[U]>;
+  child<U extends Extract<keyof T, string>>(path: U): Snapshot<T[U]>;
 >child : Symbol(Snapshot.child, Decl(deeplyNestedCheck.ts, 6, 44))
 >U : Symbol(U, Decl(deeplyNestedCheck.ts, 7, 8))
+>Extract : Symbol(Extract, Decl(lib.d.ts, --, --))
 >T : Symbol(T, Decl(deeplyNestedCheck.ts, 6, 19))
->path : Symbol(path, Decl(deeplyNestedCheck.ts, 7, 27))
+>path : Symbol(path, Decl(deeplyNestedCheck.ts, 7, 44))
 >U : Symbol(U, Decl(deeplyNestedCheck.ts, 7, 8))
 >Snapshot : Symbol(Snapshot, Decl(deeplyNestedCheck.ts, 4, 1))
 >T : Symbol(T, Decl(deeplyNestedCheck.ts, 6, 19))
diff --git a/tests/baselines/reference/deeplyNestedCheck.types b/tests/baselines/reference/deeplyNestedCheck.types
index e500fc75ed1..dc8550bc2cb 100644
--- a/tests/baselines/reference/deeplyNestedCheck.types
+++ b/tests/baselines/reference/deeplyNestedCheck.types
@@ -16,9 +16,10 @@ interface Snapshot<T> extends DataSnapshot {
 >T : T
 >DataSnapshot : DataSnapshot<X>
 
-  child<U extends keyof T>(path: U): Snapshot<T[U]>;
->child : <U extends keyof T>(path: U) => Snapshot<T[U]>
+  child<U extends Extract<keyof T, string>>(path: U): Snapshot<T[U]>;
+>child : <U extends Extract<keyof T, string>>(path: U) => Snapshot<T[U]>
 >U : U
+>Extract : Extract<T, U>
 >T : T
 >path : U
 >U : U
diff --git a/tests/baselines/reference/deferredLookupTypeResolution.js b/tests/baselines/reference/deferredLookupTypeResolution.js
index e5baa6891e8..126f9d1345a 100644
--- a/tests/baselines/reference/deferredLookupTypeResolution.js
+++ b/tests/baselines/reference/deferredLookupTypeResolution.js
@@ -6,7 +6,7 @@ type StringContains<S extends string, L extends string> = (
     { [key: string]: 'false' }
   )[L]
 
-type ObjectHasKey<O, L extends string> = StringContains<keyof O, L>
+type ObjectHasKey<O, L extends string> = StringContains<Extract<keyof O, string>, L>
 
 type First<T> = ObjectHasKey<T, '0'>;  // Should be deferred
 
@@ -43,7 +43,7 @@ declare type StringContains<S extends string, L extends string> = ({
 } & {
     [key: string]: 'false';
 })[L];
-declare type ObjectHasKey<O, L extends string> = StringContains<keyof O, L>;
+declare type ObjectHasKey<O, L extends string> = StringContains<Extract<keyof O, string>, L>;
 declare type First<T> = ObjectHasKey<T, '0'>;
 declare type T1 = ObjectHasKey<{
     a: string;
diff --git a/tests/baselines/reference/deferredLookupTypeResolution.symbols b/tests/baselines/reference/deferredLookupTypeResolution.symbols
index 022dc3cc2f4..29906ac6ae1 100644
--- a/tests/baselines/reference/deferredLookupTypeResolution.symbols
+++ b/tests/baselines/reference/deferredLookupTypeResolution.symbols
@@ -16,16 +16,17 @@ type StringContains<S extends string, L extends string> = (
   )[L]
 >L : Symbol(L, Decl(deferredLookupTypeResolution.ts, 2, 37))
 
-type ObjectHasKey<O, L extends string> = StringContains<keyof O, L>
+type ObjectHasKey<O, L extends string> = StringContains<Extract<keyof O, string>, L>
 >ObjectHasKey : Symbol(ObjectHasKey, Decl(deferredLookupTypeResolution.ts, 5, 6))
 >O : Symbol(O, Decl(deferredLookupTypeResolution.ts, 7, 18))
 >L : Symbol(L, Decl(deferredLookupTypeResolution.ts, 7, 20))
 >StringContains : Symbol(StringContains, Decl(deferredLookupTypeResolution.ts, 0, 0))
+>Extract : Symbol(Extract, Decl(lib.d.ts, --, --))
 >O : Symbol(O, Decl(deferredLookupTypeResolution.ts, 7, 18))
 >L : Symbol(L, Decl(deferredLookupTypeResolution.ts, 7, 20))
 
 type First<T> = ObjectHasKey<T, '0'>;  // Should be deferred
->First : Symbol(First, Decl(deferredLookupTypeResolution.ts, 7, 67))
+>First : Symbol(First, Decl(deferredLookupTypeResolution.ts, 7, 84))
 >T : Symbol(T, Decl(deferredLookupTypeResolution.ts, 9, 11))
 >ObjectHasKey : Symbol(ObjectHasKey, Decl(deferredLookupTypeResolution.ts, 5, 6))
 >T : Symbol(T, Decl(deferredLookupTypeResolution.ts, 9, 11))
diff --git a/tests/baselines/reference/deferredLookupTypeResolution.types b/tests/baselines/reference/deferredLookupTypeResolution.types
index cd123a6019e..4826b03329a 100644
--- a/tests/baselines/reference/deferredLookupTypeResolution.types
+++ b/tests/baselines/reference/deferredLookupTypeResolution.types
@@ -16,28 +16,29 @@ type StringContains<S extends string, L extends string> = (
   )[L]
 >L : L
 
-type ObjectHasKey<O, L extends string> = StringContains<keyof O, L>
->ObjectHasKey : ({ [K in keyof O]: "true"; } & { [key: string]: "false"; })[L]
+type ObjectHasKey<O, L extends string> = StringContains<Extract<keyof O, string>, L>
+>ObjectHasKey : ({ [K in Extract<keyof O, string>]: "true"; } & { [key: string]: "false"; })[L]
 >O : O
 >L : L
 >StringContains : ({ [K in S]: "true"; } & { [key: string]: "false"; })[L]
+>Extract : Extract<T, U>
 >O : O
 >L : L
 
 type First<T> = ObjectHasKey<T, '0'>;  // Should be deferred
->First : ({ [K in keyof T]: "true"; } & { [key: string]: "false"; })["0"]
+>First : ({ [K in Extract<keyof T, string>]: "true"; } & { [key: string]: "false"; })["0"]
 >T : T
->ObjectHasKey : ({ [K in keyof O]: "true"; } & { [key: string]: "false"; })[L]
+>ObjectHasKey : ({ [K in Extract<keyof O, string>]: "true"; } & { [key: string]: "false"; })[L]
 >T : T
 
 type T1 = ObjectHasKey<{ a: string }, 'a'>;  // 'true'
 >T1 : "true"
->ObjectHasKey : ({ [K in keyof O]: "true"; } & { [key: string]: "false"; })[L]
+>ObjectHasKey : ({ [K in Extract<keyof O, string>]: "true"; } & { [key: string]: "false"; })[L]
 >a : string
 
 type T2 = ObjectHasKey<{ a: string }, 'b'>;  // 'false'
 >T2 : "false"
->ObjectHasKey : ({ [K in keyof O]: "true"; } & { [key: string]: "false"; })[L]
+>ObjectHasKey : ({ [K in Extract<keyof O, string>]: "true"; } & { [key: string]: "false"; })[L]
 >a : string
 
 // Verify that mapped type isn't eagerly resolved in type-to-string operation
diff --git a/tests/baselines/reference/deferredLookupTypeResolution2.errors.txt b/tests/baselines/reference/deferredLookupTypeResolution2.errors.txt
index 6d1d579c0ad..88bcd2c4340 100644
--- a/tests/baselines/reference/deferredLookupTypeResolution2.errors.txt
+++ b/tests/baselines/reference/deferredLookupTypeResolution2.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/compiler/deferredLookupTypeResolution2.ts(14,13): error TS2536: Type '({ [K in keyof T]: "true"; } & { [key: string]: "false"; })["1"]' cannot be used to index type '{ true: "true"; }'.
-tests/cases/compiler/deferredLookupTypeResolution2.ts(19,21): error TS2536: Type '({ true: "otherwise"; } & { [k: string]: "true"; })[({ [K in keyof T]: "true"; } & { [key: string]: "false"; })["1"]]' cannot be used to index type '{ true: "true"; }'.
+tests/cases/compiler/deferredLookupTypeResolution2.ts(14,13): error TS2536: Type '({ [K in Extract<keyof T, string>]: "true"; } & { [key: string]: "false"; })["1"]' cannot be used to index type '{ true: "true"; }'.
+tests/cases/compiler/deferredLookupTypeResolution2.ts(19,21): error TS2536: Type '({ true: "otherwise"; } & { [k: string]: "true"; })[({ [K in Extract<keyof T, string>]: "true"; } & { [key: string]: "false"; })["1"]]' cannot be used to index type '{ true: "true"; }'.
 
 
 ==== tests/cases/compiler/deferredLookupTypeResolution2.ts (2 errors) ====
@@ -7,7 +7,7 @@ tests/cases/compiler/deferredLookupTypeResolution2.ts(19,21): error TS2536: Type
     
     type StringContains<S extends string, L extends string> = ({ [K in S]: 'true' } & { [key: string]: 'false'})[L];
     
-    type ObjectHasKey<O, L extends string> = StringContains<keyof O, L>;
+    type ObjectHasKey<O, L extends string> = StringContains<Extract<keyof O, string>, L>;
     
     type A<T> = ObjectHasKey<T, '0'>;
     
@@ -18,14 +18,14 @@ tests/cases/compiler/deferredLookupTypeResolution2.ts(19,21): error TS2536: Type
     // Error, "false" not handled
     type E<T> = { true: 'true' }[ObjectHasKey<T, '1'>];
                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2536: Type '({ [K in keyof T]: "true"; } & { [key: string]: "false"; })["1"]' cannot be used to index type '{ true: "true"; }'.
+!!! error TS2536: Type '({ [K in Extract<keyof T, string>]: "true"; } & { [key: string]: "false"; })["1"]' cannot be used to index type '{ true: "true"; }'.
     
     type Juxtapose<T> = ({ true: 'otherwise' } & { [k: string]: 'true' })[ObjectHasKey<T, '1'>];
     
     // Error, "otherwise" is missing
     type DeepError<T> = { true: 'true' }[Juxtapose<T>];
                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2536: Type '({ true: "otherwise"; } & { [k: string]: "true"; })[({ [K in keyof T]: "true"; } & { [key: string]: "false"; })["1"]]' cannot be used to index type '{ true: "true"; }'.
+!!! error TS2536: Type '({ true: "otherwise"; } & { [k: string]: "true"; })[({ [K in Extract<keyof T, string>]: "true"; } & { [key: string]: "false"; })["1"]]' cannot be used to index type '{ true: "true"; }'.
     
     type DeepOK<T> = { true: 'true', otherwise: 'false' }[Juxtapose<T>];
     
\ No newline at end of file
diff --git a/tests/baselines/reference/deferredLookupTypeResolution2.js b/tests/baselines/reference/deferredLookupTypeResolution2.js
index 97289f47f9c..3d40dcb4bbf 100644
--- a/tests/baselines/reference/deferredLookupTypeResolution2.js
+++ b/tests/baselines/reference/deferredLookupTypeResolution2.js
@@ -3,7 +3,7 @@
 
 type StringContains<S extends string, L extends string> = ({ [K in S]: 'true' } & { [key: string]: 'false'})[L];
 
-type ObjectHasKey<O, L extends string> = StringContains<keyof O, L>;
+type ObjectHasKey<O, L extends string> = StringContains<Extract<keyof O, string>, L>;
 
 type A<T> = ObjectHasKey<T, '0'>;
 
@@ -33,7 +33,7 @@ declare type StringContains<S extends string, L extends string> = ({
 } & {
     [key: string]: 'false';
 })[L];
-declare type ObjectHasKey<O, L extends string> = StringContains<keyof O, L>;
+declare type ObjectHasKey<O, L extends string> = StringContains<Extract<keyof O, string>, L>;
 declare type A<T> = ObjectHasKey<T, '0'>;
 declare type B = ObjectHasKey<[string, number], '1'>;
 declare type C = ObjectHasKey<[string, number], '2'>;
diff --git a/tests/baselines/reference/deferredLookupTypeResolution2.symbols b/tests/baselines/reference/deferredLookupTypeResolution2.symbols
index ca55b3e407e..41064fae533 100644
--- a/tests/baselines/reference/deferredLookupTypeResolution2.symbols
+++ b/tests/baselines/reference/deferredLookupTypeResolution2.symbols
@@ -10,16 +10,17 @@ type StringContains<S extends string, L extends string> = ({ [K in S]: 'true' }
 >key : Symbol(key, Decl(deferredLookupTypeResolution2.ts, 2, 85))
 >L : Symbol(L, Decl(deferredLookupTypeResolution2.ts, 2, 37))
 
-type ObjectHasKey<O, L extends string> = StringContains<keyof O, L>;
+type ObjectHasKey<O, L extends string> = StringContains<Extract<keyof O, string>, L>;
 >ObjectHasKey : Symbol(ObjectHasKey, Decl(deferredLookupTypeResolution2.ts, 2, 112))
 >O : Symbol(O, Decl(deferredLookupTypeResolution2.ts, 4, 18))
 >L : Symbol(L, Decl(deferredLookupTypeResolution2.ts, 4, 20))
 >StringContains : Symbol(StringContains, Decl(deferredLookupTypeResolution2.ts, 0, 0))
+>Extract : Symbol(Extract, Decl(lib.d.ts, --, --))
 >O : Symbol(O, Decl(deferredLookupTypeResolution2.ts, 4, 18))
 >L : Symbol(L, Decl(deferredLookupTypeResolution2.ts, 4, 20))
 
 type A<T> = ObjectHasKey<T, '0'>;
->A : Symbol(A, Decl(deferredLookupTypeResolution2.ts, 4, 68))
+>A : Symbol(A, Decl(deferredLookupTypeResolution2.ts, 4, 85))
 >T : Symbol(T, Decl(deferredLookupTypeResolution2.ts, 6, 7))
 >ObjectHasKey : Symbol(ObjectHasKey, Decl(deferredLookupTypeResolution2.ts, 2, 112))
 >T : Symbol(T, Decl(deferredLookupTypeResolution2.ts, 6, 7))
@@ -34,7 +35,7 @@ type C = ObjectHasKey<[string, number], '2'>;  // "false"
 
 type D = A<[string]>;  // "true"
 >D : Symbol(D, Decl(deferredLookupTypeResolution2.ts, 9, 45))
->A : Symbol(A, Decl(deferredLookupTypeResolution2.ts, 4, 68))
+>A : Symbol(A, Decl(deferredLookupTypeResolution2.ts, 4, 85))
 
 // Error, "false" not handled
 type E<T> = { true: 'true' }[ObjectHasKey<T, '1'>];
diff --git a/tests/baselines/reference/deferredLookupTypeResolution2.types b/tests/baselines/reference/deferredLookupTypeResolution2.types
index 76354731097..88994722a2e 100644
--- a/tests/baselines/reference/deferredLookupTypeResolution2.types
+++ b/tests/baselines/reference/deferredLookupTypeResolution2.types
@@ -10,61 +10,62 @@ type StringContains<S extends string, L extends string> = ({ [K in S]: 'true' }
 >key : string
 >L : L
 
-type ObjectHasKey<O, L extends string> = StringContains<keyof O, L>;
->ObjectHasKey : ({ [K in keyof O]: "true"; } & { [key: string]: "false"; })[L]
+type ObjectHasKey<O, L extends string> = StringContains<Extract<keyof O, string>, L>;
+>ObjectHasKey : ({ [K in Extract<keyof O, string>]: "true"; } & { [key: string]: "false"; })[L]
 >O : O
 >L : L
 >StringContains : ({ [K in S]: "true"; } & { [key: string]: "false"; })[L]
+>Extract : Extract<T, U>
 >O : O
 >L : L
 
 type A<T> = ObjectHasKey<T, '0'>;
->A : ({ [K in keyof T]: "true"; } & { [key: string]: "false"; })["0"]
+>A : ({ [K in Extract<keyof T, string>]: "true"; } & { [key: string]: "false"; })["0"]
 >T : T
->ObjectHasKey : ({ [K in keyof O]: "true"; } & { [key: string]: "false"; })[L]
+>ObjectHasKey : ({ [K in Extract<keyof O, string>]: "true"; } & { [key: string]: "false"; })[L]
 >T : T
 
 type B = ObjectHasKey<[string, number], '1'>;  // "true"
 >B : "true"
->ObjectHasKey : ({ [K in keyof O]: "true"; } & { [key: string]: "false"; })[L]
+>ObjectHasKey : ({ [K in Extract<keyof O, string>]: "true"; } & { [key: string]: "false"; })[L]
 
 type C = ObjectHasKey<[string, number], '2'>;  // "false"
 >C : "false"
->ObjectHasKey : ({ [K in keyof O]: "true"; } & { [key: string]: "false"; })[L]
+>ObjectHasKey : ({ [K in Extract<keyof O, string>]: "true"; } & { [key: string]: "false"; })[L]
 
 type D = A<[string]>;  // "true"
 >D : "true"
->A : ({ [K in keyof T]: "true"; } & { [key: string]: "false"; })["0"]
+>A : ({ [K in Extract<keyof T, string>]: "true"; } & { [key: string]: "false"; })["0"]
 
 // Error, "false" not handled
 type E<T> = { true: 'true' }[ObjectHasKey<T, '1'>];
->E : { true: "true"; }[({ [K in keyof T]: "true"; } & { [key: string]: "false"; })["1"]]
+>E : { true: "true"; }[({ [K in Extract<keyof T, string>]: "true"; } & { [key: string]: "false"; })["1"]]
 >T : T
 >true : "true"
->ObjectHasKey : ({ [K in keyof O]: "true"; } & { [key: string]: "false"; })[L]
+>ObjectHasKey : ({ [K in Extract<keyof O, string>]: "true"; } & { [key: string]: "false"; })[L]
 >T : T
 
 type Juxtapose<T> = ({ true: 'otherwise' } & { [k: string]: 'true' })[ObjectHasKey<T, '1'>];
->Juxtapose : ({ true: "otherwise"; } & { [k: string]: "true"; })[({ [K in keyof T]: "true"; } & { [key: string]: "false"; })["1"]]
+>Juxtapose : ({ true: "otherwise"; } & { [k: string]: "true"; })[({ [K in Extract<keyof T, string>]: "true"; } & { [key: string]: "false"; })["1"]]
 >T : T
 >true : "otherwise"
 >k : string
->ObjectHasKey : ({ [K in keyof O]: "true"; } & { [key: string]: "false"; })[L]
+>ObjectHasKey : ({ [K in Extract<keyof O, string>]: "true"; } & { [key: string]: "false"; })[L]
 >T : T
 
 // Error, "otherwise" is missing
 type DeepError<T> = { true: 'true' }[Juxtapose<T>];
->DeepError : { true: "true"; }[({ true: "otherwise"; } & { [k: string]: "true"; })[({ [K in keyof T]: "true"; } & { [key: string]: "false"; })["1"]]]
+>DeepError : { true: "true"; }[({ true: "otherwise"; } & { [k: string]: "true"; })[({ [K in Extract<keyof T, string>]: "true"; } & { [key: string]: "false"; })["1"]]]
 >T : T
 >true : "true"
->Juxtapose : ({ true: "otherwise"; } & { [k: string]: "true"; })[({ [K in keyof T]: "true"; } & { [key: string]: "false"; })["1"]]
+>Juxtapose : ({ true: "otherwise"; } & { [k: string]: "true"; })[({ [K in Extract<keyof T, string>]: "true"; } & { [key: string]: "false"; })["1"]]
 >T : T
 
 type DeepOK<T> = { true: 'true', otherwise: 'false' }[Juxtapose<T>];
->DeepOK : { true: "true"; otherwise: "false"; }[({ true: "otherwise"; } & { [k: string]: "true"; })[({ [K in keyof T]: "true"; } & { [key: string]: "false"; })["1"]]]
+>DeepOK : { true: "true"; otherwise: "false"; }[({ true: "otherwise"; } & { [k: string]: "true"; })[({ [K in Extract<keyof T, string>]: "true"; } & { [key: string]: "false"; })["1"]]]
 >T : T
 >true : "true"
 >otherwise : "false"
->Juxtapose : ({ true: "otherwise"; } & { [k: string]: "true"; })[({ [K in keyof T]: "true"; } & { [key: string]: "false"; })["1"]]
+>Juxtapose : ({ true: "otherwise"; } & { [k: string]: "true"; })[({ [K in Extract<keyof T, string>]: "true"; } & { [key: string]: "false"; })["1"]]
 >T : T
 
diff --git a/tests/baselines/reference/destructuredLateBoundNameHasCorrectTypes.errors.txt b/tests/baselines/reference/destructuredLateBoundNameHasCorrectTypes.errors.txt
new file mode 100644
index 00000000000..6a5c50021db
--- /dev/null
+++ b/tests/baselines/reference/destructuredLateBoundNameHasCorrectTypes.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/compiler/destructuredLateBoundNameHasCorrectTypes.ts(11,7): error TS2459: Type '{ prop: string; }' has no property '[notPresent]' and no string index signature.
+
+
+==== tests/cases/compiler/destructuredLateBoundNameHasCorrectTypes.ts (1 errors) ====
+    let { [Symbol.iterator]: destructured } = [];
+    void destructured;
+    
+    const named = "prop";
+    
+    let { [named]: computed } = { prop: "b" };
+    void computed;
+    
+    const notPresent = "prop2";
+    
+    let { [notPresent]: computed2 } = { prop: "b" };
+          ~~~~~~~~~~~~
+!!! error TS2459: Type '{ prop: string; }' has no property '[notPresent]' and no string index signature.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/destructuredLateBoundNameHasCorrectTypes.js b/tests/baselines/reference/destructuredLateBoundNameHasCorrectTypes.js
new file mode 100644
index 00000000000..b1bee839e90
--- /dev/null
+++ b/tests/baselines/reference/destructuredLateBoundNameHasCorrectTypes.js
@@ -0,0 +1,22 @@
+//// [destructuredLateBoundNameHasCorrectTypes.ts]
+let { [Symbol.iterator]: destructured } = [];
+void destructured;
+
+const named = "prop";
+
+let { [named]: computed } = { prop: "b" };
+void computed;
+
+const notPresent = "prop2";
+
+let { [notPresent]: computed2 } = { prop: "b" };
+
+
+//// [destructuredLateBoundNameHasCorrectTypes.js]
+let { [Symbol.iterator]: destructured } = [];
+void destructured;
+const named = "prop";
+let { [named]: computed } = { prop: "b" };
+void computed;
+const notPresent = "prop2";
+let { [notPresent]: computed2 } = { prop: "b" };
diff --git a/tests/baselines/reference/destructuredLateBoundNameHasCorrectTypes.symbols b/tests/baselines/reference/destructuredLateBoundNameHasCorrectTypes.symbols
new file mode 100644
index 00000000000..dbf0aac121d
--- /dev/null
+++ b/tests/baselines/reference/destructuredLateBoundNameHasCorrectTypes.symbols
@@ -0,0 +1,29 @@
+=== tests/cases/compiler/destructuredLateBoundNameHasCorrectTypes.ts ===
+let { [Symbol.iterator]: destructured } = [];
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.iterable.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.iterable.d.ts, --, --))
+>destructured : Symbol(destructured, Decl(destructuredLateBoundNameHasCorrectTypes.ts, 0, 5))
+
+void destructured;
+>destructured : Symbol(destructured, Decl(destructuredLateBoundNameHasCorrectTypes.ts, 0, 5))
+
+const named = "prop";
+>named : Symbol(named, Decl(destructuredLateBoundNameHasCorrectTypes.ts, 3, 5))
+
+let { [named]: computed } = { prop: "b" };
+>named : Symbol(named, Decl(destructuredLateBoundNameHasCorrectTypes.ts, 3, 5))
+>computed : Symbol(computed, Decl(destructuredLateBoundNameHasCorrectTypes.ts, 5, 5))
+>prop : Symbol(prop, Decl(destructuredLateBoundNameHasCorrectTypes.ts, 5, 29))
+
+void computed;
+>computed : Symbol(computed, Decl(destructuredLateBoundNameHasCorrectTypes.ts, 5, 5))
+
+const notPresent = "prop2";
+>notPresent : Symbol(notPresent, Decl(destructuredLateBoundNameHasCorrectTypes.ts, 8, 5))
+
+let { [notPresent]: computed2 } = { prop: "b" };
+>notPresent : Symbol(notPresent, Decl(destructuredLateBoundNameHasCorrectTypes.ts, 8, 5))
+>computed2 : Symbol(computed2, Decl(destructuredLateBoundNameHasCorrectTypes.ts, 10, 5))
+>prop : Symbol(prop, Decl(destructuredLateBoundNameHasCorrectTypes.ts, 10, 35))
+
diff --git a/tests/baselines/reference/destructuredLateBoundNameHasCorrectTypes.types b/tests/baselines/reference/destructuredLateBoundNameHasCorrectTypes.types
new file mode 100644
index 00000000000..8d24b45e0ec
--- /dev/null
+++ b/tests/baselines/reference/destructuredLateBoundNameHasCorrectTypes.types
@@ -0,0 +1,38 @@
+=== tests/cases/compiler/destructuredLateBoundNameHasCorrectTypes.ts ===
+let { [Symbol.iterator]: destructured } = [];
+>Symbol.iterator : symbol
+>Symbol : SymbolConstructor
+>iterator : symbol
+>destructured : () => IterableIterator<undefined>
+>[] : undefined[]
+
+void destructured;
+>void destructured : undefined
+>destructured : () => IterableIterator<undefined>
+
+const named = "prop";
+>named : "prop"
+>"prop" : "prop"
+
+let { [named]: computed } = { prop: "b" };
+>named : "prop"
+>computed : string
+>{ prop: "b" } : { prop: string; }
+>prop : string
+>"b" : "b"
+
+void computed;
+>void computed : undefined
+>computed : string
+
+const notPresent = "prop2";
+>notPresent : "prop2"
+>"prop2" : "prop2"
+
+let { [notPresent]: computed2 } = { prop: "b" };
+>notPresent : "prop2"
+>computed2 : any
+>{ prop: "b" } : { prop: string; }
+>prop : string
+>"b" : "b"
+
diff --git a/tests/baselines/reference/enumConstantMemberWithString.errors.txt b/tests/baselines/reference/enumConstantMemberWithString.errors.txt
new file mode 100644
index 00000000000..99f089e2bb3
--- /dev/null
+++ b/tests/baselines/reference/enumConstantMemberWithString.errors.txt
@@ -0,0 +1,45 @@
+tests/cases/conformance/enums/enumConstantMemberWithString.ts(5,9): error TS2553: Computed values are not permitted in an enum with string valued members.
+tests/cases/conformance/enums/enumConstantMemberWithString.ts(6,9): error TS2553: Computed values are not permitted in an enum with string valued members.
+tests/cases/conformance/enums/enumConstantMemberWithString.ts(18,9): error TS2553: Computed values are not permitted in an enum with string valued members.
+
+
+==== tests/cases/conformance/enums/enumConstantMemberWithString.ts (3 errors) ====
+    enum T1 {
+        a = "1",
+        b = "1" + "2",
+        c = "1" + "2" + "3",
+        d = "a" - "a",
+            ~~~~~~~~~
+!!! error TS2553: Computed values are not permitted in an enum with string valued members.
+        e = "a" + 1
+            ~~~~~~~
+!!! error TS2553: Computed values are not permitted in an enum with string valued members.
+    }
+    
+    enum T2 {
+        a = "1",
+        b = "1" + "2"
+    }
+    
+    enum T3 {
+        a = "1",
+        b = "1" + "2",
+        c = 1,
+        d = 1 + 2
+            ~~~~~
+!!! error TS2553: Computed values are not permitted in an enum with string valued members.
+    }
+    
+    enum T4 {
+        a = "1"
+    }
+    
+    enum T5 {
+        a = "1" + "2"
+    }
+    
+    declare enum T6 {
+        a = "1",
+        b = "1" + "2"
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/enumConstantMemberWithString.js b/tests/baselines/reference/enumConstantMemberWithString.js
new file mode 100644
index 00000000000..fc61ed484c8
--- /dev/null
+++ b/tests/baselines/reference/enumConstantMemberWithString.js
@@ -0,0 +1,64 @@
+//// [enumConstantMemberWithString.ts]
+enum T1 {
+    a = "1",
+    b = "1" + "2",
+    c = "1" + "2" + "3",
+    d = "a" - "a",
+    e = "a" + 1
+}
+
+enum T2 {
+    a = "1",
+    b = "1" + "2"
+}
+
+enum T3 {
+    a = "1",
+    b = "1" + "2",
+    c = 1,
+    d = 1 + 2
+}
+
+enum T4 {
+    a = "1"
+}
+
+enum T5 {
+    a = "1" + "2"
+}
+
+declare enum T6 {
+    a = "1",
+    b = "1" + "2"
+}
+
+
+//// [enumConstantMemberWithString.js]
+var T1;
+(function (T1) {
+    T1["a"] = "1";
+    T1["b"] = "12";
+    T1["c"] = "123";
+    T1[T1["d"] = 0] = "d";
+    T1[T1["e"] = 0] = "e";
+})(T1 || (T1 = {}));
+var T2;
+(function (T2) {
+    T2["a"] = "1";
+    T2["b"] = "12";
+})(T2 || (T2 = {}));
+var T3;
+(function (T3) {
+    T3["a"] = "1";
+    T3["b"] = "12";
+    T3[T3["c"] = 1] = "c";
+    T3[T3["d"] = 0] = "d";
+})(T3 || (T3 = {}));
+var T4;
+(function (T4) {
+    T4["a"] = "1";
+})(T4 || (T4 = {}));
+var T5;
+(function (T5) {
+    T5["a"] = "12";
+})(T5 || (T5 = {}));
diff --git a/tests/baselines/reference/enumConstantMemberWithString.symbols b/tests/baselines/reference/enumConstantMemberWithString.symbols
new file mode 100644
index 00000000000..625c24fdfef
--- /dev/null
+++ b/tests/baselines/reference/enumConstantMemberWithString.symbols
@@ -0,0 +1,70 @@
+=== tests/cases/conformance/enums/enumConstantMemberWithString.ts ===
+enum T1 {
+>T1 : Symbol(T1, Decl(enumConstantMemberWithString.ts, 0, 0))
+
+    a = "1",
+>a : Symbol(T1.a, Decl(enumConstantMemberWithString.ts, 0, 9))
+
+    b = "1" + "2",
+>b : Symbol(T1.b, Decl(enumConstantMemberWithString.ts, 1, 12))
+
+    c = "1" + "2" + "3",
+>c : Symbol(T1.c, Decl(enumConstantMemberWithString.ts, 2, 18))
+
+    d = "a" - "a",
+>d : Symbol(T1.d, Decl(enumConstantMemberWithString.ts, 3, 24))
+
+    e = "a" + 1
+>e : Symbol(T1.e, Decl(enumConstantMemberWithString.ts, 4, 18))
+}
+
+enum T2 {
+>T2 : Symbol(T2, Decl(enumConstantMemberWithString.ts, 6, 1))
+
+    a = "1",
+>a : Symbol(T2.a, Decl(enumConstantMemberWithString.ts, 8, 9))
+
+    b = "1" + "2"
+>b : Symbol(T2.b, Decl(enumConstantMemberWithString.ts, 9, 12))
+}
+
+enum T3 {
+>T3 : Symbol(T3, Decl(enumConstantMemberWithString.ts, 11, 1))
+
+    a = "1",
+>a : Symbol(T3.a, Decl(enumConstantMemberWithString.ts, 13, 9))
+
+    b = "1" + "2",
+>b : Symbol(T3.b, Decl(enumConstantMemberWithString.ts, 14, 12))
+
+    c = 1,
+>c : Symbol(T3.c, Decl(enumConstantMemberWithString.ts, 15, 18))
+
+    d = 1 + 2
+>d : Symbol(T3.d, Decl(enumConstantMemberWithString.ts, 16, 10))
+}
+
+enum T4 {
+>T4 : Symbol(T4, Decl(enumConstantMemberWithString.ts, 18, 1))
+
+    a = "1"
+>a : Symbol(T4.a, Decl(enumConstantMemberWithString.ts, 20, 9))
+}
+
+enum T5 {
+>T5 : Symbol(T5, Decl(enumConstantMemberWithString.ts, 22, 1))
+
+    a = "1" + "2"
+>a : Symbol(T5.a, Decl(enumConstantMemberWithString.ts, 24, 9))
+}
+
+declare enum T6 {
+>T6 : Symbol(T6, Decl(enumConstantMemberWithString.ts, 26, 1))
+
+    a = "1",
+>a : Symbol(T6.a, Decl(enumConstantMemberWithString.ts, 28, 17))
+
+    b = "1" + "2"
+>b : Symbol(T6.b, Decl(enumConstantMemberWithString.ts, 29, 12))
+}
+
diff --git a/tests/baselines/reference/enumConstantMemberWithString.types b/tests/baselines/reference/enumConstantMemberWithString.types
new file mode 100644
index 00000000000..91bc2f97072
--- /dev/null
+++ b/tests/baselines/reference/enumConstantMemberWithString.types
@@ -0,0 +1,105 @@
+=== tests/cases/conformance/enums/enumConstantMemberWithString.ts ===
+enum T1 {
+>T1 : T1
+
+    a = "1",
+>a : T1.a
+>"1" : "1"
+
+    b = "1" + "2",
+>b : T1.b
+>"1" + "2" : string
+>"1" : "1"
+>"2" : "2"
+
+    c = "1" + "2" + "3",
+>c : T1.c
+>"1" + "2" + "3" : string
+>"1" + "2" : string
+>"1" : "1"
+>"2" : "2"
+>"3" : "3"
+
+    d = "a" - "a",
+>d : T1.d
+>"a" - "a" : number
+>"a" : "a"
+>"a" : "a"
+
+    e = "a" + 1
+>e : T1.d
+>"a" + 1 : string
+>"a" : "a"
+>1 : 1
+}
+
+enum T2 {
+>T2 : T2
+
+    a = "1",
+>a : T2.a
+>"1" : "1"
+
+    b = "1" + "2"
+>b : T2.b
+>"1" + "2" : string
+>"1" : "1"
+>"2" : "2"
+}
+
+enum T3 {
+>T3 : T3
+
+    a = "1",
+>a : T3.a
+>"1" : "1"
+
+    b = "1" + "2",
+>b : T3.b
+>"1" + "2" : string
+>"1" : "1"
+>"2" : "2"
+
+    c = 1,
+>c : T3.c
+>1 : 1
+
+    d = 1 + 2
+>d : T3.d
+>1 + 2 : number
+>1 : 1
+>2 : 2
+}
+
+enum T4 {
+>T4 : T4
+
+    a = "1"
+>a : T4
+>"1" : "1"
+}
+
+enum T5 {
+>T5 : T5
+
+    a = "1" + "2"
+>a : T5
+>"1" + "2" : string
+>"1" : "1"
+>"2" : "2"
+}
+
+declare enum T6 {
+>T6 : T6
+
+    a = "1",
+>a : T6.a
+>"1" : "1"
+
+    b = "1" + "2"
+>b : T6.b
+>"1" + "2" : string
+>"1" : "1"
+>"2" : "2"
+}
+
diff --git a/tests/baselines/reference/enumConstantMemberWithStringEmitDeclaration.js b/tests/baselines/reference/enumConstantMemberWithStringEmitDeclaration.js
new file mode 100644
index 00000000000..d78ce824256
--- /dev/null
+++ b/tests/baselines/reference/enumConstantMemberWithStringEmitDeclaration.js
@@ -0,0 +1,82 @@
+//// [enumConstantMemberWithStringEmitDeclaration.ts]
+enum T1 {
+    a = "1",
+    b = "1" + "2",
+    c = "1" + "2" + "3"
+}
+
+enum T2 {
+    a = "1",
+    b = "1" + "2"
+}
+
+enum T3 {
+    a = "1",
+    b = "1" + "2"
+}
+
+enum T4 {
+    a = "1"
+}
+
+enum T5 {
+    a = "1" + "2"
+}
+
+declare enum T6 {
+    a = "1",
+    b = "1" + "2"
+}
+
+
+//// [enumConstantMemberWithStringEmitDeclaration.js]
+var T1;
+(function (T1) {
+    T1["a"] = "1";
+    T1["b"] = "12";
+    T1["c"] = "123";
+})(T1 || (T1 = {}));
+var T2;
+(function (T2) {
+    T2["a"] = "1";
+    T2["b"] = "12";
+})(T2 || (T2 = {}));
+var T3;
+(function (T3) {
+    T3["a"] = "1";
+    T3["b"] = "12";
+})(T3 || (T3 = {}));
+var T4;
+(function (T4) {
+    T4["a"] = "1";
+})(T4 || (T4 = {}));
+var T5;
+(function (T5) {
+    T5["a"] = "12";
+})(T5 || (T5 = {}));
+
+
+//// [enumConstantMemberWithStringEmitDeclaration.d.ts]
+declare enum T1 {
+    a = "1",
+    b = "12",
+    c = "123"
+}
+declare enum T2 {
+    a = "1",
+    b = "12"
+}
+declare enum T3 {
+    a = "1",
+    b = "12"
+}
+declare enum T4 {
+    a = "1"
+}
+declare enum T5 {
+    a = "12"
+}
+declare enum T6 {
+    a = "1",
+    b = "12"
+}
diff --git a/tests/baselines/reference/enumConstantMemberWithStringEmitDeclaration.symbols b/tests/baselines/reference/enumConstantMemberWithStringEmitDeclaration.symbols
new file mode 100644
index 00000000000..1bb70c7882b
--- /dev/null
+++ b/tests/baselines/reference/enumConstantMemberWithStringEmitDeclaration.symbols
@@ -0,0 +1,58 @@
+=== tests/cases/conformance/enums/enumConstantMemberWithStringEmitDeclaration.ts ===
+enum T1 {
+>T1 : Symbol(T1, Decl(enumConstantMemberWithStringEmitDeclaration.ts, 0, 0))
+
+    a = "1",
+>a : Symbol(T1.a, Decl(enumConstantMemberWithStringEmitDeclaration.ts, 0, 9))
+
+    b = "1" + "2",
+>b : Symbol(T1.b, Decl(enumConstantMemberWithStringEmitDeclaration.ts, 1, 12))
+
+    c = "1" + "2" + "3"
+>c : Symbol(T1.c, Decl(enumConstantMemberWithStringEmitDeclaration.ts, 2, 18))
+}
+
+enum T2 {
+>T2 : Symbol(T2, Decl(enumConstantMemberWithStringEmitDeclaration.ts, 4, 1))
+
+    a = "1",
+>a : Symbol(T2.a, Decl(enumConstantMemberWithStringEmitDeclaration.ts, 6, 9))
+
+    b = "1" + "2"
+>b : Symbol(T2.b, Decl(enumConstantMemberWithStringEmitDeclaration.ts, 7, 12))
+}
+
+enum T3 {
+>T3 : Symbol(T3, Decl(enumConstantMemberWithStringEmitDeclaration.ts, 9, 1))
+
+    a = "1",
+>a : Symbol(T3.a, Decl(enumConstantMemberWithStringEmitDeclaration.ts, 11, 9))
+
+    b = "1" + "2"
+>b : Symbol(T3.b, Decl(enumConstantMemberWithStringEmitDeclaration.ts, 12, 12))
+}
+
+enum T4 {
+>T4 : Symbol(T4, Decl(enumConstantMemberWithStringEmitDeclaration.ts, 14, 1))
+
+    a = "1"
+>a : Symbol(T4.a, Decl(enumConstantMemberWithStringEmitDeclaration.ts, 16, 9))
+}
+
+enum T5 {
+>T5 : Symbol(T5, Decl(enumConstantMemberWithStringEmitDeclaration.ts, 18, 1))
+
+    a = "1" + "2"
+>a : Symbol(T5.a, Decl(enumConstantMemberWithStringEmitDeclaration.ts, 20, 9))
+}
+
+declare enum T6 {
+>T6 : Symbol(T6, Decl(enumConstantMemberWithStringEmitDeclaration.ts, 22, 1))
+
+    a = "1",
+>a : Symbol(T6.a, Decl(enumConstantMemberWithStringEmitDeclaration.ts, 24, 17))
+
+    b = "1" + "2"
+>b : Symbol(T6.b, Decl(enumConstantMemberWithStringEmitDeclaration.ts, 25, 12))
+}
+
diff --git a/tests/baselines/reference/enumConstantMemberWithStringEmitDeclaration.types b/tests/baselines/reference/enumConstantMemberWithStringEmitDeclaration.types
new file mode 100644
index 00000000000..b613ec306e4
--- /dev/null
+++ b/tests/baselines/reference/enumConstantMemberWithStringEmitDeclaration.types
@@ -0,0 +1,83 @@
+=== tests/cases/conformance/enums/enumConstantMemberWithStringEmitDeclaration.ts ===
+enum T1 {
+>T1 : T1
+
+    a = "1",
+>a : T1.a
+>"1" : "1"
+
+    b = "1" + "2",
+>b : T1.b
+>"1" + "2" : string
+>"1" : "1"
+>"2" : "2"
+
+    c = "1" + "2" + "3"
+>c : T1.c
+>"1" + "2" + "3" : string
+>"1" + "2" : string
+>"1" : "1"
+>"2" : "2"
+>"3" : "3"
+}
+
+enum T2 {
+>T2 : T2
+
+    a = "1",
+>a : T2.a
+>"1" : "1"
+
+    b = "1" + "2"
+>b : T2.b
+>"1" + "2" : string
+>"1" : "1"
+>"2" : "2"
+}
+
+enum T3 {
+>T3 : T3
+
+    a = "1",
+>a : T3.a
+>"1" : "1"
+
+    b = "1" + "2"
+>b : T3.b
+>"1" + "2" : string
+>"1" : "1"
+>"2" : "2"
+}
+
+enum T4 {
+>T4 : T4
+
+    a = "1"
+>a : T4
+>"1" : "1"
+}
+
+enum T5 {
+>T5 : T5
+
+    a = "1" + "2"
+>a : T5
+>"1" + "2" : string
+>"1" : "1"
+>"2" : "2"
+}
+
+declare enum T6 {
+>T6 : T6
+
+    a = "1",
+>a : T6.a
+>"1" : "1"
+
+    b = "1" + "2"
+>b : T6.b
+>"1" + "2" : string
+>"1" : "1"
+>"2" : "2"
+}
+
diff --git a/tests/baselines/reference/es5ExportEquals.types b/tests/baselines/reference/es5ExportEquals.types
index 3397cf1df72..6c9e8930537 100644
--- a/tests/baselines/reference/es5ExportEquals.types
+++ b/tests/baselines/reference/es5ExportEquals.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/es5ExportEquals.ts ===
 export function f() { }
->f : () => void
+>f : typeof f
 
 export = f;
 >f : () => void
diff --git a/tests/baselines/reference/es6ExportEquals.types b/tests/baselines/reference/es6ExportEquals.types
index 3503812aead..3ba761dc8e5 100644
--- a/tests/baselines/reference/es6ExportEquals.types
+++ b/tests/baselines/reference/es6ExportEquals.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/es6ExportEquals.ts ===
 export function f() { }
->f : () => void
+>f : typeof f
 
 export = f;
 >f : () => void
diff --git a/tests/baselines/reference/excessPropertyCheckWithEmptyObject.types b/tests/baselines/reference/excessPropertyCheckWithEmptyObject.types
index ecf15c74da5..9748820aacd 100644
--- a/tests/baselines/reference/excessPropertyCheckWithEmptyObject.types
+++ b/tests/baselines/reference/excessPropertyCheckWithEmptyObject.types
@@ -4,9 +4,9 @@
 // Excess property error expected here
 Object.defineProperty(window, "prop", { value: "v1.0.0", readonly: false });
 >Object.defineProperty(window, "prop", { value: "v1.0.0", readonly: false }) : any
->Object.defineProperty : (o: any, p: string, attributes: PropertyDescriptor & ThisType<any>) => any
+>Object.defineProperty : (o: any, p: string | number | symbol, attributes: PropertyDescriptor & ThisType<any>) => any
 >Object : ObjectConstructor
->defineProperty : (o: any, p: string, attributes: PropertyDescriptor & ThisType<any>) => any
+>defineProperty : (o: any, p: string | number | symbol, attributes: PropertyDescriptor & ThisType<any>) => any
 >window : any
 >"prop" : "prop"
 >{ value: "v1.0.0", readonly: false } : { value: string; readonly: boolean; }
diff --git a/tests/baselines/reference/exportNestedNamespaces2.errors.txt b/tests/baselines/reference/exportNestedNamespaces2.errors.txt
index 7b4b3284f72..38dc2fc2c60 100644
--- a/tests/baselines/reference/exportNestedNamespaces2.errors.txt
+++ b/tests/baselines/reference/exportNestedNamespaces2.errors.txt
@@ -1,7 +1,5 @@
-tests/cases/conformance/salsa/first.js(1,1): error TS2539: Cannot assign to '"tests/cases/conformance/salsa/first"' because it is not a variable.
 tests/cases/conformance/salsa/first.js(1,11): error TS2304: Cannot find name 'require'.
 tests/cases/conformance/salsa/first.js(2,9): error TS2339: Property 'formatters' does not exist on type 'typeof import("tests/cases/conformance/salsa/first")'.
-tests/cases/conformance/salsa/second.js(1,1): error TS2539: Cannot assign to '"tests/cases/conformance/salsa/second"' because it is not a variable.
 tests/cases/conformance/salsa/second.js(1,11): error TS2304: Cannot find name 'require'.
 tests/cases/conformance/salsa/second.js(2,9): error TS2339: Property 'formatters' does not exist on type 'typeof import("tests/cases/conformance/salsa/second")'.
 
@@ -9,10 +7,8 @@ tests/cases/conformance/salsa/second.js(2,9): error TS2339: Property 'formatters
 ==== tests/cases/conformance/salsa/mod.js (0 errors) ====
     // Based on a pattern from adonis
     exports.formatters = {}
-==== tests/cases/conformance/salsa/first.js (3 errors) ====
+==== tests/cases/conformance/salsa/first.js (2 errors) ====
     exports = require('./mod')
-    ~~~~~~~
-!!! error TS2539: Cannot assign to '"tests/cases/conformance/salsa/first"' because it is not a variable.
               ~~~~~~~
 !!! error TS2304: Cannot find name 'require'.
     exports.formatters.j = function (v) {
@@ -20,10 +16,8 @@ tests/cases/conformance/salsa/second.js(2,9): error TS2339: Property 'formatters
 !!! error TS2339: Property 'formatters' does not exist on type 'typeof import("tests/cases/conformance/salsa/first")'.
         return v
     }
-==== tests/cases/conformance/salsa/second.js (3 errors) ====
+==== tests/cases/conformance/salsa/second.js (2 errors) ====
     exports = require('./mod')
-    ~~~~~~~
-!!! error TS2539: Cannot assign to '"tests/cases/conformance/salsa/second"' because it is not a variable.
               ~~~~~~~
 !!! error TS2304: Cannot find name 'require'.
     exports.formatters.o = function (v) {
diff --git a/tests/baselines/reference/exportNestedNamespaces2.types b/tests/baselines/reference/exportNestedNamespaces2.types
index e1539586650..5d32eb29215 100644
--- a/tests/baselines/reference/exportNestedNamespaces2.types
+++ b/tests/baselines/reference/exportNestedNamespaces2.types
@@ -10,7 +10,7 @@ exports.formatters = {}
 === tests/cases/conformance/salsa/first.js ===
 exports = require('./mod')
 >exports = require('./mod') : typeof import("tests/cases/conformance/salsa/mod")
->exports : any
+>exports : typeof import("tests/cases/conformance/salsa/first")
 >require('./mod') : typeof import("tests/cases/conformance/salsa/mod")
 >require : any
 >'./mod' : "./mod"
@@ -31,7 +31,7 @@ exports.formatters.j = function (v) {
 === tests/cases/conformance/salsa/second.js ===
 exports = require('./mod')
 >exports = require('./mod') : typeof import("tests/cases/conformance/salsa/mod")
->exports : any
+>exports : typeof import("tests/cases/conformance/salsa/second")
 >require('./mod') : typeof import("tests/cases/conformance/salsa/mod")
 >require : any
 >'./mod' : "./mod"
diff --git a/tests/baselines/reference/fixSignatureCaching.types b/tests/baselines/reference/fixSignatureCaching.types
index c3f4dbc1522..8b66a3f7b95 100644
--- a/tests/baselines/reference/fixSignatureCaching.types
+++ b/tests/baselines/reference/fixSignatureCaching.types
@@ -1068,12 +1068,12 @@ define(function () {
     };
 
     var hasOwnProp = Object.prototype.hasOwnProperty,
->hasOwnProp : (v: string) => boolean
->Object.prototype.hasOwnProperty : (v: string) => boolean
+>hasOwnProp : (v: string | number | symbol) => boolean
+>Object.prototype.hasOwnProperty : (v: string | number | symbol) => boolean
 >Object.prototype : Object
 >Object : ObjectConstructor
 >prototype : Object
->hasOwnProperty : (v: string) => boolean
+>hasOwnProperty : (v: string | number | symbol) => boolean
 
         isArray;
 >isArray : any
@@ -1249,7 +1249,7 @@ define(function () {
             if (hasOwnProp.call(object, key)) {
 >hasOwnProp.call(object, key) : any
 >hasOwnProp.call : (this: Function, thisArg: any, ...argArray: any[]) => any
->hasOwnProp : (v: string) => boolean
+>hasOwnProp : (v: string | number | symbol) => boolean
 >call : (this: Function, thisArg: any, ...argArray: any[]) => any
 >object : any
 >key : string
@@ -1296,7 +1296,7 @@ define(function () {
             if (hasOwnProp.call(mobileDetectRules.props, key)) {
 >hasOwnProp.call(mobileDetectRules.props, key) : any
 >hasOwnProp.call : (this: Function, thisArg: any, ...argArray: any[]) => any
->hasOwnProp : (v: string) => boolean
+>hasOwnProp : (v: string | number | symbol) => boolean
 >call : (this: Function, thisArg: any, ...argArray: any[]) => any
 >mobileDetectRules.props : any
 >mobileDetectRules : any
@@ -1487,7 +1487,7 @@ define(function () {
             if (hasOwnProp.call(rules, key)) {
 >hasOwnProp.call(rules, key) : any
 >hasOwnProp.call : (this: Function, thisArg: any, ...argArray: any[]) => any
->hasOwnProp : (v: string) => boolean
+>hasOwnProp : (v: string | number | symbol) => boolean
 >call : (this: Function, thisArg: any, ...argArray: any[]) => any
 >rules : any
 >key : string
@@ -1538,7 +1538,7 @@ define(function () {
             if (hasOwnProp.call(rules, key)) {
 >hasOwnProp.call(rules, key) : any
 >hasOwnProp.call : (this: Function, thisArg: any, ...argArray: any[]) => any
->hasOwnProp : (v: string) => boolean
+>hasOwnProp : (v: string | number | symbol) => boolean
 >call : (this: Function, thisArg: any, ...argArray: any[]) => any
 >rules : any
 >key : string
@@ -1598,7 +1598,7 @@ define(function () {
         if (hasOwnProp.call(props, propertyName)) {
 >hasOwnProp.call(props, propertyName) : any
 >hasOwnProp.call : (this: Function, thisArg: any, ...argArray: any[]) => any
->hasOwnProp : (v: string) => boolean
+>hasOwnProp : (v: string | number | symbol) => boolean
 >call : (this: Function, thisArg: any, ...argArray: any[]) => any
 >props : any
 >propertyName : any
diff --git a/tests/baselines/reference/for-inStatements.errors.txt b/tests/baselines/reference/for-inStatements.errors.txt
index 2ae4cdb79f0..50f31d669cd 100644
--- a/tests/baselines/reference/for-inStatements.errors.txt
+++ b/tests/baselines/reference/for-inStatements.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/conformance/statements/for-inStatements/for-inStatements.ts(33,18): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
-tests/cases/conformance/statements/for-inStatements/for-inStatements.ts(50,18): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
+tests/cases/conformance/statements/for-inStatements/for-inStatements.ts(33,18): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'Extract<keyof this, string>'.
+tests/cases/conformance/statements/for-inStatements/for-inStatements.ts(50,18): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'Extract<keyof this, string>'.
 tests/cases/conformance/statements/for-inStatements/for-inStatements.ts(79,15): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter, but here has type 'Color.Blue'.
 
 
@@ -38,7 +38,7 @@ tests/cases/conformance/statements/for-inStatements/for-inStatements.ts(79,15):
             for (var x in this.biz) { }
             for (var x in this) { }
                      ~
-!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'Extract<keyof this, string>'.
             return null;
         }
     
@@ -57,7 +57,7 @@ tests/cases/conformance/statements/for-inStatements/for-inStatements.ts(79,15):
             for (var x in this.biz) { }
             for (var x in this) { }
                      ~
-!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'Extract<keyof this, string>'.
     
             for (var x in super.biz) { }
             for (var x in super.biz()) { }
diff --git a/tests/baselines/reference/for-inStatementsInvalid.errors.txt b/tests/baselines/reference/for-inStatementsInvalid.errors.txt
index 3d7dd1c79f3..8e1bb29d083 100644
--- a/tests/baselines/reference/for-inStatementsInvalid.errors.txt
+++ b/tests/baselines/reference/for-inStatementsInvalid.errors.txt
@@ -9,10 +9,10 @@ tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(1
 tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(20,15): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter, but here has type 'string'.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(22,15): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter, but here has type 'string'.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(29,23): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter, but here has type 'number'.
-tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(31,18): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
+tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(31,18): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'Extract<keyof this, string>'.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(38,23): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter, but here has type 'number'.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(46,23): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter, but here has type 'number'.
-tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(48,18): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
+tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(48,18): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'Extract<keyof this, string>'.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(51,23): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter, but here has type 'number'.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(62,15): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter, but here has type 'number'.
 
@@ -72,7 +72,7 @@ tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(6
             for (var x in this.biz) { }
             for (var x in this) { }
                      ~
-!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'Extract<keyof this, string>'.
             return null;
         }
     
@@ -95,7 +95,7 @@ tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(6
             for (var x in this.biz) { }
             for (var x in this) { }
                      ~
-!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'Extract<keyof this, string>'.
     
             for (var x in super.biz) { }
             for (var x in super.biz()) { }
diff --git a/tests/baselines/reference/forInStatement3.types b/tests/baselines/reference/forInStatement3.types
index 09e6cf3ad96..9fe63651f55 100644
--- a/tests/baselines/reference/forInStatement3.types
+++ b/tests/baselines/reference/forInStatement3.types
@@ -8,7 +8,7 @@ function F<T>() {
 >T : T
 
   for (var a in expr) {
->a : keyof T
+>a : Extract<keyof T, string>
 >expr : T
   }
 }
diff --git a/tests/baselines/reference/getterSetterNonAccessor.types b/tests/baselines/reference/getterSetterNonAccessor.types
index 7253dcc07e6..fc707c22c36 100644
--- a/tests/baselines/reference/getterSetterNonAccessor.types
+++ b/tests/baselines/reference/getterSetterNonAccessor.types
@@ -9,9 +9,9 @@ function setFunc(v){}
 
 Object.defineProperty({}, "0", <PropertyDescriptor>({
 >Object.defineProperty({}, "0", <PropertyDescriptor>({          get: getFunc,          set: setFunc,          configurable: true      })) : any
->Object.defineProperty : (o: any, p: string, attributes: PropertyDescriptor & ThisType<any>) => any
+>Object.defineProperty : (o: any, p: string | number | symbol, attributes: PropertyDescriptor & ThisType<any>) => any
 >Object : ObjectConstructor
->defineProperty : (o: any, p: string, attributes: PropertyDescriptor & ThisType<any>) => any
+>defineProperty : (o: any, p: string | number | symbol, attributes: PropertyDescriptor & ThisType<any>) => any
 >{} : {}
 >"0" : "0"
 ><PropertyDescriptor>({          get: getFunc,          set: setFunc,          configurable: true      }) : PropertyDescriptor
diff --git a/tests/baselines/reference/implicitAnyInCatch.types b/tests/baselines/reference/implicitAnyInCatch.types
index 93cce09928e..6f70165407f 100644
--- a/tests/baselines/reference/implicitAnyInCatch.types
+++ b/tests/baselines/reference/implicitAnyInCatch.types
@@ -22,7 +22,7 @@ class C {
 >temp : () => void
 
         for (var x in this) {
->x : keyof this
+>x : Extract<keyof this, string>
 >this : this
         }
     }
diff --git a/tests/baselines/reference/importEmptyFromModuleNotExisted.errors.txt b/tests/baselines/reference/importEmptyFromModuleNotExisted.errors.txt
new file mode 100644
index 00000000000..99ccd49c489
--- /dev/null
+++ b/tests/baselines/reference/importEmptyFromModuleNotExisted.errors.txt
@@ -0,0 +1,8 @@
+tests/cases/conformance/es6/modules/importEmptyFromModuleNotExisted.ts(1,16): error TS2307: Cannot find module 'module-not-existed'.
+
+
+==== tests/cases/conformance/es6/modules/importEmptyFromModuleNotExisted.ts (1 errors) ====
+    import {} from 'module-not-existed'
+                   ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find module 'module-not-existed'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/importEmptyFromModuleNotExisted.js b/tests/baselines/reference/importEmptyFromModuleNotExisted.js
new file mode 100644
index 00000000000..aa08db2e99e
--- /dev/null
+++ b/tests/baselines/reference/importEmptyFromModuleNotExisted.js
@@ -0,0 +1,7 @@
+//// [importEmptyFromModuleNotExisted.ts]
+import {} from 'module-not-existed'
+
+
+//// [importEmptyFromModuleNotExisted.js]
+"use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/importEmptyFromModuleNotExisted.symbols b/tests/baselines/reference/importEmptyFromModuleNotExisted.symbols
new file mode 100644
index 00000000000..ea0425ff26c
--- /dev/null
+++ b/tests/baselines/reference/importEmptyFromModuleNotExisted.symbols
@@ -0,0 +1,4 @@
+=== tests/cases/conformance/es6/modules/importEmptyFromModuleNotExisted.ts ===
+import {} from 'module-not-existed'
+No type information for this code.
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/importEmptyFromModuleNotExisted.types b/tests/baselines/reference/importEmptyFromModuleNotExisted.types
new file mode 100644
index 00000000000..ea0425ff26c
--- /dev/null
+++ b/tests/baselines/reference/importEmptyFromModuleNotExisted.types
@@ -0,0 +1,4 @@
+=== tests/cases/conformance/es6/modules/importEmptyFromModuleNotExisted.ts ===
+import {} from 'module-not-existed'
+No type information for this code.
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/importTypeResolutionJSDocEOF.symbols b/tests/baselines/reference/importTypeResolutionJSDocEOF.symbols
new file mode 100644
index 00000000000..35a4695cb76
--- /dev/null
+++ b/tests/baselines/reference/importTypeResolutionJSDocEOF.symbols
@@ -0,0 +1,14 @@
+=== tests/cases/compiler/interfaces.d.ts ===
+export interface Bar {
+>Bar : Symbol(Bar, Decl(interfaces.d.ts, 0, 0))
+
+    prop: string
+>prop : Symbol(Bar.prop, Decl(interfaces.d.ts, 0, 22))
+}
+
+=== tests/cases/compiler/usage.js ===
+/** @type {Bar} */
+export let bar;
+>bar : Symbol(bar, Decl(usage.js, 1, 10))
+
+/** @typedef {import('./interfaces').Bar} Bar */
diff --git a/tests/baselines/reference/importTypeResolutionJSDocEOF.types b/tests/baselines/reference/importTypeResolutionJSDocEOF.types
new file mode 100644
index 00000000000..ecdafddccce
--- /dev/null
+++ b/tests/baselines/reference/importTypeResolutionJSDocEOF.types
@@ -0,0 +1,14 @@
+=== tests/cases/compiler/interfaces.d.ts ===
+export interface Bar {
+>Bar : Bar
+
+    prop: string
+>prop : string
+}
+
+=== tests/cases/compiler/usage.js ===
+/** @type {Bar} */
+export let bar;
+>bar : Bar
+
+/** @typedef {import('./interfaces').Bar} Bar */
diff --git a/tests/baselines/reference/inOperatorWithGeneric.types b/tests/baselines/reference/inOperatorWithGeneric.types
index eba9bf1419b..dd373d8e075 100644
--- a/tests/baselines/reference/inOperatorWithGeneric.types
+++ b/tests/baselines/reference/inOperatorWithGeneric.types
@@ -9,7 +9,7 @@ class C<T> {
 >T : T
 
         for (var p in x) {
->p : keyof T
+>p : Extract<keyof T, string>
 >x : T
         }
     }
diff --git a/tests/baselines/reference/indexedAccessRetainsIndexSignature.js b/tests/baselines/reference/indexedAccessRetainsIndexSignature.js
index 1b77b95527b..92952515779 100644
--- a/tests/baselines/reference/indexedAccessRetainsIndexSignature.js
+++ b/tests/baselines/reference/indexedAccessRetainsIndexSignature.js
@@ -1,5 +1,5 @@
 //// [indexedAccessRetainsIndexSignature.ts]
-type Diff<T extends string, U extends string> =
+type Diff<T extends keyof any, U extends keyof any> =
     ({ [P in T]: P } & { [P in U]: never } & { [x: string]: never })[T]
 type Omit<U, K extends keyof U> = Pick<U, Diff<keyof U, K>>
 type Omit1<U, K extends keyof U> = Pick<U, Diff<keyof U, K>>;
diff --git a/tests/baselines/reference/indexedAccessRetainsIndexSignature.symbols b/tests/baselines/reference/indexedAccessRetainsIndexSignature.symbols
index 9858f6fc162..ad46c367ba6 100644
--- a/tests/baselines/reference/indexedAccessRetainsIndexSignature.symbols
+++ b/tests/baselines/reference/indexedAccessRetainsIndexSignature.symbols
@@ -1,15 +1,15 @@
 === tests/cases/compiler/indexedAccessRetainsIndexSignature.ts ===
-type Diff<T extends string, U extends string> =
+type Diff<T extends keyof any, U extends keyof any> =
 >Diff : Symbol(Diff, Decl(indexedAccessRetainsIndexSignature.ts, 0, 0))
 >T : Symbol(T, Decl(indexedAccessRetainsIndexSignature.ts, 0, 10))
->U : Symbol(U, Decl(indexedAccessRetainsIndexSignature.ts, 0, 27))
+>U : Symbol(U, Decl(indexedAccessRetainsIndexSignature.ts, 0, 30))
 
     ({ [P in T]: P } & { [P in U]: never } & { [x: string]: never })[T]
 >P : Symbol(P, Decl(indexedAccessRetainsIndexSignature.ts, 1, 8))
 >T : Symbol(T, Decl(indexedAccessRetainsIndexSignature.ts, 0, 10))
 >P : Symbol(P, Decl(indexedAccessRetainsIndexSignature.ts, 1, 8))
 >P : Symbol(P, Decl(indexedAccessRetainsIndexSignature.ts, 1, 26))
->U : Symbol(U, Decl(indexedAccessRetainsIndexSignature.ts, 0, 27))
+>U : Symbol(U, Decl(indexedAccessRetainsIndexSignature.ts, 0, 30))
 >x : Symbol(x, Decl(indexedAccessRetainsIndexSignature.ts, 1, 48))
 >T : Symbol(T, Decl(indexedAccessRetainsIndexSignature.ts, 0, 10))
 
diff --git a/tests/baselines/reference/indexedAccessRetainsIndexSignature.types b/tests/baselines/reference/indexedAccessRetainsIndexSignature.types
index 8dcbe9bf218..5334cf891df 100644
--- a/tests/baselines/reference/indexedAccessRetainsIndexSignature.types
+++ b/tests/baselines/reference/indexedAccessRetainsIndexSignature.types
@@ -1,5 +1,5 @@
 === tests/cases/compiler/indexedAccessRetainsIndexSignature.ts ===
-type Diff<T extends string, U extends string> =
+type Diff<T extends keyof any, U extends keyof any> =
 >Diff : ({ [P in T]: P; } & { [P in U]: never; } & { [x: string]: never; })[T]
 >T : T
 >U : U
diff --git a/tests/baselines/reference/inferTypes1.errors.txt b/tests/baselines/reference/inferTypes1.errors.txt
index 01907bdc95b..4684b8f5e34 100644
--- a/tests/baselines/reference/inferTypes1.errors.txt
+++ b/tests/baselines/reference/inferTypes1.errors.txt
@@ -17,7 +17,8 @@ tests/cases/conformance/types/conditional/inferTypes1.ts(75,43): error TS2304: C
 tests/cases/conformance/types/conditional/inferTypes1.ts(75,43): error TS4081: Exported type alias 'T62' has or is using private name 'U'.
 tests/cases/conformance/types/conditional/inferTypes1.ts(82,44): error TS2344: Type 'U' does not satisfy the constraint 'string'.
   Type 'number' is not assignable to type 'string'.
-tests/cases/conformance/types/conditional/inferTypes1.ts(144,40): error TS2322: Type 'T' is not assignable to type 'string'.
+tests/cases/conformance/types/conditional/inferTypes1.ts(144,40): error TS2322: Type 'T' is not assignable to type 'string | number | symbol'.
+  Type 'T' is not assignable to type 'symbol'.
 
 
 ==== tests/cases/conformance/types/conditional/inferTypes1.ts (16 errors) ====
@@ -200,7 +201,8 @@ tests/cases/conformance/types/conditional/inferTypes1.ts(144,40): error TS2322:
     type A<T> = T extends string ? { [P in T]: void; } : T;
     type B<T> = string extends T ? { [P in T]: void; } : T;  // Error
                                            ~
-!!! error TS2322: Type 'T' is not assignable to type 'string'.
+!!! error TS2322: Type 'T' is not assignable to type 'string | number | symbol'.
+!!! error TS2322:   Type 'T' is not assignable to type 'symbol'.
     
     // Repro from #22302
     
diff --git a/tests/baselines/reference/isomorphicMappedTypeInference.types b/tests/baselines/reference/isomorphicMappedTypeInference.types
index b24bb071eeb..d0db5608b6f 100644
--- a/tests/baselines/reference/isomorphicMappedTypeInference.types
+++ b/tests/baselines/reference/isomorphicMappedTypeInference.types
@@ -64,19 +64,19 @@ function boxify<T>(obj: T): Boxified<T> {
 >T : T
 
     for (let k in obj) {
->k : keyof T
+>k : Extract<keyof T, string>
 >obj : T
 
         result[k] = box(obj[k]);
->result[k] = box(obj[k]) : Box<T[keyof T]>
->result[k] : Boxified<T>[keyof T]
+>result[k] = box(obj[k]) : Box<T[Extract<keyof T, string>]>
+>result[k] : Boxified<T>[Extract<keyof T, string>]
 >result : Boxified<T>
->k : keyof T
->box(obj[k]) : Box<T[keyof T]>
+>k : Extract<keyof T, string>
+>box(obj[k]) : Box<T[Extract<keyof T, string>]>
 >box : <T>(x: T) => Box<T>
->obj[k] : T[keyof T]
+>obj[k] : T[Extract<keyof T, string>]
 >obj : T
->k : keyof T
+>k : Extract<keyof T, string>
     }
     return result;
 >result : Boxified<T>
@@ -97,19 +97,19 @@ function unboxify<T>(obj: Boxified<T>): T {
 >T : T
 
     for (let k in obj) {
->k : keyof T
+>k : Extract<keyof T, string>
 >obj : Boxified<T>
 
         result[k] = unbox(obj[k]);
->result[k] = unbox(obj[k]) : T[keyof T]
->result[k] : T[keyof T]
+>result[k] = unbox(obj[k]) : T[Extract<keyof T, string>]
+>result[k] : T[Extract<keyof T, string>]
 >result : T
->k : keyof T
->unbox(obj[k]) : T[keyof T]
+>k : Extract<keyof T, string>
+>unbox(obj[k]) : T[Extract<keyof T, string>]
 >unbox : <T>(x: Box<T>) => T
->obj[k] : Boxified<T>[keyof T]
+>obj[k] : Boxified<T>[Extract<keyof T, string>]
 >obj : Boxified<T>
->k : keyof T
+>k : Extract<keyof T, string>
     }
     return result;
 >result : T
@@ -125,19 +125,19 @@ function assignBoxified<T>(obj: Boxified<T>, values: T) {
 >T : T
 
     for (let k in values) {
->k : keyof T
+>k : Extract<keyof T, string>
 >values : T
 
         obj[k].value = values[k];
->obj[k].value = values[k] : T[keyof T]
->obj[k].value : T[keyof T]
->obj[k] : Boxified<T>[keyof T]
+>obj[k].value = values[k] : T[Extract<keyof T, string>]
+>obj[k].value : T[Extract<keyof T, string>]
+>obj[k] : Boxified<T>[Extract<keyof T, string>]
 >obj : Boxified<T>
->k : keyof T
->value : T[keyof T]
->values[k] : T[keyof T]
+>k : Extract<keyof T, string>
+>value : T[Extract<keyof T, string>]
+>values[k] : T[Extract<keyof T, string>]
 >values : T
->k : keyof T
+>k : Extract<keyof T, string>
     }
 }
 
diff --git a/tests/baselines/reference/jsdocImportType.symbols b/tests/baselines/reference/jsdocImportType.symbols
new file mode 100644
index 00000000000..657ad6801f1
--- /dev/null
+++ b/tests/baselines/reference/jsdocImportType.symbols
@@ -0,0 +1,56 @@
+=== tests/cases/conformance/jsdoc/use.js ===
+/// <reference path='./types.d.ts'/>
+/** @typedef {import("./mod1")} C
+ * @type {C} */
+var c;
+>c : Symbol(c, Decl(use.js, 3, 3))
+
+c.chunk;
+>c.chunk : Symbol(Chunk.chunk, Decl(mod1.js, 2, 19))
+>c : Symbol(c, Decl(use.js, 3, 3))
+>chunk : Symbol(Chunk.chunk, Decl(mod1.js, 2, 19))
+
+const D = require("./mod1");
+>D : Symbol(D, Decl(use.js, 6, 5))
+>require : Symbol(require, Decl(types.d.ts, 0, 0))
+>"./mod1" : Symbol("tests/cases/conformance/jsdoc/mod1", Decl(mod1.js, 0, 0))
+
+/** @type {D} */
+var d;
+>d : Symbol(d, Decl(use.js, 8, 3))
+
+d.chunk;
+>d.chunk : Symbol(Chunk.chunk, Decl(mod1.js, 2, 19))
+>d : Symbol(d, Decl(use.js, 8, 3))
+>chunk : Symbol(Chunk.chunk, Decl(mod1.js, 2, 19))
+
+=== tests/cases/conformance/jsdoc/types.d.ts ===
+declare function require(name: string): any;
+>require : Symbol(require, Decl(types.d.ts, 0, 0))
+>name : Symbol(name, Decl(types.d.ts, 0, 25))
+
+declare var exports: any;
+>exports : Symbol(exports, Decl(types.d.ts, 1, 11))
+
+declare var module: { exports: any };
+>module : Symbol(module, Decl(types.d.ts, 2, 11))
+>exports : Symbol(exports, Decl(types.d.ts, 2, 21))
+
+=== tests/cases/conformance/jsdoc/mod1.js ===
+/// <reference path='./types.d.ts'/>
+class Chunk {
+>Chunk : Symbol(Chunk, Decl(mod1.js, 0, 0))
+
+    constructor() {
+        this.chunk = 1;
+>this.chunk : Symbol(Chunk.chunk, Decl(mod1.js, 2, 19))
+>this : Symbol(Chunk, Decl(mod1.js, 0, 0))
+>chunk : Symbol(Chunk.chunk, Decl(mod1.js, 2, 19))
+    }
+}
+module.exports = Chunk;
+>module.exports : Symbol(exports, Decl(types.d.ts, 2, 21))
+>module : Symbol(export=, Decl(mod1.js, 5, 1))
+>exports : Symbol(export=, Decl(mod1.js, 5, 1))
+>Chunk : Symbol(Chunk, Decl(mod1.js, 0, 0))
+
diff --git a/tests/baselines/reference/jsdocImportType.types b/tests/baselines/reference/jsdocImportType.types
new file mode 100644
index 00000000000..b2ac2764cd5
--- /dev/null
+++ b/tests/baselines/reference/jsdocImportType.types
@@ -0,0 +1,60 @@
+=== tests/cases/conformance/jsdoc/use.js ===
+/// <reference path='./types.d.ts'/>
+/** @typedef {import("./mod1")} C
+ * @type {C} */
+var c;
+>c : Chunk
+
+c.chunk;
+>c.chunk : number
+>c : Chunk
+>chunk : number
+
+const D = require("./mod1");
+>D : typeof Chunk
+>require("./mod1") : typeof Chunk
+>require : (name: string) => any
+>"./mod1" : "./mod1"
+
+/** @type {D} */
+var d;
+>d : Chunk
+
+d.chunk;
+>d.chunk : number
+>d : Chunk
+>chunk : number
+
+=== tests/cases/conformance/jsdoc/types.d.ts ===
+declare function require(name: string): any;
+>require : (name: string) => any
+>name : string
+
+declare var exports: any;
+>exports : any
+
+declare var module: { exports: any };
+>module : { exports: any; }
+>exports : any
+
+=== tests/cases/conformance/jsdoc/mod1.js ===
+/// <reference path='./types.d.ts'/>
+class Chunk {
+>Chunk : Chunk
+
+    constructor() {
+        this.chunk = 1;
+>this.chunk = 1 : 1
+>this.chunk : number
+>this : this
+>chunk : number
+>1 : 1
+    }
+}
+module.exports = Chunk;
+>module.exports = Chunk : typeof Chunk
+>module.exports : any
+>module : { exports: any; }
+>exports : any
+>Chunk : typeof Chunk
+
diff --git a/tests/baselines/reference/jsdocImportType2.symbols b/tests/baselines/reference/jsdocImportType2.symbols
new file mode 100644
index 00000000000..e67d250ca3d
--- /dev/null
+++ b/tests/baselines/reference/jsdocImportType2.symbols
@@ -0,0 +1,54 @@
+=== tests/cases/conformance/jsdoc/use.js ===
+/// <reference path='./types.d.ts'/>
+/** @typedef {import("./mod1")} C
+ * @type {C} */
+var c;
+>c : Symbol(c, Decl(use.js, 3, 3))
+
+c.chunk;
+>c.chunk : Symbol(Chunk.chunk, Decl(mod1.js, 2, 19))
+>c : Symbol(c, Decl(use.js, 3, 3))
+>chunk : Symbol(Chunk.chunk, Decl(mod1.js, 2, 19))
+
+const D = require("./mod1");
+>D : Symbol(D, Decl(use.js, 6, 5))
+>require : Symbol(require, Decl(types.d.ts, 0, 0))
+>"./mod1" : Symbol("tests/cases/conformance/jsdoc/mod1", Decl(mod1.js, 0, 0))
+
+/** @type {D} */
+var d;
+>d : Symbol(d, Decl(use.js, 8, 3))
+
+d.chunk;
+>d.chunk : Symbol(Chunk.chunk, Decl(mod1.js, 2, 19))
+>d : Symbol(d, Decl(use.js, 8, 3))
+>chunk : Symbol(Chunk.chunk, Decl(mod1.js, 2, 19))
+
+=== tests/cases/conformance/jsdoc/types.d.ts ===
+declare function require(name: string): any;
+>require : Symbol(require, Decl(types.d.ts, 0, 0))
+>name : Symbol(name, Decl(types.d.ts, 0, 25))
+
+declare var exports: any;
+>exports : Symbol(exports, Decl(types.d.ts, 1, 11))
+
+declare var module: { exports: any };
+>module : Symbol(module, Decl(types.d.ts, 2, 11))
+>exports : Symbol(exports, Decl(types.d.ts, 2, 21))
+
+=== tests/cases/conformance/jsdoc/mod1.js ===
+/// <reference path='./types.d.ts'/>
+module.exports = class Chunk {
+>module.exports : Symbol(exports, Decl(types.d.ts, 2, 21))
+>module : Symbol(export=, Decl(mod1.js, 0, 0))
+>exports : Symbol(export=, Decl(mod1.js, 0, 0))
+>Chunk : Symbol(Chunk, Decl(mod1.js, 1, 16))
+
+    constructor() {
+        this.chunk = 1;
+>this.chunk : Symbol(Chunk.chunk, Decl(mod1.js, 2, 19))
+>this : Symbol(Chunk, Decl(mod1.js, 1, 16))
+>chunk : Symbol(Chunk.chunk, Decl(mod1.js, 2, 19))
+    }
+}
+
diff --git a/tests/baselines/reference/jsdocImportType2.types b/tests/baselines/reference/jsdocImportType2.types
new file mode 100644
index 00000000000..c0dfb2d925a
--- /dev/null
+++ b/tests/baselines/reference/jsdocImportType2.types
@@ -0,0 +1,59 @@
+=== tests/cases/conformance/jsdoc/use.js ===
+/// <reference path='./types.d.ts'/>
+/** @typedef {import("./mod1")} C
+ * @type {C} */
+var c;
+>c : Chunk
+
+c.chunk;
+>c.chunk : number
+>c : Chunk
+>chunk : number
+
+const D = require("./mod1");
+>D : typeof Chunk
+>require("./mod1") : typeof Chunk
+>require : (name: string) => any
+>"./mod1" : "./mod1"
+
+/** @type {D} */
+var d;
+>d : Chunk
+
+d.chunk;
+>d.chunk : number
+>d : Chunk
+>chunk : number
+
+=== tests/cases/conformance/jsdoc/types.d.ts ===
+declare function require(name: string): any;
+>require : (name: string) => any
+>name : string
+
+declare var exports: any;
+>exports : any
+
+declare var module: { exports: any };
+>module : { exports: any; }
+>exports : any
+
+=== tests/cases/conformance/jsdoc/mod1.js ===
+/// <reference path='./types.d.ts'/>
+module.exports = class Chunk {
+>module.exports = class Chunk {    constructor() {        this.chunk = 1;    }} : typeof Chunk
+>module.exports : any
+>module : { exports: any; }
+>exports : any
+>class Chunk {    constructor() {        this.chunk = 1;    }} : typeof Chunk
+>Chunk : typeof Chunk
+
+    constructor() {
+        this.chunk = 1;
+>this.chunk = 1 : 1
+>this.chunk : number
+>this : this
+>chunk : number
+>1 : 1
+    }
+}
+
diff --git a/tests/baselines/reference/jsdocParamTag2.errors.txt b/tests/baselines/reference/jsdocParamTag2.errors.txt
new file mode 100644
index 00000000000..e19140b3f9d
--- /dev/null
+++ b/tests/baselines/reference/jsdocParamTag2.errors.txt
@@ -0,0 +1,82 @@
+tests/cases/conformance/jsdoc/0.js(56,20): error TS8024: JSDoc '@param' tag has name 'obj', but there is no parameter with that name.
+tests/cases/conformance/jsdoc/0.js(61,19): error TS2459: Type 'string' has no property 'a' and no string index signature.
+tests/cases/conformance/jsdoc/0.js(61,22): error TS2459: Type 'string' has no property 'b' and no string index signature.
+tests/cases/conformance/jsdoc/0.js(63,20): error TS8024: JSDoc '@param' tag has name 'y', but there is no parameter with that name.
+
+
+==== tests/cases/conformance/jsdoc/0.js (4 errors) ====
+    // Object literal syntax
+    /**
+     * @param {{a: string, b: string}} obj
+     * @param {string} x
+     */
+    function good1({a, b}, x) {}
+    /**
+     * @param {{a: string, b: string}} obj
+     * @param {{c: number, d: number}} OBJECTION
+     */
+    function good2({a, b}, {c, d}) {}
+    /**
+     * @param {number} x
+     * @param {{a: string, b: string}} obj
+     * @param {string} y
+     */
+    function good3(x, {a, b}, y) {}
+    /**
+     * @param {{a: string, b: string}} obj
+     */
+    function good4({a, b}) {}
+    
+    // nested object syntax
+    /**
+     * @param {Object} obj
+     * @param {string} obj.a - this is like the saddest way to specify a type
+     * @param {string} obj.b - but it sure does allow a lot of documentation
+     * @param {string} x
+     */
+    function good5({a, b}, x) {}
+    /**
+     * @param {Object} obj
+     * @param {string} obj.a
+     * @param {string} obj.b - but it sure does allow a lot of documentation
+     * @param {Object} OBJECTION - documentation here too
+     * @param {string} OBJECTION.c
+     * @param {string} OBJECTION.d - meh
+     */
+    function good6({a, b}, {c, d}) {}
+    /**
+     * @param {number} x
+     * @param {Object} obj
+     * @param {string} obj.a
+     * @param {string} obj.b
+     * @param {string} y
+     */
+    function good7(x, {a, b}, y) {}
+    /**
+     * @param {Object} obj
+     * @param {string} obj.a
+     * @param {string} obj.b
+     */
+    function good8({a, b}) {}
+    
+    /**
+     * @param {object} obj - this type gets ignored
+                       ~~~
+!!! error TS8024: JSDoc '@param' tag has name 'obj', but there is no parameter with that name.
+     * @param {string} obj.a
+     * @param {string} obj.b - and x's type gets used for both parameters
+     * @param {string} x
+     */
+    function bad1(x, {a, b}) {}
+                      ~
+!!! error TS2459: Type 'string' has no property 'a' and no string index signature.
+                         ~
+!!! error TS2459: Type 'string' has no property 'b' and no string index signature.
+    /**
+     * @param {string} y - here, y's type gets ignored but obj's is fine
+                       ~
+!!! error TS8024: JSDoc '@param' tag has name 'y', but there is no parameter with that name.
+     * @param {{a: string, b: string}} obj
+     */
+    function bad2(x, {a, b}) {}
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsdocParamTag2.symbols b/tests/baselines/reference/jsdocParamTag2.symbols
new file mode 100644
index 00000000000..15eea8946e1
--- /dev/null
+++ b/tests/baselines/reference/jsdocParamTag2.symbols
@@ -0,0 +1,117 @@
+=== tests/cases/conformance/jsdoc/0.js ===
+// Object literal syntax
+/**
+ * @param {{a: string, b: string}} obj
+ * @param {string} x
+ */
+function good1({a, b}, x) {}
+>good1 : Symbol(good1, Decl(0.js, 0, 0))
+>a : Symbol(a, Decl(0.js, 5, 16))
+>b : Symbol(b, Decl(0.js, 5, 18))
+>x : Symbol(x, Decl(0.js, 5, 22))
+
+/**
+ * @param {{a: string, b: string}} obj
+ * @param {{c: number, d: number}} OBJECTION
+ */
+function good2({a, b}, {c, d}) {}
+>good2 : Symbol(good2, Decl(0.js, 5, 28))
+>a : Symbol(a, Decl(0.js, 10, 16))
+>b : Symbol(b, Decl(0.js, 10, 18))
+>c : Symbol(c, Decl(0.js, 10, 24))
+>d : Symbol(d, Decl(0.js, 10, 26))
+
+/**
+ * @param {number} x
+ * @param {{a: string, b: string}} obj
+ * @param {string} y
+ */
+function good3(x, {a, b}, y) {}
+>good3 : Symbol(good3, Decl(0.js, 10, 33))
+>x : Symbol(x, Decl(0.js, 16, 15))
+>a : Symbol(a, Decl(0.js, 16, 19))
+>b : Symbol(b, Decl(0.js, 16, 21))
+>y : Symbol(y, Decl(0.js, 16, 25))
+
+/**
+ * @param {{a: string, b: string}} obj
+ */
+function good4({a, b}) {}
+>good4 : Symbol(good4, Decl(0.js, 16, 31))
+>a : Symbol(a, Decl(0.js, 20, 16))
+>b : Symbol(b, Decl(0.js, 20, 18))
+
+// nested object syntax
+/**
+ * @param {Object} obj
+ * @param {string} obj.a - this is like the saddest way to specify a type
+ * @param {string} obj.b - but it sure does allow a lot of documentation
+ * @param {string} x
+ */
+function good5({a, b}, x) {}
+>good5 : Symbol(good5, Decl(0.js, 20, 25))
+>a : Symbol(a, Decl(0.js, 29, 16))
+>b : Symbol(b, Decl(0.js, 29, 18))
+>x : Symbol(x, Decl(0.js, 29, 22))
+
+/**
+ * @param {Object} obj
+ * @param {string} obj.a
+ * @param {string} obj.b - but it sure does allow a lot of documentation
+ * @param {Object} OBJECTION - documentation here too
+ * @param {string} OBJECTION.c
+ * @param {string} OBJECTION.d - meh
+ */
+function good6({a, b}, {c, d}) {}
+>good6 : Symbol(good6, Decl(0.js, 29, 28))
+>a : Symbol(a, Decl(0.js, 38, 16))
+>b : Symbol(b, Decl(0.js, 38, 18))
+>c : Symbol(c, Decl(0.js, 38, 24))
+>d : Symbol(d, Decl(0.js, 38, 26))
+
+/**
+ * @param {number} x
+ * @param {Object} obj
+ * @param {string} obj.a
+ * @param {string} obj.b
+ * @param {string} y
+ */
+function good7(x, {a, b}, y) {}
+>good7 : Symbol(good7, Decl(0.js, 38, 33))
+>x : Symbol(x, Decl(0.js, 46, 15))
+>a : Symbol(a, Decl(0.js, 46, 19))
+>b : Symbol(b, Decl(0.js, 46, 21))
+>y : Symbol(y, Decl(0.js, 46, 25))
+
+/**
+ * @param {Object} obj
+ * @param {string} obj.a
+ * @param {string} obj.b
+ */
+function good8({a, b}) {}
+>good8 : Symbol(good8, Decl(0.js, 46, 31))
+>a : Symbol(a, Decl(0.js, 52, 16))
+>b : Symbol(b, Decl(0.js, 52, 18))
+
+/**
+ * @param {object} obj - this type gets ignored
+ * @param {string} obj.a
+ * @param {string} obj.b - and x's type gets used for both parameters
+ * @param {string} x
+ */
+function bad1(x, {a, b}) {}
+>bad1 : Symbol(bad1, Decl(0.js, 52, 25))
+>x : Symbol(x, Decl(0.js, 60, 14))
+>a : Symbol(a, Decl(0.js, 60, 18))
+>b : Symbol(b, Decl(0.js, 60, 20))
+
+/**
+ * @param {string} y - here, y's type gets ignored but obj's is fine
+ * @param {{a: string, b: string}} obj
+ */
+function bad2(x, {a, b}) {}
+>bad2 : Symbol(bad2, Decl(0.js, 60, 27))
+>x : Symbol(x, Decl(0.js, 65, 14))
+>a : Symbol(a, Decl(0.js, 65, 18))
+>b : Symbol(b, Decl(0.js, 65, 20))
+
diff --git a/tests/baselines/reference/jsdocParamTag2.types b/tests/baselines/reference/jsdocParamTag2.types
new file mode 100644
index 00000000000..a303403f0b9
--- /dev/null
+++ b/tests/baselines/reference/jsdocParamTag2.types
@@ -0,0 +1,117 @@
+=== tests/cases/conformance/jsdoc/0.js ===
+// Object literal syntax
+/**
+ * @param {{a: string, b: string}} obj
+ * @param {string} x
+ */
+function good1({a, b}, x) {}
+>good1 : ({ a, b }: { a: string; b: string; }, x: string) => void
+>a : string
+>b : string
+>x : string
+
+/**
+ * @param {{a: string, b: string}} obj
+ * @param {{c: number, d: number}} OBJECTION
+ */
+function good2({a, b}, {c, d}) {}
+>good2 : ({ a, b }: { a: string; b: string; }, { c, d }: { c: number; d: number; }) => void
+>a : string
+>b : string
+>c : number
+>d : number
+
+/**
+ * @param {number} x
+ * @param {{a: string, b: string}} obj
+ * @param {string} y
+ */
+function good3(x, {a, b}, y) {}
+>good3 : (x: number, { a, b }: { a: string; b: string; }, y: string) => void
+>x : number
+>a : string
+>b : string
+>y : string
+
+/**
+ * @param {{a: string, b: string}} obj
+ */
+function good4({a, b}) {}
+>good4 : ({ a, b }: { a: string; b: string; }) => void
+>a : string
+>b : string
+
+// nested object syntax
+/**
+ * @param {Object} obj
+ * @param {string} obj.a - this is like the saddest way to specify a type
+ * @param {string} obj.b - but it sure does allow a lot of documentation
+ * @param {string} x
+ */
+function good5({a, b}, x) {}
+>good5 : ({ a, b }: { a: string; b: string; }, x: string) => void
+>a : string
+>b : string
+>x : string
+
+/**
+ * @param {Object} obj
+ * @param {string} obj.a
+ * @param {string} obj.b - but it sure does allow a lot of documentation
+ * @param {Object} OBJECTION - documentation here too
+ * @param {string} OBJECTION.c
+ * @param {string} OBJECTION.d - meh
+ */
+function good6({a, b}, {c, d}) {}
+>good6 : ({ a, b }: { a: string; b: string; }, { c, d }: { c: string; d: string; }) => void
+>a : string
+>b : string
+>c : string
+>d : string
+
+/**
+ * @param {number} x
+ * @param {Object} obj
+ * @param {string} obj.a
+ * @param {string} obj.b
+ * @param {string} y
+ */
+function good7(x, {a, b}, y) {}
+>good7 : (x: number, { a, b }: { a: string; b: string; }, y: string) => void
+>x : number
+>a : string
+>b : string
+>y : string
+
+/**
+ * @param {Object} obj
+ * @param {string} obj.a
+ * @param {string} obj.b
+ */
+function good8({a, b}) {}
+>good8 : ({ a, b }: { a: string; b: string; }) => void
+>a : string
+>b : string
+
+/**
+ * @param {object} obj - this type gets ignored
+ * @param {string} obj.a
+ * @param {string} obj.b - and x's type gets used for both parameters
+ * @param {string} x
+ */
+function bad1(x, {a, b}) {}
+>bad1 : (x: string, { a, b }: string) => void
+>x : string
+>a : any
+>b : any
+
+/**
+ * @param {string} y - here, y's type gets ignored but obj's is fine
+ * @param {{a: string, b: string}} obj
+ */
+function bad2(x, {a, b}) {}
+>bad2 : (x: any, { a, b }: { a: string; b: string; }) => void
+>x : any
+>a : string
+>b : string
+
diff --git a/tests/baselines/reference/jsdocTemplateClass.errors.txt b/tests/baselines/reference/jsdocTemplateClass.errors.txt
new file mode 100644
index 00000000000..4598e9f320f
--- /dev/null
+++ b/tests/baselines/reference/jsdocTemplateClass.errors.txt
@@ -0,0 +1,31 @@
+tests/cases/conformance/jsdoc/templateTagOnClasses.js(24,1): error TS2322: Type 'boolean' is not assignable to type 'number'.
+
+
+==== tests/cases/conformance/jsdoc/templateTagOnClasses.js (1 errors) ====
+    /**
+     * @template {T}
+     * @typedef {(t: T) => T} Id
+     */
+    class Foo {
+        /** @typedef {(t: T) => T} Id2 */
+        /** @param {T} x */
+        constructor (x) {
+            this.a = x
+        }
+        /**
+         * 
+         * @param {T} x 
+         * @param {Id} y
+         * @param {Id2} alpha
+         * @return {T}
+         */
+        foo(x, y, alpha) {
+            return alpha(y(x))
+        }
+    }
+    var f = new Foo(1)
+    var g = new Foo(false)
+    f.a = g.a
+    ~~~
+!!! error TS2322: Type 'boolean' is not assignable to type 'number'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsdocTemplateClass.symbols b/tests/baselines/reference/jsdocTemplateClass.symbols
new file mode 100644
index 00000000000..d80b73bc4ac
--- /dev/null
+++ b/tests/baselines/reference/jsdocTemplateClass.symbols
@@ -0,0 +1,54 @@
+=== tests/cases/conformance/jsdoc/templateTagOnClasses.js ===
+/**
+ * @template {T}
+ * @typedef {(t: T) => T} Id
+ */
+class Foo {
+>Foo : Symbol(Foo, Decl(templateTagOnClasses.js, 0, 0))
+
+    /** @typedef {(t: T) => T} Id2 */
+    /** @param {T} x */
+    constructor (x) {
+>x : Symbol(x, Decl(templateTagOnClasses.js, 7, 17))
+
+        this.a = x
+>this.a : Symbol(Foo.a, Decl(templateTagOnClasses.js, 7, 21))
+>this : Symbol(Foo, Decl(templateTagOnClasses.js, 0, 0))
+>a : Symbol(Foo.a, Decl(templateTagOnClasses.js, 7, 21))
+>x : Symbol(x, Decl(templateTagOnClasses.js, 7, 17))
+    }
+    /**
+     * 
+     * @param {T} x 
+     * @param {Id} y
+     * @param {Id2} alpha
+     * @return {T}
+     */
+    foo(x, y, alpha) {
+>foo : Symbol(Foo.foo, Decl(templateTagOnClasses.js, 9, 5))
+>x : Symbol(x, Decl(templateTagOnClasses.js, 17, 8))
+>y : Symbol(y, Decl(templateTagOnClasses.js, 17, 10))
+>alpha : Symbol(alpha, Decl(templateTagOnClasses.js, 17, 13))
+
+        return alpha(y(x))
+>alpha : Symbol(alpha, Decl(templateTagOnClasses.js, 17, 13))
+>y : Symbol(y, Decl(templateTagOnClasses.js, 17, 10))
+>x : Symbol(x, Decl(templateTagOnClasses.js, 17, 8))
+    }
+}
+var f = new Foo(1)
+>f : Symbol(f, Decl(templateTagOnClasses.js, 21, 3))
+>Foo : Symbol(Foo, Decl(templateTagOnClasses.js, 0, 0))
+
+var g = new Foo(false)
+>g : Symbol(g, Decl(templateTagOnClasses.js, 22, 3))
+>Foo : Symbol(Foo, Decl(templateTagOnClasses.js, 0, 0))
+
+f.a = g.a
+>f.a : Symbol(Foo.a, Decl(templateTagOnClasses.js, 7, 21))
+>f : Symbol(f, Decl(templateTagOnClasses.js, 21, 3))
+>a : Symbol(Foo.a, Decl(templateTagOnClasses.js, 7, 21))
+>g.a : Symbol(Foo.a, Decl(templateTagOnClasses.js, 7, 21))
+>g : Symbol(g, Decl(templateTagOnClasses.js, 22, 3))
+>a : Symbol(Foo.a, Decl(templateTagOnClasses.js, 7, 21))
+
diff --git a/tests/baselines/reference/jsdocTemplateClass.types b/tests/baselines/reference/jsdocTemplateClass.types
new file mode 100644
index 00000000000..aa6a685e34f
--- /dev/null
+++ b/tests/baselines/reference/jsdocTemplateClass.types
@@ -0,0 +1,62 @@
+=== tests/cases/conformance/jsdoc/templateTagOnClasses.js ===
+/**
+ * @template {T}
+ * @typedef {(t: T) => T} Id
+ */
+class Foo {
+>Foo : Foo<T>
+
+    /** @typedef {(t: T) => T} Id2 */
+    /** @param {T} x */
+    constructor (x) {
+>x : T
+
+        this.a = x
+>this.a = x : T
+>this.a : T
+>this : this
+>a : T
+>x : T
+    }
+    /**
+     * 
+     * @param {T} x 
+     * @param {Id} y
+     * @param {Id2} alpha
+     * @return {T}
+     */
+    foo(x, y, alpha) {
+>foo : (x: T, y: (t: T) => T, alpha: (t: T) => T) => T
+>x : T
+>y : (t: T) => T
+>alpha : (t: T) => T
+
+        return alpha(y(x))
+>alpha(y(x)) : T
+>alpha : (t: T) => T
+>y(x) : T
+>y : (t: T) => T
+>x : T
+    }
+}
+var f = new Foo(1)
+>f : Foo<number>
+>new Foo(1) : Foo<number>
+>Foo : typeof Foo
+>1 : 1
+
+var g = new Foo(false)
+>g : Foo<boolean>
+>new Foo(false) : Foo<boolean>
+>Foo : typeof Foo
+>false : false
+
+f.a = g.a
+>f.a = g.a : boolean
+>f.a : number
+>f : Foo<number>
+>a : number
+>g.a : boolean
+>g : Foo<boolean>
+>a : boolean
+
diff --git a/tests/baselines/reference/jsdocTemplateConstructorFunction.errors.txt b/tests/baselines/reference/jsdocTemplateConstructorFunction.errors.txt
new file mode 100644
index 00000000000..225d277c4ff
--- /dev/null
+++ b/tests/baselines/reference/jsdocTemplateConstructorFunction.errors.txt
@@ -0,0 +1,28 @@
+tests/cases/conformance/jsdoc/templateTagOnConstructorFunctions.js(21,1): error TS2322: Type 'false' is not assignable to type 'number'.
+
+
+==== tests/cases/conformance/jsdoc/templateTagOnConstructorFunctions.js (1 errors) ====
+    /**
+     * @template {T}
+     * @typedef {(t: T) => T} Id
+     * @param {T} t
+     */
+    function Zet(t) {
+        /** @type {T} */
+        this.u
+        this.t = t
+    }
+    /**
+     * @param {T} v
+     * @param {Id} id
+     */
+    Zet.prototype.add = function(v, id) {
+        this.u = v || this.t
+        return id(this.u)
+    }
+    var z = new Zet(1)
+    z.t = 2
+    z.u = false
+    ~~~
+!!! error TS2322: Type 'false' is not assignable to type 'number'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsdocTemplateConstructorFunction.symbols b/tests/baselines/reference/jsdocTemplateConstructorFunction.symbols
new file mode 100644
index 00000000000..8cf2ee99e57
--- /dev/null
+++ b/tests/baselines/reference/jsdocTemplateConstructorFunction.symbols
@@ -0,0 +1,57 @@
+=== tests/cases/conformance/jsdoc/templateTagOnConstructorFunctions.js ===
+/**
+ * @template {T}
+ * @typedef {(t: T) => T} Id
+ * @param {T} t
+ */
+function Zet(t) {
+>Zet : Symbol(Zet, Decl(templateTagOnConstructorFunctions.js, 0, 0))
+>t : Symbol(t, Decl(templateTagOnConstructorFunctions.js, 5, 13))
+
+    /** @type {T} */
+    this.u
+    this.t = t
+>t : Symbol(Zet.t, Decl(templateTagOnConstructorFunctions.js, 7, 10))
+>t : Symbol(t, Decl(templateTagOnConstructorFunctions.js, 5, 13))
+}
+/**
+ * @param {T} v
+ * @param {Id} id
+ */
+Zet.prototype.add = function(v, id) {
+>Zet.prototype : Symbol(Zet.add, Decl(templateTagOnConstructorFunctions.js, 9, 1))
+>Zet : Symbol(Zet, Decl(templateTagOnConstructorFunctions.js, 0, 0))
+>prototype : Symbol(Function.prototype, Decl(lib.d.ts, --, --))
+>add : Symbol(Zet.add, Decl(templateTagOnConstructorFunctions.js, 9, 1))
+>v : Symbol(v, Decl(templateTagOnConstructorFunctions.js, 14, 29))
+>id : Symbol(id, Decl(templateTagOnConstructorFunctions.js, 14, 31))
+
+    this.u = v || this.t
+>this.u : Symbol(Zet.u, Decl(templateTagOnConstructorFunctions.js, 5, 17), Decl(templateTagOnConstructorFunctions.js, 14, 37))
+>this : Symbol(Zet, Decl(templateTagOnConstructorFunctions.js, 0, 0))
+>u : Symbol(Zet.u, Decl(templateTagOnConstructorFunctions.js, 5, 17), Decl(templateTagOnConstructorFunctions.js, 14, 37))
+>v : Symbol(v, Decl(templateTagOnConstructorFunctions.js, 14, 29))
+>this.t : Symbol(Zet.t, Decl(templateTagOnConstructorFunctions.js, 7, 10))
+>this : Symbol(Zet, Decl(templateTagOnConstructorFunctions.js, 0, 0))
+>t : Symbol(Zet.t, Decl(templateTagOnConstructorFunctions.js, 7, 10))
+
+    return id(this.u)
+>id : Symbol(id, Decl(templateTagOnConstructorFunctions.js, 14, 31))
+>this.u : Symbol(Zet.u, Decl(templateTagOnConstructorFunctions.js, 5, 17), Decl(templateTagOnConstructorFunctions.js, 14, 37))
+>this : Symbol(Zet, Decl(templateTagOnConstructorFunctions.js, 0, 0))
+>u : Symbol(Zet.u, Decl(templateTagOnConstructorFunctions.js, 5, 17), Decl(templateTagOnConstructorFunctions.js, 14, 37))
+}
+var z = new Zet(1)
+>z : Symbol(z, Decl(templateTagOnConstructorFunctions.js, 18, 3))
+>Zet : Symbol(Zet, Decl(templateTagOnConstructorFunctions.js, 0, 0))
+
+z.t = 2
+>z.t : Symbol(Zet.t, Decl(templateTagOnConstructorFunctions.js, 7, 10))
+>z : Symbol(z, Decl(templateTagOnConstructorFunctions.js, 18, 3))
+>t : Symbol(Zet.t, Decl(templateTagOnConstructorFunctions.js, 7, 10))
+
+z.u = false
+>z.u : Symbol(Zet.u, Decl(templateTagOnConstructorFunctions.js, 5, 17), Decl(templateTagOnConstructorFunctions.js, 14, 37))
+>z : Symbol(z, Decl(templateTagOnConstructorFunctions.js, 18, 3))
+>u : Symbol(Zet.u, Decl(templateTagOnConstructorFunctions.js, 5, 17), Decl(templateTagOnConstructorFunctions.js, 14, 37))
+
diff --git a/tests/baselines/reference/jsdocTemplateConstructorFunction.types b/tests/baselines/reference/jsdocTemplateConstructorFunction.types
new file mode 100644
index 00000000000..f838534aa33
--- /dev/null
+++ b/tests/baselines/reference/jsdocTemplateConstructorFunction.types
@@ -0,0 +1,76 @@
+=== tests/cases/conformance/jsdoc/templateTagOnConstructorFunctions.js ===
+/**
+ * @template {T}
+ * @typedef {(t: T) => T} Id
+ * @param {T} t
+ */
+function Zet(t) {
+>Zet : typeof Zet
+>t : T
+
+    /** @type {T} */
+    this.u
+>this.u : any
+>this : any
+>u : any
+
+    this.t = t
+>this.t = t : T
+>this.t : any
+>this : any
+>t : any
+>t : T
+}
+/**
+ * @param {T} v
+ * @param {Id} id
+ */
+Zet.prototype.add = function(v, id) {
+>Zet.prototype.add = function(v, id) {    this.u = v || this.t    return id(this.u)} : (v: T, id: (t: T) => T) => T
+>Zet.prototype.add : any
+>Zet.prototype : any
+>Zet : typeof Zet
+>prototype : any
+>add : any
+>function(v, id) {    this.u = v || this.t    return id(this.u)} : (v: T, id: (t: T) => T) => T
+>v : T
+>id : (t: T) => T
+
+    this.u = v || this.t
+>this.u = v || this.t : T
+>this.u : T
+>this : Zet
+>u : T
+>v || this.t : T
+>v : T
+>this.t : T
+>this : Zet
+>t : T
+
+    return id(this.u)
+>id(this.u) : T
+>id : (t: T) => T
+>this.u : T
+>this : Zet
+>u : T
+}
+var z = new Zet(1)
+>z : typeof Zet
+>new Zet(1) : typeof Zet
+>Zet : typeof Zet
+>1 : 1
+
+z.t = 2
+>z.t = 2 : 2
+>z.t : number
+>z : typeof Zet
+>t : number
+>2 : 2
+
+z.u = false
+>z.u = false : false
+>z.u : number
+>z : typeof Zet
+>u : number
+>false : false
+
diff --git a/tests/baselines/reference/jsdocTemplateConstructorFunction2.errors.txt b/tests/baselines/reference/jsdocTemplateConstructorFunction2.errors.txt
new file mode 100644
index 00000000000..db54928b288
--- /dev/null
+++ b/tests/baselines/reference/jsdocTemplateConstructorFunction2.errors.txt
@@ -0,0 +1,28 @@
+tests/cases/conformance/jsdoc/templateTagWithNestedTypeLiteral.js(21,1): error TS2322: Type 'false' is not assignable to type 'number'.
+
+
+==== tests/cases/conformance/jsdoc/templateTagWithNestedTypeLiteral.js (1 errors) ====
+    /**
+     * @template {T}
+     * @param {T} t
+     */
+    function Zet(t) {
+        /** @type {T} */
+        this.u
+        this.t = t
+    }
+    /**
+     * @param {T} v
+     * @param {object} o
+     * @param {T} o.nested
+     */
+    Zet.prototype.add = function(v, o) {
+        this.u = v || o.nested
+        return this.u
+    }
+    var z = new Zet(1)
+    z.t = 2
+    z.u = false
+    ~~~
+!!! error TS2322: Type 'false' is not assignable to type 'number'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsdocTemplateConstructorFunction2.symbols b/tests/baselines/reference/jsdocTemplateConstructorFunction2.symbols
new file mode 100644
index 00000000000..1913ee53cdf
--- /dev/null
+++ b/tests/baselines/reference/jsdocTemplateConstructorFunction2.symbols
@@ -0,0 +1,56 @@
+=== tests/cases/conformance/jsdoc/templateTagWithNestedTypeLiteral.js ===
+/**
+ * @template {T}
+ * @param {T} t
+ */
+function Zet(t) {
+>Zet : Symbol(Zet, Decl(templateTagWithNestedTypeLiteral.js, 0, 0))
+>t : Symbol(t, Decl(templateTagWithNestedTypeLiteral.js, 4, 13))
+
+    /** @type {T} */
+    this.u
+    this.t = t
+>t : Symbol(Zet.t, Decl(templateTagWithNestedTypeLiteral.js, 6, 10))
+>t : Symbol(t, Decl(templateTagWithNestedTypeLiteral.js, 4, 13))
+}
+/**
+ * @param {T} v
+ * @param {object} o
+ * @param {T} o.nested
+ */
+Zet.prototype.add = function(v, o) {
+>Zet.prototype : Symbol(Zet.add, Decl(templateTagWithNestedTypeLiteral.js, 8, 1))
+>Zet : Symbol(Zet, Decl(templateTagWithNestedTypeLiteral.js, 0, 0))
+>prototype : Symbol(Function.prototype, Decl(lib.d.ts, --, --))
+>add : Symbol(Zet.add, Decl(templateTagWithNestedTypeLiteral.js, 8, 1))
+>v : Symbol(v, Decl(templateTagWithNestedTypeLiteral.js, 14, 29))
+>o : Symbol(o, Decl(templateTagWithNestedTypeLiteral.js, 14, 31))
+
+    this.u = v || o.nested
+>this.u : Symbol(Zet.u, Decl(templateTagWithNestedTypeLiteral.js, 4, 17), Decl(templateTagWithNestedTypeLiteral.js, 14, 36))
+>this : Symbol(Zet, Decl(templateTagWithNestedTypeLiteral.js, 0, 0))
+>u : Symbol(Zet.u, Decl(templateTagWithNestedTypeLiteral.js, 4, 17), Decl(templateTagWithNestedTypeLiteral.js, 14, 36))
+>v : Symbol(v, Decl(templateTagWithNestedTypeLiteral.js, 14, 29))
+>o.nested : Symbol(nested, Decl(templateTagWithNestedTypeLiteral.js, 12, 3))
+>o : Symbol(o, Decl(templateTagWithNestedTypeLiteral.js, 14, 31))
+>nested : Symbol(nested, Decl(templateTagWithNestedTypeLiteral.js, 12, 3))
+
+    return this.u
+>this.u : Symbol(Zet.u, Decl(templateTagWithNestedTypeLiteral.js, 4, 17), Decl(templateTagWithNestedTypeLiteral.js, 14, 36))
+>this : Symbol(Zet, Decl(templateTagWithNestedTypeLiteral.js, 0, 0))
+>u : Symbol(Zet.u, Decl(templateTagWithNestedTypeLiteral.js, 4, 17), Decl(templateTagWithNestedTypeLiteral.js, 14, 36))
+}
+var z = new Zet(1)
+>z : Symbol(z, Decl(templateTagWithNestedTypeLiteral.js, 18, 3))
+>Zet : Symbol(Zet, Decl(templateTagWithNestedTypeLiteral.js, 0, 0))
+
+z.t = 2
+>z.t : Symbol(Zet.t, Decl(templateTagWithNestedTypeLiteral.js, 6, 10))
+>z : Symbol(z, Decl(templateTagWithNestedTypeLiteral.js, 18, 3))
+>t : Symbol(Zet.t, Decl(templateTagWithNestedTypeLiteral.js, 6, 10))
+
+z.u = false
+>z.u : Symbol(Zet.u, Decl(templateTagWithNestedTypeLiteral.js, 4, 17), Decl(templateTagWithNestedTypeLiteral.js, 14, 36))
+>z : Symbol(z, Decl(templateTagWithNestedTypeLiteral.js, 18, 3))
+>u : Symbol(Zet.u, Decl(templateTagWithNestedTypeLiteral.js, 4, 17), Decl(templateTagWithNestedTypeLiteral.js, 14, 36))
+
diff --git a/tests/baselines/reference/jsdocTemplateConstructorFunction2.types b/tests/baselines/reference/jsdocTemplateConstructorFunction2.types
new file mode 100644
index 00000000000..9f0a55289f3
--- /dev/null
+++ b/tests/baselines/reference/jsdocTemplateConstructorFunction2.types
@@ -0,0 +1,74 @@
+=== tests/cases/conformance/jsdoc/templateTagWithNestedTypeLiteral.js ===
+/**
+ * @template {T}
+ * @param {T} t
+ */
+function Zet(t) {
+>Zet : typeof Zet
+>t : T
+
+    /** @type {T} */
+    this.u
+>this.u : any
+>this : any
+>u : any
+
+    this.t = t
+>this.t = t : T
+>this.t : any
+>this : any
+>t : any
+>t : T
+}
+/**
+ * @param {T} v
+ * @param {object} o
+ * @param {T} o.nested
+ */
+Zet.prototype.add = function(v, o) {
+>Zet.prototype.add = function(v, o) {    this.u = v || o.nested    return this.u} : (v: T, o: { nested: T; }) => T
+>Zet.prototype.add : any
+>Zet.prototype : any
+>Zet : typeof Zet
+>prototype : any
+>add : any
+>function(v, o) {    this.u = v || o.nested    return this.u} : (v: T, o: { nested: T; }) => T
+>v : T
+>o : { nested: T; }
+
+    this.u = v || o.nested
+>this.u = v || o.nested : T
+>this.u : T
+>this : Zet
+>u : T
+>v || o.nested : T
+>v : T
+>o.nested : T
+>o : { nested: T; }
+>nested : T
+
+    return this.u
+>this.u : T
+>this : Zet
+>u : T
+}
+var z = new Zet(1)
+>z : typeof Zet
+>new Zet(1) : typeof Zet
+>Zet : typeof Zet
+>1 : 1
+
+z.t = 2
+>z.t = 2 : 2
+>z.t : number
+>z : typeof Zet
+>t : number
+>2 : 2
+
+z.u = false
+>z.u = false : false
+>z.u : number
+>z : typeof Zet
+>u : number
+>false : false
+
diff --git a/tests/baselines/reference/jsdocTemplateTag.errors.txt b/tests/baselines/reference/jsdocTemplateTag.errors.txt
new file mode 100644
index 00000000000..c8b3e92f8c0
--- /dev/null
+++ b/tests/baselines/reference/jsdocTemplateTag.errors.txt
@@ -0,0 +1,30 @@
+tests/cases/conformance/jsdoc/forgot.js(23,19): error TS2339: Property 'animate' does not exist on type 'Element'.
+
+
+==== tests/cases/conformance/jsdoc/forgot.js (1 errors) ====
+    /**
+     * @param {T} a
+     * @template T
+     */
+    function f(a) {
+        return () => a
+    }
+    let n = f(1)()
+    
+    /**
+     * @param {T} a
+     * @template T
+     * @returns {function(): T}
+     */
+    function g(a) {
+        return () => a
+    }
+    let s = g('hi')()
+    
+    /**
+     * @param {Array.<Object>} keyframes - Can't look up types on Element since it's a global in another file. (But it shouldn't crash).
+     */
+    Element.prototype.animate = function(keyframes) {};
+                      ~~~~~~~
+!!! error TS2339: Property 'animate' does not exist on type 'Element'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsdocTemplateTag.symbols b/tests/baselines/reference/jsdocTemplateTag.symbols
index 98eee628178..235f26c330e 100644
--- a/tests/baselines/reference/jsdocTemplateTag.symbols
+++ b/tests/baselines/reference/jsdocTemplateTag.symbols
@@ -30,3 +30,12 @@ let s = g('hi')()
 >s : Symbol(s, Decl(forgot.js, 17, 3))
 >g : Symbol(g, Decl(forgot.js, 7, 14))
 
+/**
+ * @param {Array.<Object>} keyframes - Can't look up types on Element since it's a global in another file. (But it shouldn't crash).
+ */
+Element.prototype.animate = function(keyframes) {};
+>Element.prototype : Symbol(prototype, Decl(lib.dom.d.ts, --, --))
+>Element : Symbol(Element, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
+>prototype : Symbol(prototype, Decl(lib.dom.d.ts, --, --))
+>keyframes : Symbol(keyframes, Decl(forgot.js, 22, 37))
+
diff --git a/tests/baselines/reference/jsdocTemplateTag.types b/tests/baselines/reference/jsdocTemplateTag.types
index b1d8c46720d..7917329b3e6 100644
--- a/tests/baselines/reference/jsdocTemplateTag.types
+++ b/tests/baselines/reference/jsdocTemplateTag.types
@@ -38,3 +38,16 @@ let s = g('hi')()
 >g : <T>(a: T) => () => T
 >'hi' : "hi"
 
+/**
+ * @param {Array.<Object>} keyframes - Can't look up types on Element since it's a global in another file. (But it shouldn't crash).
+ */
+Element.prototype.animate = function(keyframes) {};
+>Element.prototype.animate = function(keyframes) {} : (keyframes: any[]) => void
+>Element.prototype.animate : any
+>Element.prototype : Element
+>Element : { new (): Element; prototype: Element; }
+>prototype : Element
+>animate : any
+>function(keyframes) {} : (keyframes: any[]) => void
+>keyframes : any[]
+
diff --git a/tests/baselines/reference/keyofAndForIn.types b/tests/baselines/reference/keyofAndForIn.types
index c4997c05bfe..9de1b651843 100644
--- a/tests/baselines/reference/keyofAndForIn.types
+++ b/tests/baselines/reference/keyofAndForIn.types
@@ -33,14 +33,14 @@ function f1<K extends string, T>(obj: { [P in K]: T }, k: K) {
 >k1 : K
     }
     for (let k2 in obj) {
->k2 : K
+>k2 : Extract<K, string>
 >obj : { [P in K]: T; }
 
         let x2 = obj[k2];
->x2 : { [P in K]: T; }[K]
->obj[k2] : { [P in K]: T; }[K]
+>x2 : { [P in K]: T; }[Extract<K, string>]
+>obj[k2] : { [P in K]: T; }[Extract<K, string>]
 >obj : { [P in K]: T; }
->k2 : K
+>k2 : Extract<K, string>
     }
 }
 
@@ -76,14 +76,14 @@ function f2<T>(obj: { [P in keyof T]: T[P] }, k: keyof T) {
 >k1 : keyof T
     }
     for (let k2 in obj) {
->k2 : keyof T
+>k2 : Extract<keyof T, string>
 >obj : { [P in keyof T]: T[P]; }
 
         let x2 = obj[k2];
->x2 : { [P in keyof T]: T[P]; }[keyof T]
->obj[k2] : { [P in keyof T]: T[P]; }[keyof T]
+>x2 : { [P in keyof T]: T[P]; }[Extract<keyof T, string>]
+>obj[k2] : { [P in keyof T]: T[P]; }[Extract<keyof T, string>]
 >obj : { [P in keyof T]: T[P]; }
->k2 : keyof T
+>k2 : Extract<keyof T, string>
     }
 }
 
@@ -121,13 +121,13 @@ function f3<T, K extends keyof T>(obj: { [P in K]: T[P] }, k: K) {
 >k1 : K
     }
     for (let k2 in obj) {
->k2 : K
+>k2 : Extract<K, string>
 >obj : { [P in K]: T[P]; }
 
         let x2 = obj[k2];
->x2 : { [P in K]: T[P]; }[K]
->obj[k2] : { [P in K]: T[P]; }[K]
+>x2 : { [P in K]: T[P]; }[Extract<K, string>]
+>obj[k2] : { [P in K]: T[P]; }[Extract<K, string>]
 >obj : { [P in K]: T[P]; }
->k2 : K
+>k2 : Extract<K, string>
     }
 }
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.js b/tests/baselines/reference/keyofAndIndexedAccess.js
index 1ee6bfc218b..f0af336563c 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.js
+++ b/tests/baselines/reference/keyofAndIndexedAccess.js
@@ -188,13 +188,13 @@ function f51<T, K extends keyof T>(k: K, s: string) {
     const x2 = k as string;
 }
 
-function f52<T>(obj: { [x: string]: boolean }, k: keyof T, s: string, n: number) {
+function f52<T>(obj: { [x: string]: boolean }, k: Exclude<keyof T, symbol>, s: string, n: number) {
     const x1 = obj[s];
     const x2 = obj[n];
     const x3 = obj[k];
 }
 
-function f53<T, K extends keyof T>(obj: { [x: string]: boolean }, k: K, s: string, n: number) {
+function f53<T, K extends Exclude<keyof T, symbol>>(obj: { [x: string]: boolean }, k: K, s: string, n: number) {
     const x1 = obj[s];
     const x2 = obj[n];
     const x3 = obj[k];
@@ -554,7 +554,7 @@ class AnotherSampleClass<T> extends SampleClass<T & Foo> {
 new AnotherSampleClass({});
 
 // Positive repro from #17166
-function f3<T, K extends keyof T>(t: T, k: K, tk: T[K]): void {
+function f3<T, K extends Extract<keyof T, string>>(t: T, k: K, tk: T[K]): void {
     for (let key in t) {
         key = k // ok, K ==> keyof T
         t[key] = tk; // ok, T[K] ==> T[keyof T]
@@ -565,6 +565,24 @@ function f3<T, K extends keyof T>(t: T, k: K, tk: T[K]): void {
 type Predicates<TaggedRecord> = {
   [T in keyof TaggedRecord]: (variant: TaggedRecord[keyof TaggedRecord]) => variant is TaggedRecord[T]
 }
+
+// Repro from #23618
+
+type DBBoolTable<K extends string> = { [k in K]: 0 | 1 } 
+enum Flag {
+    FLAG_1 = "flag_1",
+    FLAG_2 = "flag_2"
+}
+
+type SimpleDBRecord<Flag extends string> = { staticField: number } & DBBoolTable<Flag>
+function getFlagsFromSimpleRecord<Flag extends string>(record: SimpleDBRecord<Flag>, flags: Flag[]) {
+    return record[flags[0]];
+}
+
+type DynamicDBRecord<Flag extends string> = ({ dynamicField: number } | { dynamicField: string }) & DBBoolTable<Flag>
+function getFlagsFromDynamicRecord<Flag extends string>(record: DynamicDBRecord<Flag>, flags: Flag[]) {
+    return record[flags[0]];
+}
 
 
 //// [keyofAndIndexedAccess.js]
@@ -948,6 +966,17 @@ function f3(t, k, tk) {
         t[key] = tk; // ok, T[K] ==> T[keyof T]
     }
 }
+var Flag;
+(function (Flag) {
+    Flag["FLAG_1"] = "flag_1";
+    Flag["FLAG_2"] = "flag_2";
+})(Flag || (Flag = {}));
+function getFlagsFromSimpleRecord(record, flags) {
+    return record[flags[0]];
+}
+function getFlagsFromDynamicRecord(record, flags) {
+    return record[flags[0]];
+}
 
 
 //// [keyofAndIndexedAccess.d.ts]
@@ -1048,8 +1077,8 @@ declare function f50<T>(k: keyof T, s: string): void;
 declare function f51<T, K extends keyof T>(k: K, s: string): void;
 declare function f52<T>(obj: {
     [x: string]: boolean;
-}, k: keyof T, s: string, n: number): void;
-declare function f53<T, K extends keyof T>(obj: {
+}, k: Exclude<keyof T, symbol>, s: string, n: number): void;
+declare function f53<T, K extends Exclude<keyof T, symbol>>(obj: {
     [x: string]: boolean;
 }, k: K, s: string, n: number): void;
 declare function f54<T>(obj: T, key: keyof T): void;
@@ -1208,7 +1237,24 @@ declare class AnotherSampleClass<T> extends SampleClass<T & Foo> {
     constructor(props: T);
     brokenMethod(): void;
 }
-declare function f3<T, K extends keyof T>(t: T, k: K, tk: T[K]): void;
+declare function f3<T, K extends Extract<keyof T, string>>(t: T, k: K, tk: T[K]): void;
 declare type Predicates<TaggedRecord> = {
     [T in keyof TaggedRecord]: (variant: TaggedRecord[keyof TaggedRecord]) => variant is TaggedRecord[T];
 };
+declare type DBBoolTable<K extends string> = {
+    [k in K]: 0 | 1;
+};
+declare enum Flag {
+    FLAG_1 = "flag_1",
+    FLAG_2 = "flag_2"
+}
+declare type SimpleDBRecord<Flag extends string> = {
+    staticField: number;
+} & DBBoolTable<Flag>;
+declare function getFlagsFromSimpleRecord<Flag extends string>(record: SimpleDBRecord<Flag>, flags: Flag[]): SimpleDBRecord<Flag>[Flag];
+declare type DynamicDBRecord<Flag extends string> = ({
+    dynamicField: number;
+} | {
+    dynamicField: string;
+}) & DBBoolTable<Flag>;
+declare function getFlagsFromDynamicRecord<Flag extends string>(record: DynamicDBRecord<Flag>, flags: Flag[]): DynamicDBRecord<Flag>[Flag];
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.symbols b/tests/baselines/reference/keyofAndIndexedAccess.symbols
index c1a3449991f..27c7128e42d 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.symbols
+++ b/tests/baselines/reference/keyofAndIndexedAccess.symbols
@@ -651,25 +651,26 @@ function f51<T, K extends keyof T>(k: K, s: string) {
 >k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 184, 35))
 }
 
-function f52<T>(obj: { [x: string]: boolean }, k: keyof T, s: string, n: number) {
+function f52<T>(obj: { [x: string]: boolean }, k: Exclude<keyof T, symbol>, s: string, n: number) {
 >f52 : Symbol(f52, Decl(keyofAndIndexedAccess.ts, 187, 1))
 >T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 189, 13))
 >obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 189, 16))
 >x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 189, 24))
 >k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 189, 46))
+>Exclude : Symbol(Exclude, Decl(lib.d.ts, --, --))
 >T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 189, 13))
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 189, 58))
->n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 189, 69))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 189, 75))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 189, 86))
 
     const x1 = obj[s];
 >x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 190, 9))
 >obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 189, 16))
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 189, 58))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 189, 75))
 
     const x2 = obj[n];
 >x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 191, 9))
 >obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 189, 16))
->n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 189, 69))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 189, 86))
 
     const x3 = obj[k];
 >x3 : Symbol(x3, Decl(keyofAndIndexedAccess.ts, 192, 9))
@@ -677,32 +678,33 @@ function f52<T>(obj: { [x: string]: boolean }, k: keyof T, s: string, n: number)
 >k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 189, 46))
 }
 
-function f53<T, K extends keyof T>(obj: { [x: string]: boolean }, k: K, s: string, n: number) {
+function f53<T, K extends Exclude<keyof T, symbol>>(obj: { [x: string]: boolean }, k: K, s: string, n: number) {
 >f53 : Symbol(f53, Decl(keyofAndIndexedAccess.ts, 193, 1))
 >T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 195, 13))
 >K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 195, 15))
+>Exclude : Symbol(Exclude, Decl(lib.d.ts, --, --))
 >T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 195, 13))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 195, 35))
->x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 195, 43))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 195, 65))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 195, 52))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 195, 60))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 195, 82))
 >K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 195, 15))
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 195, 71))
->n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 195, 82))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 195, 88))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 195, 99))
 
     const x1 = obj[s];
 >x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 196, 9))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 195, 35))
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 195, 71))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 195, 52))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 195, 88))
 
     const x2 = obj[n];
 >x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 197, 9))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 195, 35))
->n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 195, 82))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 195, 52))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 195, 99))
 
     const x3 = obj[k];
 >x3 : Symbol(x3, Decl(keyofAndIndexedAccess.ts, 198, 9))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 195, 35))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 195, 65))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 195, 52))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 195, 82))
 }
 
 function f54<T>(obj: T, key: keyof T) {
@@ -1963,31 +1965,32 @@ new AnotherSampleClass({});
 >AnotherSampleClass : Symbol(AnotherSampleClass, Decl(keyofAndIndexedAccess.ts, 540, 54))
 
 // Positive repro from #17166
-function f3<T, K extends keyof T>(t: T, k: K, tk: T[K]): void {
+function f3<T, K extends Extract<keyof T, string>>(t: T, k: K, tk: T[K]): void {
 >f3 : Symbol(f3, Decl(keyofAndIndexedAccess.ts, 552, 27))
 >T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 555, 12))
 >K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 555, 14))
+>Extract : Symbol(Extract, Decl(lib.d.ts, --, --))
 >T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 555, 12))
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 555, 34))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 555, 51))
 >T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 555, 12))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 555, 39))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 555, 56))
 >K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 555, 14))
->tk : Symbol(tk, Decl(keyofAndIndexedAccess.ts, 555, 45))
+>tk : Symbol(tk, Decl(keyofAndIndexedAccess.ts, 555, 62))
 >T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 555, 12))
 >K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 555, 14))
 
     for (let key in t) {
 >key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 556, 12))
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 555, 34))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 555, 51))
 
         key = k // ok, K ==> keyof T
 >key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 556, 12))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 555, 39))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 555, 56))
 
         t[key] = tk; // ok, T[K] ==> T[keyof T]
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 555, 34))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 555, 51))
 >key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 556, 12))
->tk : Symbol(tk, Decl(keyofAndIndexedAccess.ts, 555, 45))
+>tk : Symbol(tk, Decl(keyofAndIndexedAccess.ts, 555, 62))
     }
 }
 
@@ -2007,3 +2010,64 @@ type Predicates<TaggedRecord> = {
 >T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 564, 3))
 }
 
+// Repro from #23618
+
+type DBBoolTable<K extends string> = { [k in K]: 0 | 1 } 
+>DBBoolTable : Symbol(DBBoolTable, Decl(keyofAndIndexedAccess.ts, 565, 1))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 569, 17))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 569, 40))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 569, 17))
+
+enum Flag {
+>Flag : Symbol(Flag, Decl(keyofAndIndexedAccess.ts, 569, 56))
+
+    FLAG_1 = "flag_1",
+>FLAG_1 : Symbol(Flag.FLAG_1, Decl(keyofAndIndexedAccess.ts, 570, 11))
+
+    FLAG_2 = "flag_2"
+>FLAG_2 : Symbol(Flag.FLAG_2, Decl(keyofAndIndexedAccess.ts, 571, 22))
+}
+
+type SimpleDBRecord<Flag extends string> = { staticField: number } & DBBoolTable<Flag>
+>SimpleDBRecord : Symbol(SimpleDBRecord, Decl(keyofAndIndexedAccess.ts, 573, 1))
+>Flag : Symbol(Flag, Decl(keyofAndIndexedAccess.ts, 575, 20))
+>staticField : Symbol(staticField, Decl(keyofAndIndexedAccess.ts, 575, 44))
+>DBBoolTable : Symbol(DBBoolTable, Decl(keyofAndIndexedAccess.ts, 565, 1))
+>Flag : Symbol(Flag, Decl(keyofAndIndexedAccess.ts, 575, 20))
+
+function getFlagsFromSimpleRecord<Flag extends string>(record: SimpleDBRecord<Flag>, flags: Flag[]) {
+>getFlagsFromSimpleRecord : Symbol(getFlagsFromSimpleRecord, Decl(keyofAndIndexedAccess.ts, 575, 86))
+>Flag : Symbol(Flag, Decl(keyofAndIndexedAccess.ts, 576, 34))
+>record : Symbol(record, Decl(keyofAndIndexedAccess.ts, 576, 55))
+>SimpleDBRecord : Symbol(SimpleDBRecord, Decl(keyofAndIndexedAccess.ts, 573, 1))
+>Flag : Symbol(Flag, Decl(keyofAndIndexedAccess.ts, 576, 34))
+>flags : Symbol(flags, Decl(keyofAndIndexedAccess.ts, 576, 84))
+>Flag : Symbol(Flag, Decl(keyofAndIndexedAccess.ts, 576, 34))
+
+    return record[flags[0]];
+>record : Symbol(record, Decl(keyofAndIndexedAccess.ts, 576, 55))
+>flags : Symbol(flags, Decl(keyofAndIndexedAccess.ts, 576, 84))
+}
+
+type DynamicDBRecord<Flag extends string> = ({ dynamicField: number } | { dynamicField: string }) & DBBoolTable<Flag>
+>DynamicDBRecord : Symbol(DynamicDBRecord, Decl(keyofAndIndexedAccess.ts, 578, 1))
+>Flag : Symbol(Flag, Decl(keyofAndIndexedAccess.ts, 580, 21))
+>dynamicField : Symbol(dynamicField, Decl(keyofAndIndexedAccess.ts, 580, 46))
+>dynamicField : Symbol(dynamicField, Decl(keyofAndIndexedAccess.ts, 580, 73))
+>DBBoolTable : Symbol(DBBoolTable, Decl(keyofAndIndexedAccess.ts, 565, 1))
+>Flag : Symbol(Flag, Decl(keyofAndIndexedAccess.ts, 580, 21))
+
+function getFlagsFromDynamicRecord<Flag extends string>(record: DynamicDBRecord<Flag>, flags: Flag[]) {
+>getFlagsFromDynamicRecord : Symbol(getFlagsFromDynamicRecord, Decl(keyofAndIndexedAccess.ts, 580, 117))
+>Flag : Symbol(Flag, Decl(keyofAndIndexedAccess.ts, 581, 35))
+>record : Symbol(record, Decl(keyofAndIndexedAccess.ts, 581, 56))
+>DynamicDBRecord : Symbol(DynamicDBRecord, Decl(keyofAndIndexedAccess.ts, 578, 1))
+>Flag : Symbol(Flag, Decl(keyofAndIndexedAccess.ts, 581, 35))
+>flags : Symbol(flags, Decl(keyofAndIndexedAccess.ts, 581, 86))
+>Flag : Symbol(Flag, Decl(keyofAndIndexedAccess.ts, 581, 35))
+
+    return record[flags[0]];
+>record : Symbol(record, Decl(keyofAndIndexedAccess.ts, 581, 56))
+>flags : Symbol(flags, Decl(keyofAndIndexedAccess.ts, 581, 86))
+}
+
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.types b/tests/baselines/reference/keyofAndIndexedAccess.types
index 694abf7d10e..de35c620d33 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.types
+++ b/tests/baselines/reference/keyofAndIndexedAccess.types
@@ -59,10 +59,10 @@ const enum E { A, B, C }
 >C : E.C
 
 type K00 = keyof any;  // string
->K00 : string
+>K00 : string | number | symbol
 
 type K01 = keyof string;  // "toString" | "charAt" | ...
->K01 : "length" | "toString" | "concat" | "slice" | "indexOf" | "lastIndexOf" | "charAt" | "charCodeAt" | "localeCompare" | "match" | "replace" | "search" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "substr" | "valueOf"
+>K01 : number | "length" | "toString" | "concat" | "slice" | "indexOf" | "lastIndexOf" | "charAt" | "charCodeAt" | "localeCompare" | "match" | "replace" | "search" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "substr" | "valueOf"
 
 type K02 = keyof number;  // "toString" | "toFixed" | "toExponential" | ...
 >K02 : "toString" | "toLocaleString" | "valueOf" | "toFixed" | "toExponential" | "toPrecision"
@@ -88,11 +88,11 @@ type K10 = keyof Shape;  // "name" | "width" | "height" | "visible"
 >Shape : Shape
 
 type K11 = keyof Shape[];  // "length" | "toString" | ...
->K11 : "length" | "toString" | "toLocaleString" | "push" | "pop" | "concat" | "join" | "reverse" | "shift" | "slice" | "sort" | "splice" | "unshift" | "indexOf" | "lastIndexOf" | "every" | "some" | "forEach" | "map" | "filter" | "reduce" | "reduceRight"
+>K11 : number | "length" | "toString" | "toLocaleString" | "push" | "pop" | "concat" | "join" | "reverse" | "shift" | "slice" | "sort" | "splice" | "unshift" | "indexOf" | "lastIndexOf" | "every" | "some" | "forEach" | "map" | "filter" | "reduce" | "reduceRight"
 >Shape : Shape
 
 type K12 = keyof Dictionary<Shape>;  // string
->K12 : string
+>K12 : string | number
 >Dictionary : Dictionary<T>
 >Shape : Shape
 
@@ -108,7 +108,7 @@ type K15 = keyof E;  // "toString" | "toFixed" | "toExponential" | ...
 >E : E
 
 type K16 = keyof [string, number];  // "0" | "1" | "length" | "toString" | ...
->K16 : "0" | "1" | "length" | "toString" | "toLocaleString" | "push" | "pop" | "concat" | "join" | "reverse" | "shift" | "slice" | "sort" | "splice" | "unshift" | "indexOf" | "lastIndexOf" | "every" | "some" | "forEach" | "map" | "filter" | "reduce" | "reduceRight"
+>K16 : number | "0" | "1" | "length" | "toString" | "toLocaleString" | "push" | "pop" | "concat" | "join" | "reverse" | "shift" | "slice" | "sort" | "splice" | "unshift" | "indexOf" | "lastIndexOf" | "every" | "some" | "forEach" | "map" | "filter" | "reduce" | "reduceRight"
 
 type K17 = keyof (Shape | Item);  // "name"
 >K17 : "name"
@@ -121,7 +121,7 @@ type K18 = keyof (Shape & Item);  // "name" | "width" | "height" | "visible" | "
 >Item : Item
 
 type K19 = keyof NumericallyIndexed<Shape> // never
->K19 : never
+>K19 : number
 >NumericallyIndexed : NumericallyIndexed<T>
 >Shape : Shape
 
@@ -136,7 +136,7 @@ type K20 = KeyOf<Shape>;  // "name" | "width" | "height" | "visible"
 >Shape : Shape
 
 type K21 = KeyOf<Dictionary<Shape>>;  // string
->K21 : string
+>K21 : string | number
 >KeyOf : keyof T
 >Dictionary : Dictionary<T>
 >Shape : Shape
@@ -756,12 +756,13 @@ function f51<T, K extends keyof T>(k: K, s: string) {
 >k : K
 }
 
-function f52<T>(obj: { [x: string]: boolean }, k: keyof T, s: string, n: number) {
->f52 : <T>(obj: { [x: string]: boolean; }, k: keyof T, s: string, n: number) => void
+function f52<T>(obj: { [x: string]: boolean }, k: Exclude<keyof T, symbol>, s: string, n: number) {
+>f52 : <T>(obj: { [x: string]: boolean; }, k: Exclude<keyof T, symbol>, s: string, n: number) => void
 >T : T
 >obj : { [x: string]: boolean; }
 >x : string
->k : keyof T
+>k : Exclude<keyof T, symbol>
+>Exclude : Exclude<T, U>
 >T : T
 >s : string
 >n : number
@@ -779,16 +780,17 @@ function f52<T>(obj: { [x: string]: boolean }, k: keyof T, s: string, n: number)
 >n : number
 
     const x3 = obj[k];
->x3 : { [x: string]: boolean; }[keyof T]
->obj[k] : { [x: string]: boolean; }[keyof T]
+>x3 : { [x: string]: boolean; }[Exclude<keyof T, symbol>]
+>obj[k] : { [x: string]: boolean; }[Exclude<keyof T, symbol>]
 >obj : { [x: string]: boolean; }
->k : keyof T
+>k : Exclude<keyof T, symbol>
 }
 
-function f53<T, K extends keyof T>(obj: { [x: string]: boolean }, k: K, s: string, n: number) {
->f53 : <T, K extends keyof T>(obj: { [x: string]: boolean; }, k: K, s: string, n: number) => void
+function f53<T, K extends Exclude<keyof T, symbol>>(obj: { [x: string]: boolean }, k: K, s: string, n: number) {
+>f53 : <T, K extends Exclude<keyof T, symbol>>(obj: { [x: string]: boolean; }, k: K, s: string, n: number) => void
 >T : T
 >K : K
+>Exclude : Exclude<T, U>
 >T : T
 >obj : { [x: string]: boolean; }
 >x : string
@@ -825,7 +827,7 @@ function f54<T>(obj: T, key: keyof T) {
 >T : T
 
     for (let s in obj[key]) {
->s : keyof T[keyof T]
+>s : Extract<keyof T[keyof T], string>
 >obj[key] : T[keyof T]
 >obj : T
 >key : keyof T
@@ -850,7 +852,7 @@ function f55<T, K extends keyof T>(obj: T, key: K) {
 >K : K
 
     for (let s in obj[key]) {
->s : keyof T[K]
+>s : Extract<keyof T[K], string>
 >obj[key] : T[K]
 >obj : T
 >key : K
@@ -873,26 +875,26 @@ function f60<T>(source: T, target: T) {
 >T : T
 
     for (let k in source) {
->k : keyof T
+>k : Extract<keyof T, string>
 >source : T
 
         target[k] = source[k];
->target[k] = source[k] : T[keyof T]
->target[k] : T[keyof T]
+>target[k] = source[k] : T[Extract<keyof T, string>]
+>target[k] : T[Extract<keyof T, string>]
 >target : T
->k : keyof T
->source[k] : T[keyof T]
+>k : Extract<keyof T, string>
+>source[k] : T[Extract<keyof T, string>]
 >source : T
->k : keyof T
+>k : Extract<keyof T, string>
     }
 }
 
 function f70(func: <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void) {
->f70 : (func: <T, U>(k1: keyof (T | U), k2: keyof T | keyof U) => void) => void
->func : <T, U>(k1: keyof (T | U), k2: keyof T | keyof U) => void
+>f70 : (func: <T, U>(k1: keyof T & keyof U, k2: keyof T | keyof U) => void) => void
+>func : <T, U>(k1: keyof T & keyof U, k2: keyof T | keyof U) => void
 >T : T
 >U : U
->k1 : keyof (T | U)
+>k1 : keyof T & keyof U
 >T : T
 >U : U
 >k2 : keyof T | keyof U
@@ -901,7 +903,7 @@ function f70(func: <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void) {
 
     func<{ a: any, b: any }, { a: any, c: any }>('a', 'a');
 >func<{ a: any, b: any }, { a: any, c: any }>('a', 'a') : void
->func : <T, U>(k1: keyof (T | U), k2: keyof T | keyof U) => void
+>func : <T, U>(k1: keyof T & keyof U, k2: keyof T | keyof U) => void
 >a : any
 >b : any
 >a : any
@@ -911,7 +913,7 @@ function f70(func: <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void) {
 
     func<{ a: any, b: any }, { a: any, c: any }>('a', 'b');
 >func<{ a: any, b: any }, { a: any, c: any }>('a', 'b') : void
->func : <T, U>(k1: keyof (T | U), k2: keyof T | keyof U) => void
+>func : <T, U>(k1: keyof T & keyof U, k2: keyof T | keyof U) => void
 >a : any
 >b : any
 >a : any
@@ -921,7 +923,7 @@ function f70(func: <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void) {
 
     func<{ a: any, b: any }, { a: any, c: any }>('a', 'c');
 >func<{ a: any, b: any }, { a: any, c: any }>('a', 'c') : void
->func : <T, U>(k1: keyof (T | U), k2: keyof T | keyof U) => void
+>func : <T, U>(k1: keyof T & keyof U, k2: keyof T | keyof U) => void
 >a : any
 >b : any
 >a : any
@@ -1095,8 +1097,8 @@ function f73(func: <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[
 }
 
 function f74(func: <T, U, K extends keyof (T | U)>(x: T, y: U, k: K) => (T | U)[K]) {
->f74 : (func: <T, U, K extends keyof (T | U)>(x: T, y: U, k: K) => (T | U)[K]) => void
->func : <T, U, K extends keyof (T | U)>(x: T, y: U, k: K) => (T | U)[K]
+>f74 : (func: <T, U, K extends keyof T & keyof U>(x: T, y: U, k: K) => (T | U)[K]) => void
+>func : <T, U, K extends keyof T & keyof U>(x: T, y: U, k: K) => (T | U)[K]
 >T : T
 >U : U
 >K : K
@@ -1115,7 +1117,7 @@ function f74(func: <T, U, K extends keyof (T | U)>(x: T, y: U, k: K) => (T | U)[
     let a = func({ a: 1, b: "hello" }, { a: 2, b: true }, 'a');  // number
 >a : number
 >func({ a: 1, b: "hello" }, { a: 2, b: true }, 'a') : number
->func : <T, U, K extends keyof (T | U)>(x: T, y: U, k: K) => (T | U)[K]
+>func : <T, U, K extends keyof T & keyof U>(x: T, y: U, k: K) => (T | U)[K]
 >{ a: 1, b: "hello" } : { a: number; b: string; }
 >a : number
 >1 : 1
@@ -1131,7 +1133,7 @@ function f74(func: <T, U, K extends keyof (T | U)>(x: T, y: U, k: K) => (T | U)[
     let b = func({ a: 1, b: "hello" }, { a: 2, b: true }, 'b');  // string | boolean
 >b : string | boolean
 >func({ a: 1, b: "hello" }, { a: 2, b: true }, 'b') : string | boolean
->func : <T, U, K extends keyof (T | U)>(x: T, y: U, k: K) => (T | U)[K]
+>func : <T, U, K extends keyof T & keyof U>(x: T, y: U, k: K) => (T | U)[K]
 >{ a: 1, b: "hello" } : { a: number; b: string; }
 >a : number
 >1 : 1
@@ -2295,10 +2297,11 @@ new AnotherSampleClass({});
 >{} : {}
 
 // Positive repro from #17166
-function f3<T, K extends keyof T>(t: T, k: K, tk: T[K]): void {
->f3 : <T, K extends keyof T>(t: T, k: K, tk: T[K]) => void
+function f3<T, K extends Extract<keyof T, string>>(t: T, k: K, tk: T[K]): void {
+>f3 : <T, K extends Extract<keyof T, string>>(t: T, k: K, tk: T[K]) => void
 >T : T
 >K : K
+>Extract : Extract<T, U>
 >T : T
 >t : T
 >T : T
@@ -2309,19 +2312,19 @@ function f3<T, K extends keyof T>(t: T, k: K, tk: T[K]): void {
 >K : K
 
     for (let key in t) {
->key : keyof T
+>key : Extract<keyof T, string>
 >t : T
 
         key = k // ok, K ==> keyof T
 >key = k : K
->key : keyof T
+>key : Extract<keyof T, string>
 >k : K
 
         t[key] = tk; // ok, T[K] ==> T[keyof T]
 >t[key] = tk : T[K]
->t[key] : T[keyof T]
+>t[key] : T[Extract<keyof T, string>]
 >t : T
->key : keyof T
+>key : Extract<keyof T, string>
 >tk : T[K]
     }
 }
@@ -2342,3 +2345,72 @@ type Predicates<TaggedRecord> = {
 >T : T
 }
 
+// Repro from #23618
+
+type DBBoolTable<K extends string> = { [k in K]: 0 | 1 } 
+>DBBoolTable : DBBoolTable<K>
+>K : K
+>k : k
+>K : K
+
+enum Flag {
+>Flag : Flag
+
+    FLAG_1 = "flag_1",
+>FLAG_1 : Flag.FLAG_1
+>"flag_1" : "flag_1"
+
+    FLAG_2 = "flag_2"
+>FLAG_2 : Flag.FLAG_2
+>"flag_2" : "flag_2"
+}
+
+type SimpleDBRecord<Flag extends string> = { staticField: number } & DBBoolTable<Flag>
+>SimpleDBRecord : SimpleDBRecord<Flag>
+>Flag : Flag
+>staticField : number
+>DBBoolTable : DBBoolTable<K>
+>Flag : Flag
+
+function getFlagsFromSimpleRecord<Flag extends string>(record: SimpleDBRecord<Flag>, flags: Flag[]) {
+>getFlagsFromSimpleRecord : <Flag extends string>(record: SimpleDBRecord<Flag>, flags: Flag[]) => SimpleDBRecord<Flag>[Flag]
+>Flag : Flag
+>record : SimpleDBRecord<Flag>
+>SimpleDBRecord : SimpleDBRecord<Flag>
+>Flag : Flag
+>flags : Flag[]
+>Flag : Flag
+
+    return record[flags[0]];
+>record[flags[0]] : SimpleDBRecord<Flag>[Flag]
+>record : SimpleDBRecord<Flag>
+>flags[0] : Flag
+>flags : Flag[]
+>0 : 0
+}
+
+type DynamicDBRecord<Flag extends string> = ({ dynamicField: number } | { dynamicField: string }) & DBBoolTable<Flag>
+>DynamicDBRecord : DynamicDBRecord<Flag>
+>Flag : Flag
+>dynamicField : number
+>dynamicField : string
+>DBBoolTable : DBBoolTable<K>
+>Flag : Flag
+
+function getFlagsFromDynamicRecord<Flag extends string>(record: DynamicDBRecord<Flag>, flags: Flag[]) {
+>getFlagsFromDynamicRecord : <Flag extends string>(record: DynamicDBRecord<Flag>, flags: Flag[]) => DynamicDBRecord<Flag>[Flag]
+>Flag : Flag
+>record : DynamicDBRecord<Flag>
+>DynamicDBRecord : DynamicDBRecord<Flag>
+>Flag : Flag
+>flags : Flag[]
+>Flag : Flag
+
+    return record[flags[0]];
+>record[flags[0]] : DynamicDBRecord<Flag>[Flag]
+>record : DynamicDBRecord<Flag>
+>flags[0] : Flag
+>flags : Flag[]
+>0 : 0
+}
+
diff --git a/tests/baselines/reference/keyofAndIndexedAccessErrors.errors.txt b/tests/baselines/reference/keyofAndIndexedAccessErrors.errors.txt
index 49f44115e72..bbd4685a492 100644
--- a/tests/baselines/reference/keyofAndIndexedAccessErrors.errors.txt
+++ b/tests/baselines/reference/keyofAndIndexedAccessErrors.errors.txt
@@ -22,27 +22,44 @@ tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(64,33): error
 tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(66,24): error TS2345: Argument of type '"size"' is not assignable to parameter of type '"name" | "width" | "height" | "visible"'.
 tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(67,24): error TS2345: Argument of type '"name" | "size"' is not assignable to parameter of type '"name" | "width" | "height" | "visible"'.
   Type '"size"' is not assignable to type '"name" | "width" | "height" | "visible"'.
-tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(72,5): error TS2536: Type 'keyof T | keyof U' cannot be used to index type 'T | U'.
-tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(76,5): error TS2322: Type 'T | U' is not assignable to type 'T & U'.
-  Type 'T' is not assignable to type 'T & U'.
-    Type 'T' is not assignable to type 'U'.
-tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(77,5): error TS2322: Type 'keyof T | keyof U' is not assignable to type 'keyof (T | U)'.
-  Type 'keyof T' is not assignable to type 'keyof (T | U)'.
-tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(86,9): error TS2322: Type 'keyof T' is not assignable to type 'K'.
-tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(88,9): error TS2322: Type 'T[keyof T]' is not assignable to type 'T[K]'.
-  Type 'keyof T' is not assignable to type 'K'.
-tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(91,5): error TS2322: Type 'T[K]' is not assignable to type 'U[K]'.
+tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(73,5): error TS2536: Type 'keyof T | keyof U' cannot be used to index type 'T | U'.
+tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(74,5): error TS2536: Type 'keyof T | keyof U' cannot be used to index type 'T | U'.
+tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(82,5): error TS2322: Type 'keyof T | keyof U' is not assignable to type 'keyof T & keyof U'.
+  Type 'keyof T' is not assignable to type 'keyof T & keyof U'.
+    Type 'string | number | symbol' is not assignable to type 'keyof T & keyof U'.
+      Type 'string' is not assignable to type 'keyof T & keyof U'.
+        Type 'string' is not assignable to type 'keyof T'.
+          Type 'keyof T' is not assignable to type 'keyof U'.
+            Type 'string | number | symbol' is not assignable to type 'keyof U'.
+              Type 'string' is not assignable to type 'keyof U'.
+tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(83,5): error TS2322: Type 'keyof T | keyof U' is not assignable to type 'keyof T & keyof U'.
+  Type 'keyof T' is not assignable to type 'keyof T & keyof U'.
+    Type 'keyof T' is not assignable to type 'keyof U'.
+tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(86,5): error TS2322: Type 'keyof T | keyof U' is not assignable to type 'keyof T & keyof U'.
+  Type 'keyof T' is not assignable to type 'keyof T & keyof U'.
+    Type 'keyof T' is not assignable to type 'keyof U'.
+tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(87,5): error TS2322: Type 'keyof T | keyof U' is not assignable to type 'keyof T & keyof U'.
+  Type 'keyof T' is not assignable to type 'keyof T & keyof U'.
+    Type 'keyof T' is not assignable to type 'keyof U'.
+tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(103,9): error TS2322: Type 'Extract<keyof T, string>' is not assignable to type 'K'.
+  Type 'string & keyof T' is not assignable to type 'K'.
+    Type 'string' is not assignable to type 'K'.
+tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(105,9): error TS2322: Type 'T[Extract<keyof T, string>]' is not assignable to type 'T[K]'.
+  Type 'Extract<keyof T, string>' is not assignable to type 'K'.
+tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(108,5): error TS2322: Type 'T[K]' is not assignable to type 'U[K]'.
   Type 'T' is not assignable to type 'U'.
-tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(94,5): error TS2322: Type 'T[J]' is not assignable to type 'U[J]'.
+tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(111,5): error TS2322: Type 'T[J]' is not assignable to type 'U[J]'.
   Type 'T' is not assignable to type 'U'.
-tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(97,5): error TS2322: Type 'T[K]' is not assignable to type 'T[J]'.
+tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(114,5): error TS2322: Type 'T[K]' is not assignable to type 'T[J]'.
   Type 'K' is not assignable to type 'J'.
-    Type 'keyof T' is not assignable to type 'J'.
-tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(100,5): error TS2322: Type 'T[K]' is not assignable to type 'U[J]'.
+    Type 'Extract<keyof T, string>' is not assignable to type 'J'.
+      Type 'string & keyof T' is not assignable to type 'J'.
+        Type 'string' is not assignable to type 'J'.
+tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(117,5): error TS2322: Type 'T[K]' is not assignable to type 'U[J]'.
   Type 'T' is not assignable to type 'U'.
 
 
-==== tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts (31 errors) ====
+==== tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts (34 errors) ====
     class Shape {
         name: string;
         width: number;
@@ -158,39 +175,74 @@ tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(100,5): error
 !!! error TS2345:   Type '"size"' is not assignable to type '"name" | "width" | "height" | "visible"'.
     }
     
-    function f20<T, U>(k1: keyof (T | U), k2: keyof (T & U), o1: T | U, o2: T & U) {
-        o1[k1];
-        o1[k2];   // Error
-        ~~~~~~
+    function f20<T, U>(x: T | U, y: T & U, k1: keyof (T | U), k2: keyof T & keyof U, k3: keyof (T & U), k4: keyof T | keyof U) {
+        x[k1];
+        x[k2];
+        x[k3];  // Error
+        ~~~~~
 !!! error TS2536: Type 'keyof T | keyof U' cannot be used to index type 'T | U'.
-        o2[k1];
-        o2[k2];
-        o1 = o2;
-        o2 = o1;  // Error
+        x[k4];  // Error
+        ~~~~~
+!!! error TS2536: Type 'keyof T | keyof U' cannot be used to index type 'T | U'.
+    
+        y[k1];
+        y[k2];
+        y[k3];
+        y[k4];
+    
+        k1 = k2;
+        k1 = k3;  // Error
         ~~
-!!! error TS2322: Type 'T | U' is not assignable to type 'T & U'.
-!!! error TS2322:   Type 'T' is not assignable to type 'T & U'.
-!!! error TS2322:     Type 'T' is not assignable to type 'U'.
-        k1 = k2;  // Error
+!!! error TS2322: Type 'keyof T | keyof U' is not assignable to type 'keyof T & keyof U'.
+!!! error TS2322:   Type 'keyof T' is not assignable to type 'keyof T & keyof U'.
+!!! error TS2322:     Type 'string | number | symbol' is not assignable to type 'keyof T & keyof U'.
+!!! error TS2322:       Type 'string' is not assignable to type 'keyof T & keyof U'.
+!!! error TS2322:         Type 'string' is not assignable to type 'keyof T'.
+!!! error TS2322:           Type 'keyof T' is not assignable to type 'keyof U'.
+!!! error TS2322:             Type 'string | number | symbol' is not assignable to type 'keyof U'.
+!!! error TS2322:               Type 'string' is not assignable to type 'keyof U'.
+        k1 = k4;  // Error
         ~~
-!!! error TS2322: Type 'keyof T | keyof U' is not assignable to type 'keyof (T | U)'.
-!!! error TS2322:   Type 'keyof T' is not assignable to type 'keyof (T | U)'.
+!!! error TS2322: Type 'keyof T | keyof U' is not assignable to type 'keyof T & keyof U'.
+!!! error TS2322:   Type 'keyof T' is not assignable to type 'keyof T & keyof U'.
+!!! error TS2322:     Type 'keyof T' is not assignable to type 'keyof U'.
+    
         k2 = k1;
+        k2 = k3;  // Error
+        ~~
+!!! error TS2322: Type 'keyof T | keyof U' is not assignable to type 'keyof T & keyof U'.
+!!! error TS2322:   Type 'keyof T' is not assignable to type 'keyof T & keyof U'.
+!!! error TS2322:     Type 'keyof T' is not assignable to type 'keyof U'.
+        k2 = k4;  // Error
+        ~~
+!!! error TS2322: Type 'keyof T | keyof U' is not assignable to type 'keyof T & keyof U'.
+!!! error TS2322:   Type 'keyof T' is not assignable to type 'keyof T & keyof U'.
+!!! error TS2322:     Type 'keyof T' is not assignable to type 'keyof U'.
+    
+        k3 = k1;
+        k3 = k2;
+        k3 = k4;
+    
+        k4 = k1;
+        k4 = k2;
+        k4 = k3;
     }
     
     // Repro from #17166
-    function f3<T, K extends keyof T, U extends T, J extends K>(
+    function f3<T, K extends Extract<keyof T, string>, U extends T, J extends K>(
         t: T, k: K, tk: T[K], u: U, j: J, uk: U[K], tj: T[J], uj: U[J]): void {
         for (let key in t) {
             key = k // ok, K ==> keyof T
             k = key // error, keyof T =/=> K
             ~
-!!! error TS2322: Type 'keyof T' is not assignable to type 'K'.
+!!! error TS2322: Type 'Extract<keyof T, string>' is not assignable to type 'K'.
+!!! error TS2322:   Type 'string & keyof T' is not assignable to type 'K'.
+!!! error TS2322:     Type 'string' is not assignable to type 'K'.
             t[key] = tk; // ok, T[K] ==> T[keyof T]
             tk = t[key]; // error, T[keyof T] =/=> T[K]
             ~~
-!!! error TS2322: Type 'T[keyof T]' is not assignable to type 'T[K]'.
-!!! error TS2322:   Type 'keyof T' is not assignable to type 'K'.
+!!! error TS2322: Type 'T[Extract<keyof T, string>]' is not assignable to type 'T[K]'.
+!!! error TS2322:   Type 'Extract<keyof T, string>' is not assignable to type 'K'.
         }
         tk = uk;
         uk = tk; // error
@@ -209,7 +261,9 @@ tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(100,5): error
         ~~
 !!! error TS2322: Type 'T[K]' is not assignable to type 'T[J]'.
 !!! error TS2322:   Type 'K' is not assignable to type 'J'.
-!!! error TS2322:     Type 'keyof T' is not assignable to type 'J'.
+!!! error TS2322:     Type 'Extract<keyof T, string>' is not assignable to type 'J'.
+!!! error TS2322:       Type 'string & keyof T' is not assignable to type 'J'.
+!!! error TS2322:         Type 'string' is not assignable to type 'J'.
     
         tk = uj;
         uj = tk; // error
diff --git a/tests/baselines/reference/keyofAndIndexedAccessErrors.js b/tests/baselines/reference/keyofAndIndexedAccessErrors.js
index d267699ffd6..c64f4df5331 100644
--- a/tests/baselines/reference/keyofAndIndexedAccessErrors.js
+++ b/tests/baselines/reference/keyofAndIndexedAccessErrors.js
@@ -68,19 +68,36 @@ function f10(shape: Shape) {
     setProperty(shape, cond ? "name" : "size", 10);  // Error
 }
 
-function f20<T, U>(k1: keyof (T | U), k2: keyof (T & U), o1: T | U, o2: T & U) {
-    o1[k1];
-    o1[k2];   // Error
-    o2[k1];
-    o2[k2];
-    o1 = o2;
-    o2 = o1;  // Error
-    k1 = k2;  // Error
+function f20<T, U>(x: T | U, y: T & U, k1: keyof (T | U), k2: keyof T & keyof U, k3: keyof (T & U), k4: keyof T | keyof U) {
+    x[k1];
+    x[k2];
+    x[k3];  // Error
+    x[k4];  // Error
+
+    y[k1];
+    y[k2];
+    y[k3];
+    y[k4];
+
+    k1 = k2;
+    k1 = k3;  // Error
+    k1 = k4;  // Error
+
     k2 = k1;
+    k2 = k3;  // Error
+    k2 = k4;  // Error
+
+    k3 = k1;
+    k3 = k2;
+    k3 = k4;
+
+    k4 = k1;
+    k4 = k2;
+    k4 = k3;
 }
 
 // Repro from #17166
-function f3<T, K extends keyof T, U extends T, J extends K>(
+function f3<T, K extends Extract<keyof T, string>, U extends T, J extends K>(
     t: T, k: K, tk: T[K], u: U, j: J, uk: U[K], tj: T[J], uj: U[J]): void {
     for (let key in t) {
         key = k // ok, K ==> keyof T
@@ -122,15 +139,27 @@ function f10(shape) {
     setProperty(shape, "size", 10); // Error
     setProperty(shape, cond ? "name" : "size", 10); // Error
 }
-function f20(k1, k2, o1, o2) {
-    o1[k1];
-    o1[k2]; // Error
-    o2[k1];
-    o2[k2];
-    o1 = o2;
-    o2 = o1; // Error
-    k1 = k2; // Error
+function f20(x, y, k1, k2, k3, k4) {
+    x[k1];
+    x[k2];
+    x[k3]; // Error
+    x[k4]; // Error
+    y[k1];
+    y[k2];
+    y[k3];
+    y[k4];
+    k1 = k2;
+    k1 = k3; // Error
+    k1 = k4; // Error
     k2 = k1;
+    k2 = k3; // Error
+    k2 = k4; // Error
+    k3 = k1;
+    k3 = k2;
+    k3 = k4;
+    k4 = k1;
+    k4 = k2;
+    k4 = k3;
 }
 // Repro from #17166
 function f3(t, k, tk, u, j, uk, tj, uj) {
diff --git a/tests/baselines/reference/keyofAndIndexedAccessErrors.symbols b/tests/baselines/reference/keyofAndIndexedAccessErrors.symbols
index 47b22af2541..bb86bf68bee 100644
--- a/tests/baselines/reference/keyofAndIndexedAccessErrors.symbols
+++ b/tests/baselines/reference/keyofAndIndexedAccessErrors.symbols
@@ -219,141 +219,196 @@ function f10(shape: Shape) {
 >cond : Symbol(cond, Decl(keyofAndIndexedAccessErrors.ts, 50, 11))
 }
 
-function f20<T, U>(k1: keyof (T | U), k2: keyof (T & U), o1: T | U, o2: T & U) {
+function f20<T, U>(x: T | U, y: T & U, k1: keyof (T | U), k2: keyof T & keyof U, k3: keyof (T & U), k4: keyof T | keyof U) {
 >f20 : Symbol(f20, Decl(keyofAndIndexedAccessErrors.ts, 67, 1))
 >T : Symbol(T, Decl(keyofAndIndexedAccessErrors.ts, 69, 13))
 >U : Symbol(U, Decl(keyofAndIndexedAccessErrors.ts, 69, 15))
->k1 : Symbol(k1, Decl(keyofAndIndexedAccessErrors.ts, 69, 19))
+>x : Symbol(x, Decl(keyofAndIndexedAccessErrors.ts, 69, 19))
 >T : Symbol(T, Decl(keyofAndIndexedAccessErrors.ts, 69, 13))
 >U : Symbol(U, Decl(keyofAndIndexedAccessErrors.ts, 69, 15))
->k2 : Symbol(k2, Decl(keyofAndIndexedAccessErrors.ts, 69, 37))
+>y : Symbol(y, Decl(keyofAndIndexedAccessErrors.ts, 69, 28))
 >T : Symbol(T, Decl(keyofAndIndexedAccessErrors.ts, 69, 13))
 >U : Symbol(U, Decl(keyofAndIndexedAccessErrors.ts, 69, 15))
->o1 : Symbol(o1, Decl(keyofAndIndexedAccessErrors.ts, 69, 56))
+>k1 : Symbol(k1, Decl(keyofAndIndexedAccessErrors.ts, 69, 38))
 >T : Symbol(T, Decl(keyofAndIndexedAccessErrors.ts, 69, 13))
 >U : Symbol(U, Decl(keyofAndIndexedAccessErrors.ts, 69, 15))
->o2 : Symbol(o2, Decl(keyofAndIndexedAccessErrors.ts, 69, 67))
+>k2 : Symbol(k2, Decl(keyofAndIndexedAccessErrors.ts, 69, 57))
+>T : Symbol(T, Decl(keyofAndIndexedAccessErrors.ts, 69, 13))
+>U : Symbol(U, Decl(keyofAndIndexedAccessErrors.ts, 69, 15))
+>k3 : Symbol(k3, Decl(keyofAndIndexedAccessErrors.ts, 69, 80))
+>T : Symbol(T, Decl(keyofAndIndexedAccessErrors.ts, 69, 13))
+>U : Symbol(U, Decl(keyofAndIndexedAccessErrors.ts, 69, 15))
+>k4 : Symbol(k4, Decl(keyofAndIndexedAccessErrors.ts, 69, 99))
 >T : Symbol(T, Decl(keyofAndIndexedAccessErrors.ts, 69, 13))
 >U : Symbol(U, Decl(keyofAndIndexedAccessErrors.ts, 69, 15))
 
-    o1[k1];
->o1 : Symbol(o1, Decl(keyofAndIndexedAccessErrors.ts, 69, 56))
->k1 : Symbol(k1, Decl(keyofAndIndexedAccessErrors.ts, 69, 19))
+    x[k1];
+>x : Symbol(x, Decl(keyofAndIndexedAccessErrors.ts, 69, 19))
+>k1 : Symbol(k1, Decl(keyofAndIndexedAccessErrors.ts, 69, 38))
 
-    o1[k2];   // Error
->o1 : Symbol(o1, Decl(keyofAndIndexedAccessErrors.ts, 69, 56))
->k2 : Symbol(k2, Decl(keyofAndIndexedAccessErrors.ts, 69, 37))
+    x[k2];
+>x : Symbol(x, Decl(keyofAndIndexedAccessErrors.ts, 69, 19))
+>k2 : Symbol(k2, Decl(keyofAndIndexedAccessErrors.ts, 69, 57))
 
-    o2[k1];
->o2 : Symbol(o2, Decl(keyofAndIndexedAccessErrors.ts, 69, 67))
->k1 : Symbol(k1, Decl(keyofAndIndexedAccessErrors.ts, 69, 19))
+    x[k3];  // Error
+>x : Symbol(x, Decl(keyofAndIndexedAccessErrors.ts, 69, 19))
+>k3 : Symbol(k3, Decl(keyofAndIndexedAccessErrors.ts, 69, 80))
 
-    o2[k2];
->o2 : Symbol(o2, Decl(keyofAndIndexedAccessErrors.ts, 69, 67))
->k2 : Symbol(k2, Decl(keyofAndIndexedAccessErrors.ts, 69, 37))
+    x[k4];  // Error
+>x : Symbol(x, Decl(keyofAndIndexedAccessErrors.ts, 69, 19))
+>k4 : Symbol(k4, Decl(keyofAndIndexedAccessErrors.ts, 69, 99))
 
-    o1 = o2;
->o1 : Symbol(o1, Decl(keyofAndIndexedAccessErrors.ts, 69, 56))
->o2 : Symbol(o2, Decl(keyofAndIndexedAccessErrors.ts, 69, 67))
+    y[k1];
+>y : Symbol(y, Decl(keyofAndIndexedAccessErrors.ts, 69, 28))
+>k1 : Symbol(k1, Decl(keyofAndIndexedAccessErrors.ts, 69, 38))
 
-    o2 = o1;  // Error
->o2 : Symbol(o2, Decl(keyofAndIndexedAccessErrors.ts, 69, 67))
->o1 : Symbol(o1, Decl(keyofAndIndexedAccessErrors.ts, 69, 56))
+    y[k2];
+>y : Symbol(y, Decl(keyofAndIndexedAccessErrors.ts, 69, 28))
+>k2 : Symbol(k2, Decl(keyofAndIndexedAccessErrors.ts, 69, 57))
 
-    k1 = k2;  // Error
->k1 : Symbol(k1, Decl(keyofAndIndexedAccessErrors.ts, 69, 19))
->k2 : Symbol(k2, Decl(keyofAndIndexedAccessErrors.ts, 69, 37))
+    y[k3];
+>y : Symbol(y, Decl(keyofAndIndexedAccessErrors.ts, 69, 28))
+>k3 : Symbol(k3, Decl(keyofAndIndexedAccessErrors.ts, 69, 80))
+
+    y[k4];
+>y : Symbol(y, Decl(keyofAndIndexedAccessErrors.ts, 69, 28))
+>k4 : Symbol(k4, Decl(keyofAndIndexedAccessErrors.ts, 69, 99))
+
+    k1 = k2;
+>k1 : Symbol(k1, Decl(keyofAndIndexedAccessErrors.ts, 69, 38))
+>k2 : Symbol(k2, Decl(keyofAndIndexedAccessErrors.ts, 69, 57))
+
+    k1 = k3;  // Error
+>k1 : Symbol(k1, Decl(keyofAndIndexedAccessErrors.ts, 69, 38))
+>k3 : Symbol(k3, Decl(keyofAndIndexedAccessErrors.ts, 69, 80))
+
+    k1 = k4;  // Error
+>k1 : Symbol(k1, Decl(keyofAndIndexedAccessErrors.ts, 69, 38))
+>k4 : Symbol(k4, Decl(keyofAndIndexedAccessErrors.ts, 69, 99))
 
     k2 = k1;
->k2 : Symbol(k2, Decl(keyofAndIndexedAccessErrors.ts, 69, 37))
->k1 : Symbol(k1, Decl(keyofAndIndexedAccessErrors.ts, 69, 19))
+>k2 : Symbol(k2, Decl(keyofAndIndexedAccessErrors.ts, 69, 57))
+>k1 : Symbol(k1, Decl(keyofAndIndexedAccessErrors.ts, 69, 38))
+
+    k2 = k3;  // Error
+>k2 : Symbol(k2, Decl(keyofAndIndexedAccessErrors.ts, 69, 57))
+>k3 : Symbol(k3, Decl(keyofAndIndexedAccessErrors.ts, 69, 80))
+
+    k2 = k4;  // Error
+>k2 : Symbol(k2, Decl(keyofAndIndexedAccessErrors.ts, 69, 57))
+>k4 : Symbol(k4, Decl(keyofAndIndexedAccessErrors.ts, 69, 99))
+
+    k3 = k1;
+>k3 : Symbol(k3, Decl(keyofAndIndexedAccessErrors.ts, 69, 80))
+>k1 : Symbol(k1, Decl(keyofAndIndexedAccessErrors.ts, 69, 38))
+
+    k3 = k2;
+>k3 : Symbol(k3, Decl(keyofAndIndexedAccessErrors.ts, 69, 80))
+>k2 : Symbol(k2, Decl(keyofAndIndexedAccessErrors.ts, 69, 57))
+
+    k3 = k4;
+>k3 : Symbol(k3, Decl(keyofAndIndexedAccessErrors.ts, 69, 80))
+>k4 : Symbol(k4, Decl(keyofAndIndexedAccessErrors.ts, 69, 99))
+
+    k4 = k1;
+>k4 : Symbol(k4, Decl(keyofAndIndexedAccessErrors.ts, 69, 99))
+>k1 : Symbol(k1, Decl(keyofAndIndexedAccessErrors.ts, 69, 38))
+
+    k4 = k2;
+>k4 : Symbol(k4, Decl(keyofAndIndexedAccessErrors.ts, 69, 99))
+>k2 : Symbol(k2, Decl(keyofAndIndexedAccessErrors.ts, 69, 57))
+
+    k4 = k3;
+>k4 : Symbol(k4, Decl(keyofAndIndexedAccessErrors.ts, 69, 99))
+>k3 : Symbol(k3, Decl(keyofAndIndexedAccessErrors.ts, 69, 80))
 }
 
 // Repro from #17166
-function f3<T, K extends keyof T, U extends T, J extends K>(
->f3 : Symbol(f3, Decl(keyofAndIndexedAccessErrors.ts, 78, 1))
->T : Symbol(T, Decl(keyofAndIndexedAccessErrors.ts, 81, 12))
->K : Symbol(K, Decl(keyofAndIndexedAccessErrors.ts, 81, 14))
->T : Symbol(T, Decl(keyofAndIndexedAccessErrors.ts, 81, 12))
->U : Symbol(U, Decl(keyofAndIndexedAccessErrors.ts, 81, 33))
->T : Symbol(T, Decl(keyofAndIndexedAccessErrors.ts, 81, 12))
->J : Symbol(J, Decl(keyofAndIndexedAccessErrors.ts, 81, 46))
->K : Symbol(K, Decl(keyofAndIndexedAccessErrors.ts, 81, 14))
+function f3<T, K extends Extract<keyof T, string>, U extends T, J extends K>(
+>f3 : Symbol(f3, Decl(keyofAndIndexedAccessErrors.ts, 95, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccessErrors.ts, 98, 12))
+>K : Symbol(K, Decl(keyofAndIndexedAccessErrors.ts, 98, 14))
+>Extract : Symbol(Extract, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(keyofAndIndexedAccessErrors.ts, 98, 12))
+>U : Symbol(U, Decl(keyofAndIndexedAccessErrors.ts, 98, 50))
+>T : Symbol(T, Decl(keyofAndIndexedAccessErrors.ts, 98, 12))
+>J : Symbol(J, Decl(keyofAndIndexedAccessErrors.ts, 98, 63))
+>K : Symbol(K, Decl(keyofAndIndexedAccessErrors.ts, 98, 14))
 
     t: T, k: K, tk: T[K], u: U, j: J, uk: U[K], tj: T[J], uj: U[J]): void {
->t : Symbol(t, Decl(keyofAndIndexedAccessErrors.ts, 81, 60))
->T : Symbol(T, Decl(keyofAndIndexedAccessErrors.ts, 81, 12))
->k : Symbol(k, Decl(keyofAndIndexedAccessErrors.ts, 82, 9))
->K : Symbol(K, Decl(keyofAndIndexedAccessErrors.ts, 81, 14))
->tk : Symbol(tk, Decl(keyofAndIndexedAccessErrors.ts, 82, 15))
->T : Symbol(T, Decl(keyofAndIndexedAccessErrors.ts, 81, 12))
->K : Symbol(K, Decl(keyofAndIndexedAccessErrors.ts, 81, 14))
->u : Symbol(u, Decl(keyofAndIndexedAccessErrors.ts, 82, 25))
->U : Symbol(U, Decl(keyofAndIndexedAccessErrors.ts, 81, 33))
->j : Symbol(j, Decl(keyofAndIndexedAccessErrors.ts, 82, 31))
->J : Symbol(J, Decl(keyofAndIndexedAccessErrors.ts, 81, 46))
->uk : Symbol(uk, Decl(keyofAndIndexedAccessErrors.ts, 82, 37))
->U : Symbol(U, Decl(keyofAndIndexedAccessErrors.ts, 81, 33))
->K : Symbol(K, Decl(keyofAndIndexedAccessErrors.ts, 81, 14))
->tj : Symbol(tj, Decl(keyofAndIndexedAccessErrors.ts, 82, 47))
->T : Symbol(T, Decl(keyofAndIndexedAccessErrors.ts, 81, 12))
->J : Symbol(J, Decl(keyofAndIndexedAccessErrors.ts, 81, 46))
->uj : Symbol(uj, Decl(keyofAndIndexedAccessErrors.ts, 82, 57))
->U : Symbol(U, Decl(keyofAndIndexedAccessErrors.ts, 81, 33))
->J : Symbol(J, Decl(keyofAndIndexedAccessErrors.ts, 81, 46))
+>t : Symbol(t, Decl(keyofAndIndexedAccessErrors.ts, 98, 77))
+>T : Symbol(T, Decl(keyofAndIndexedAccessErrors.ts, 98, 12))
+>k : Symbol(k, Decl(keyofAndIndexedAccessErrors.ts, 99, 9))
+>K : Symbol(K, Decl(keyofAndIndexedAccessErrors.ts, 98, 14))
+>tk : Symbol(tk, Decl(keyofAndIndexedAccessErrors.ts, 99, 15))
+>T : Symbol(T, Decl(keyofAndIndexedAccessErrors.ts, 98, 12))
+>K : Symbol(K, Decl(keyofAndIndexedAccessErrors.ts, 98, 14))
+>u : Symbol(u, Decl(keyofAndIndexedAccessErrors.ts, 99, 25))
+>U : Symbol(U, Decl(keyofAndIndexedAccessErrors.ts, 98, 50))
+>j : Symbol(j, Decl(keyofAndIndexedAccessErrors.ts, 99, 31))
+>J : Symbol(J, Decl(keyofAndIndexedAccessErrors.ts, 98, 63))
+>uk : Symbol(uk, Decl(keyofAndIndexedAccessErrors.ts, 99, 37))
+>U : Symbol(U, Decl(keyofAndIndexedAccessErrors.ts, 98, 50))
+>K : Symbol(K, Decl(keyofAndIndexedAccessErrors.ts, 98, 14))
+>tj : Symbol(tj, Decl(keyofAndIndexedAccessErrors.ts, 99, 47))
+>T : Symbol(T, Decl(keyofAndIndexedAccessErrors.ts, 98, 12))
+>J : Symbol(J, Decl(keyofAndIndexedAccessErrors.ts, 98, 63))
+>uj : Symbol(uj, Decl(keyofAndIndexedAccessErrors.ts, 99, 57))
+>U : Symbol(U, Decl(keyofAndIndexedAccessErrors.ts, 98, 50))
+>J : Symbol(J, Decl(keyofAndIndexedAccessErrors.ts, 98, 63))
 
     for (let key in t) {
->key : Symbol(key, Decl(keyofAndIndexedAccessErrors.ts, 83, 12))
->t : Symbol(t, Decl(keyofAndIndexedAccessErrors.ts, 81, 60))
+>key : Symbol(key, Decl(keyofAndIndexedAccessErrors.ts, 100, 12))
+>t : Symbol(t, Decl(keyofAndIndexedAccessErrors.ts, 98, 77))
 
         key = k // ok, K ==> keyof T
->key : Symbol(key, Decl(keyofAndIndexedAccessErrors.ts, 83, 12))
->k : Symbol(k, Decl(keyofAndIndexedAccessErrors.ts, 82, 9))
+>key : Symbol(key, Decl(keyofAndIndexedAccessErrors.ts, 100, 12))
+>k : Symbol(k, Decl(keyofAndIndexedAccessErrors.ts, 99, 9))
 
         k = key // error, keyof T =/=> K
->k : Symbol(k, Decl(keyofAndIndexedAccessErrors.ts, 82, 9))
->key : Symbol(key, Decl(keyofAndIndexedAccessErrors.ts, 83, 12))
+>k : Symbol(k, Decl(keyofAndIndexedAccessErrors.ts, 99, 9))
+>key : Symbol(key, Decl(keyofAndIndexedAccessErrors.ts, 100, 12))
 
         t[key] = tk; // ok, T[K] ==> T[keyof T]
->t : Symbol(t, Decl(keyofAndIndexedAccessErrors.ts, 81, 60))
->key : Symbol(key, Decl(keyofAndIndexedAccessErrors.ts, 83, 12))
->tk : Symbol(tk, Decl(keyofAndIndexedAccessErrors.ts, 82, 15))
+>t : Symbol(t, Decl(keyofAndIndexedAccessErrors.ts, 98, 77))
+>key : Symbol(key, Decl(keyofAndIndexedAccessErrors.ts, 100, 12))
+>tk : Symbol(tk, Decl(keyofAndIndexedAccessErrors.ts, 99, 15))
 
         tk = t[key]; // error, T[keyof T] =/=> T[K]
->tk : Symbol(tk, Decl(keyofAndIndexedAccessErrors.ts, 82, 15))
->t : Symbol(t, Decl(keyofAndIndexedAccessErrors.ts, 81, 60))
->key : Symbol(key, Decl(keyofAndIndexedAccessErrors.ts, 83, 12))
+>tk : Symbol(tk, Decl(keyofAndIndexedAccessErrors.ts, 99, 15))
+>t : Symbol(t, Decl(keyofAndIndexedAccessErrors.ts, 98, 77))
+>key : Symbol(key, Decl(keyofAndIndexedAccessErrors.ts, 100, 12))
     }
     tk = uk;
->tk : Symbol(tk, Decl(keyofAndIndexedAccessErrors.ts, 82, 15))
->uk : Symbol(uk, Decl(keyofAndIndexedAccessErrors.ts, 82, 37))
+>tk : Symbol(tk, Decl(keyofAndIndexedAccessErrors.ts, 99, 15))
+>uk : Symbol(uk, Decl(keyofAndIndexedAccessErrors.ts, 99, 37))
 
     uk = tk; // error
->uk : Symbol(uk, Decl(keyofAndIndexedAccessErrors.ts, 82, 37))
->tk : Symbol(tk, Decl(keyofAndIndexedAccessErrors.ts, 82, 15))
+>uk : Symbol(uk, Decl(keyofAndIndexedAccessErrors.ts, 99, 37))
+>tk : Symbol(tk, Decl(keyofAndIndexedAccessErrors.ts, 99, 15))
 
     tj = uj;
->tj : Symbol(tj, Decl(keyofAndIndexedAccessErrors.ts, 82, 47))
->uj : Symbol(uj, Decl(keyofAndIndexedAccessErrors.ts, 82, 57))
+>tj : Symbol(tj, Decl(keyofAndIndexedAccessErrors.ts, 99, 47))
+>uj : Symbol(uj, Decl(keyofAndIndexedAccessErrors.ts, 99, 57))
 
     uj = tj; // error
->uj : Symbol(uj, Decl(keyofAndIndexedAccessErrors.ts, 82, 57))
->tj : Symbol(tj, Decl(keyofAndIndexedAccessErrors.ts, 82, 47))
+>uj : Symbol(uj, Decl(keyofAndIndexedAccessErrors.ts, 99, 57))
+>tj : Symbol(tj, Decl(keyofAndIndexedAccessErrors.ts, 99, 47))
 
     tk = tj;
->tk : Symbol(tk, Decl(keyofAndIndexedAccessErrors.ts, 82, 15))
->tj : Symbol(tj, Decl(keyofAndIndexedAccessErrors.ts, 82, 47))
+>tk : Symbol(tk, Decl(keyofAndIndexedAccessErrors.ts, 99, 15))
+>tj : Symbol(tj, Decl(keyofAndIndexedAccessErrors.ts, 99, 47))
 
     tj = tk; // error
->tj : Symbol(tj, Decl(keyofAndIndexedAccessErrors.ts, 82, 47))
->tk : Symbol(tk, Decl(keyofAndIndexedAccessErrors.ts, 82, 15))
+>tj : Symbol(tj, Decl(keyofAndIndexedAccessErrors.ts, 99, 47))
+>tk : Symbol(tk, Decl(keyofAndIndexedAccessErrors.ts, 99, 15))
 
     tk = uj;
->tk : Symbol(tk, Decl(keyofAndIndexedAccessErrors.ts, 82, 15))
->uj : Symbol(uj, Decl(keyofAndIndexedAccessErrors.ts, 82, 57))
+>tk : Symbol(tk, Decl(keyofAndIndexedAccessErrors.ts, 99, 15))
+>uj : Symbol(uj, Decl(keyofAndIndexedAccessErrors.ts, 99, 57))
 
     uj = tk; // error
->uj : Symbol(uj, Decl(keyofAndIndexedAccessErrors.ts, 82, 57))
->tk : Symbol(tk, Decl(keyofAndIndexedAccessErrors.ts, 82, 15))
+>uj : Symbol(uj, Decl(keyofAndIndexedAccessErrors.ts, 99, 57))
+>tk : Symbol(tk, Decl(keyofAndIndexedAccessErrors.ts, 99, 15))
 }
 
diff --git a/tests/baselines/reference/keyofAndIndexedAccessErrors.types b/tests/baselines/reference/keyofAndIndexedAccessErrors.types
index bcd3878013d..6a474c18107 100644
--- a/tests/baselines/reference/keyofAndIndexedAccessErrors.types
+++ b/tests/baselines/reference/keyofAndIndexedAccessErrors.types
@@ -22,7 +22,7 @@ type Dictionary<T> = { [x: string]: T };
 >T : T
 
 type T00 = keyof K0;  // Error
->T00 : string
+>T00 : string | number | symbol
 >K0 : No type information available!
 
 type T01 = keyof Object;
@@ -30,23 +30,23 @@ type T01 = keyof Object;
 >Object : Object
 
 type T02 = keyof keyof Object;
->T02 : "length" | "toString" | "valueOf" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "substr"
+>T02 : number | "length" | "toString" | "valueOf" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "substr"
 >Object : Object
 
 type T03 = keyof keyof keyof Object;
->T03 : "length" | "toString" | "valueOf" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "substr"
+>T03 : "toString" | "valueOf" | ("toString" & number) | ("toLocaleString" & number) | ("valueOf" & number) | ("toFixed" & number) | ("toExponential" & number) | ("toPrecision" & number)
 >Object : Object
 
 type T04 = keyof keyof keyof keyof Object;
->T04 : "length" | "toString" | "valueOf" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "substr"
+>T04 : number | "length" | "toString" | "valueOf" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "substr" | ("toString" & number) | ("valueOf" & number) | (number & "length") | (number & "toString") | (number & "toLocaleString") | (number & "valueOf") | (number & "charAt") | (number & "charCodeAt") | (number & "concat") | (number & "indexOf") | (number & "lastIndexOf") | (number & "localeCompare") | (number & "match") | (number & "replace") | (number & "search") | (number & "slice") | (number & "split") | (number & "substring") | (number & "toLowerCase") | (number & "toLocaleLowerCase") | (number & "toUpperCase") | (number & "toLocaleUpperCase") | (number & "trim") | (number & "substr") | (number & "toFixed") | (number & "toExponential") | (number & "toPrecision") | ("length" & number) | ("charAt" & number) | ("charCodeAt" & number) | ("concat" & number) | ("indexOf" & number) | ("lastIndexOf" & number) | ("localeCompare" & number) | ("match" & number) | ("replace" & number) | ("search" & number) | ("slice" & number) | ("split" & number) | ("substring" & number) | ("toLowerCase" & number) | ("toLocaleLowerCase" & number) | ("toUpperCase" & number) | ("toLocaleUpperCase" & number) | ("trim" & number) | ("substr" & number)
 >Object : Object
 
 type T05 = keyof keyof keyof keyof keyof Object;
->T05 : "length" | "toString" | "valueOf" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "substr"
+>T05 : "toString" | "valueOf" | ("toString" & number) | ("toLocaleString" & number) | ("valueOf" & number) | ("toFixed" & number) | ("toExponential" & number) | ("toPrecision" & number)
 >Object : Object
 
 type T06 = keyof keyof keyof keyof keyof keyof Object;
->T06 : "length" | "toString" | "valueOf" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "substr"
+>T06 : number | "length" | "toString" | "valueOf" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "substr" | ("toString" & number) | ("valueOf" & number) | (number & "length") | (number & "toString") | (number & "toLocaleString") | (number & "valueOf") | (number & "charAt") | (number & "charCodeAt") | (number & "concat") | (number & "indexOf") | (number & "lastIndexOf") | (number & "localeCompare") | (number & "match") | (number & "replace") | (number & "search") | (number & "slice") | (number & "split") | (number & "substring") | (number & "toLowerCase") | (number & "toLocaleLowerCase") | (number & "toUpperCase") | (number & "toLocaleUpperCase") | (number & "trim") | (number & "substr") | (number & "toFixed") | (number & "toExponential") | (number & "toPrecision") | ("length" & number) | ("charAt" & number) | ("charCodeAt" & number) | ("concat" & number) | ("indexOf" & number) | ("lastIndexOf" & number) | ("localeCompare" & number) | ("match" & number) | ("replace" & number) | ("search" & number) | ("slice" & number) | ("split" & number) | ("substring" & number) | ("toLowerCase" & number) | ("toLocaleLowerCase" & number) | ("toUpperCase" & number) | ("toLocaleUpperCase" & number) | ("trim" & number) | ("substr" & number)
 >Object : Object
 
 type T10 = Shape["name"];
@@ -242,69 +242,136 @@ function f10(shape: Shape) {
 >10 : 10
 }
 
-function f20<T, U>(k1: keyof (T | U), k2: keyof (T & U), o1: T | U, o2: T & U) {
->f20 : <T, U>(k1: keyof (T | U), k2: keyof T | keyof U, o1: T | U, o2: T & U) => void
+function f20<T, U>(x: T | U, y: T & U, k1: keyof (T | U), k2: keyof T & keyof U, k3: keyof (T & U), k4: keyof T | keyof U) {
+>f20 : <T, U>(x: T | U, y: T & U, k1: keyof T & keyof U, k2: keyof T & keyof U, k3: keyof T | keyof U, k4: keyof T | keyof U) => void
 >T : T
 >U : U
->k1 : keyof (T | U)
+>x : T | U
 >T : T
 >U : U
->k2 : keyof T | keyof U
+>y : T & U
 >T : T
 >U : U
->o1 : T | U
+>k1 : keyof T & keyof U
 >T : T
 >U : U
->o2 : T & U
+>k2 : keyof T & keyof U
+>T : T
+>U : U
+>k3 : keyof T | keyof U
+>T : T
+>U : U
+>k4 : keyof T | keyof U
 >T : T
 >U : U
 
-    o1[k1];
->o1[k1] : (T | U)[keyof (T | U)]
->o1 : T | U
->k1 : keyof (T | U)
+    x[k1];
+>x[k1] : (T | U)[keyof T & keyof U]
+>x : T | U
+>k1 : keyof T & keyof U
 
-    o1[k2];   // Error
->o1[k2] : (T | U)[keyof T | keyof U]
->o1 : T | U
->k2 : keyof T | keyof U
+    x[k2];
+>x[k2] : (T | U)[keyof T & keyof U]
+>x : T | U
+>k2 : keyof T & keyof U
 
-    o2[k1];
->o2[k1] : (T & U)[keyof (T | U)]
->o2 : T & U
->k1 : keyof (T | U)
+    x[k3];  // Error
+>x[k3] : (T | U)[keyof T | keyof U]
+>x : T | U
+>k3 : keyof T | keyof U
 
-    o2[k2];
->o2[k2] : (T & U)[keyof T | keyof U]
->o2 : T & U
->k2 : keyof T | keyof U
+    x[k4];  // Error
+>x[k4] : (T | U)[keyof T | keyof U]
+>x : T | U
+>k4 : keyof T | keyof U
 
-    o1 = o2;
->o1 = o2 : T & U
->o1 : T | U
->o2 : T & U
+    y[k1];
+>y[k1] : (T & U)[keyof T & keyof U]
+>y : T & U
+>k1 : keyof T & keyof U
 
-    o2 = o1;  // Error
->o2 = o1 : T | U
->o2 : T & U
->o1 : T | U
+    y[k2];
+>y[k2] : (T & U)[keyof T & keyof U]
+>y : T & U
+>k2 : keyof T & keyof U
 
-    k1 = k2;  // Error
->k1 = k2 : keyof T | keyof U
->k1 : keyof (T | U)
->k2 : keyof T | keyof U
+    y[k3];
+>y[k3] : (T & U)[keyof T | keyof U]
+>y : T & U
+>k3 : keyof T | keyof U
+
+    y[k4];
+>y[k4] : (T & U)[keyof T | keyof U]
+>y : T & U
+>k4 : keyof T | keyof U
+
+    k1 = k2;
+>k1 = k2 : keyof T & keyof U
+>k1 : keyof T & keyof U
+>k2 : keyof T & keyof U
+
+    k1 = k3;  // Error
+>k1 = k3 : keyof T | keyof U
+>k1 : keyof T & keyof U
+>k3 : keyof T | keyof U
+
+    k1 = k4;  // Error
+>k1 = k4 : keyof T | keyof U
+>k1 : keyof T & keyof U
+>k4 : keyof T | keyof U
 
     k2 = k1;
->k2 = k1 : keyof (T | U)
->k2 : keyof T | keyof U
->k1 : keyof (T | U)
+>k2 = k1 : keyof T & keyof U
+>k2 : keyof T & keyof U
+>k1 : keyof T & keyof U
+
+    k2 = k3;  // Error
+>k2 = k3 : keyof T | keyof U
+>k2 : keyof T & keyof U
+>k3 : keyof T | keyof U
+
+    k2 = k4;  // Error
+>k2 = k4 : keyof T | keyof U
+>k2 : keyof T & keyof U
+>k4 : keyof T | keyof U
+
+    k3 = k1;
+>k3 = k1 : keyof T & keyof U
+>k3 : keyof T | keyof U
+>k1 : keyof T & keyof U
+
+    k3 = k2;
+>k3 = k2 : keyof T & keyof U
+>k3 : keyof T | keyof U
+>k2 : keyof T & keyof U
+
+    k3 = k4;
+>k3 = k4 : keyof T | keyof U
+>k3 : keyof T | keyof U
+>k4 : keyof T | keyof U
+
+    k4 = k1;
+>k4 = k1 : keyof T & keyof U
+>k4 : keyof T | keyof U
+>k1 : keyof T & keyof U
+
+    k4 = k2;
+>k4 = k2 : keyof T & keyof U
+>k4 : keyof T | keyof U
+>k2 : keyof T & keyof U
+
+    k4 = k3;
+>k4 = k3 : keyof T | keyof U
+>k4 : keyof T | keyof U
+>k3 : keyof T | keyof U
 }
 
 // Repro from #17166
-function f3<T, K extends keyof T, U extends T, J extends K>(
->f3 : <T, K extends keyof T, U extends T, J extends K>(t: T, k: K, tk: T[K], u: U, j: J, uk: U[K], tj: T[J], uj: U[J]) => void
+function f3<T, K extends Extract<keyof T, string>, U extends T, J extends K>(
+>f3 : <T, K extends Extract<keyof T, string>, U extends T, J extends K>(t: T, k: K, tk: T[K], u: U, j: J, uk: U[K], tj: T[J], uj: U[J]) => void
 >T : T
 >K : K
+>Extract : Extract<T, U>
 >T : T
 >U : U
 >T : T
@@ -334,32 +401,32 @@ function f3<T, K extends keyof T, U extends T, J extends K>(
 >J : J
 
     for (let key in t) {
->key : keyof T
+>key : Extract<keyof T, string>
 >t : T
 
         key = k // ok, K ==> keyof T
 >key = k : K
->key : keyof T
+>key : Extract<keyof T, string>
 >k : K
 
         k = key // error, keyof T =/=> K
->k = key : keyof T
+>k = key : Extract<keyof T, string>
 >k : K
->key : keyof T
+>key : Extract<keyof T, string>
 
         t[key] = tk; // ok, T[K] ==> T[keyof T]
 >t[key] = tk : T[K]
->t[key] : T[keyof T]
+>t[key] : T[Extract<keyof T, string>]
 >t : T
->key : keyof T
+>key : Extract<keyof T, string>
 >tk : T[K]
 
         tk = t[key]; // error, T[keyof T] =/=> T[K]
->tk = t[key] : T[keyof T]
+>tk = t[key] : T[Extract<keyof T, string>]
 >tk : T[K]
->t[key] : T[keyof T]
+>t[key] : T[Extract<keyof T, string>]
 >t : T
->key : keyof T
+>key : Extract<keyof T, string>
     }
     tk = uk;
 >tk = uk : U[K]
diff --git a/tests/baselines/reference/libMembers.errors.txt b/tests/baselines/reference/libMembers.errors.txt
index 4b025b9a95b..36b65fb62f2 100644
--- a/tests/baselines/reference/libMembers.errors.txt
+++ b/tests/baselines/reference/libMembers.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/libMembers.ts(4,3): error TS2339: Property 'subby' does not exist on type 'string'.
-tests/cases/compiler/libMembers.ts(9,16): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+tests/cases/compiler/libMembers.ts(9,17): error TS1011: An element access expression should take an argument.
 tests/cases/compiler/libMembers.ts(12,15): error TS2339: Property 'prototype' does not exist on type 'C'.
 
 
@@ -15,8 +15,8 @@ tests/cases/compiler/libMembers.ts(12,15): error TS2339: Property 'prototype' do
         export class C {
         }
         var a=new C[];
-                   ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                    
+!!! error TS1011: An element access expression should take an argument.
         a.length;
         a.push(new C());
         (new C()).prototype;
diff --git a/tests/baselines/reference/libMembers.types b/tests/baselines/reference/libMembers.types
index a825e822326..351dd02a8f4 100644
--- a/tests/baselines/reference/libMembers.types
+++ b/tests/baselines/reference/libMembers.types
@@ -43,6 +43,7 @@ module M {
 >new C[] : any
 >C[] : any
 >C : typeof C
+> : any
 
     a.length;
 >a.length : any
diff --git a/tests/baselines/reference/library_ObjectPrototypeProperties.types b/tests/baselines/reference/library_ObjectPrototypeProperties.types
index 2f41dd7c1eb..093b787a0ce 100644
--- a/tests/baselines/reference/library_ObjectPrototypeProperties.types
+++ b/tests/baselines/reference/library_ObjectPrototypeProperties.types
@@ -34,11 +34,11 @@ Object.prototype.valueOf();
 
 Object.prototype.hasOwnProperty("string");
 >Object.prototype.hasOwnProperty("string") : boolean
->Object.prototype.hasOwnProperty : (v: string) => boolean
+>Object.prototype.hasOwnProperty : (v: string | number | symbol) => boolean
 >Object.prototype : Object
 >Object : ObjectConstructor
 >prototype : Object
->hasOwnProperty : (v: string) => boolean
+>hasOwnProperty : (v: string | number | symbol) => boolean
 >"string" : "string"
 
 Object.prototype.isPrototypeOf(Object);
@@ -52,10 +52,10 @@ Object.prototype.isPrototypeOf(Object);
 
 Object.prototype.propertyIsEnumerable("string");
 >Object.prototype.propertyIsEnumerable("string") : boolean
->Object.prototype.propertyIsEnumerable : (v: string) => boolean
+>Object.prototype.propertyIsEnumerable : (v: string | number | symbol) => boolean
 >Object.prototype : Object
 >Object : ObjectConstructor
 >prototype : Object
->propertyIsEnumerable : (v: string) => boolean
+>propertyIsEnumerable : (v: string | number | symbol) => boolean
 >"string" : "string"
 
diff --git a/tests/baselines/reference/limitDeepInstantiations.errors.txt b/tests/baselines/reference/limitDeepInstantiations.errors.txt
index 70718199d2b..99ff4c789f4 100644
--- a/tests/baselines/reference/limitDeepInstantiations.errors.txt
+++ b/tests/baselines/reference/limitDeepInstantiations.errors.txt
@@ -1,8 +1,7 @@
 tests/cases/compiler/limitDeepInstantiations.ts(3,35): error TS2502: '"true"' is referenced directly or indirectly in its own type annotation.
-tests/cases/compiler/limitDeepInstantiations.ts(5,13): error TS2344: Type '"false"' does not satisfy the constraint '"true"'.
 
 
-==== tests/cases/compiler/limitDeepInstantiations.ts (2 errors) ====
+==== tests/cases/compiler/limitDeepInstantiations.ts (1 errors) ====
     // Repro from #14837
     
     type Foo<T extends "true", B> = { "true": Foo<T, Foo<T, B>> }[T];
@@ -10,6 +9,4 @@ tests/cases/compiler/limitDeepInstantiations.ts(5,13): error TS2344: Type '"fals
 !!! error TS2502: '"true"' is referenced directly or indirectly in its own type annotation.
     let f1: Foo<"true", {}>;
     let f2: Foo<"false", {}>;
-                ~~~~~~~
-!!! error TS2344: Type '"false"' does not satisfy the constraint '"true"'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/mappedTypeErrors.errors.txt b/tests/baselines/reference/mappedTypeErrors.errors.txt
index 3245f9932f0..f78c32531a4 100644
--- a/tests/baselines/reference/mappedTypeErrors.errors.txt
+++ b/tests/baselines/reference/mappedTypeErrors.errors.txt
@@ -1,7 +1,8 @@
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(19,20): error TS2313: Type parameter 'P' has a circular constraint.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(20,20): error TS2322: Type 'number' is not assignable to type 'string'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(21,20): error TS2322: Type 'Date' is not assignable to type 'string'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(22,19): error TS2344: Type 'Date' does not satisfy the constraint 'string'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(21,20): error TS2322: Type 'Date' is not assignable to type 'string | number | symbol'.
+  Type 'Date' is not assignable to type 'symbol'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(22,19): error TS2344: Type 'Date' does not satisfy the constraint 'string | number | symbol'.
+  Type 'Date' is not assignable to type 'symbol'.
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(25,24): error TS2344: Type '"foo"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(26,24): error TS2344: Type '"name" | "foo"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
   Type '"foo"' is not assignable to type '"name" | "width" | "height" | "visible"'.
@@ -45,11 +46,12 @@ tests/cases/conformance/types/mapped/mappedTypeErrors.ts(129,5): error TS2322: T
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(130,5): error TS2322: Type '{ a: string; }' is not assignable to type '{ [x: string]: any; a?: number | undefined; }'.
   Types of property 'a' are incompatible.
     Type 'string' is not assignable to type 'number | undefined'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(136,16): error TS2322: Type 'T' is not assignable to type 'string'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(136,16): error TS2322: Type 'T' is not assignable to type 'string | number | symbol'.
+  Type 'T' is not assignable to type 'symbol'.
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(136,21): error TS2536: Type 'P' cannot be used to index type 'T'.
 
 
-==== tests/cases/conformance/types/mapped/mappedTypeErrors.ts (26 errors) ====
+==== tests/cases/conformance/types/mapped/mappedTypeErrors.ts (25 errors) ====
     interface Shape {
         name: string;
         width: number;
@@ -72,14 +74,14 @@ tests/cases/conformance/types/mapped/mappedTypeErrors.ts(136,21): error TS2536:
                        ~
 !!! error TS2313: Type parameter 'P' has a circular constraint.
     type T01 = { [P in number]: string };  // Error
-                       ~~~~~~
-!!! error TS2322: Type 'number' is not assignable to type 'string'.
     type T02 = { [P in Date]: number };  // Error
                        ~~~~
-!!! error TS2322: Type 'Date' is not assignable to type 'string'.
+!!! error TS2322: Type 'Date' is not assignable to type 'string | number | symbol'.
+!!! error TS2322:   Type 'Date' is not assignable to type 'symbol'.
     type T03 = Record<Date, number>;  // Error
                       ~~~~
-!!! error TS2344: Type 'Date' does not satisfy the constraint 'string'.
+!!! error TS2344: Type 'Date' does not satisfy the constraint 'string | number | symbol'.
+!!! error TS2344:   Type 'Date' is not assignable to type 'symbol'.
     
     type T10 = Pick<Shape, "name">;
     type T11 = Pick<Shape, "foo">;  // Error
@@ -258,7 +260,8 @@ tests/cases/conformance/types/mapped/mappedTypeErrors.ts(136,21): error TS2536:
         pf: {[P in F]?: T[P]},
         pt: {[P in T]?: T[P]}, // note: should be in keyof T
                    ~
-!!! error TS2322: Type 'T' is not assignable to type 'string'.
+!!! error TS2322: Type 'T' is not assignable to type 'string | number | symbol'.
+!!! error TS2322:   Type 'T' is not assignable to type 'symbol'.
                         ~~~~
 !!! error TS2536: Type 'P' cannot be used to index type 'T'.
     };
diff --git a/tests/baselines/reference/mappedTypeErrors.types b/tests/baselines/reference/mappedTypeErrors.types
index ab0ae55a0e1..3faae85af8b 100644
--- a/tests/baselines/reference/mappedTypeErrors.types
+++ b/tests/baselines/reference/mappedTypeErrors.types
@@ -373,17 +373,17 @@ function setState<T, K extends keyof T>(obj: T, props: Pick<T, K>) {
 >K : K
 
     for (let k in props) {
->k : K
+>k : Extract<K, string>
 >props : Pick<T, K>
 
         obj[k] = props[k];
->obj[k] = props[k] : Pick<T, K>[K]
->obj[k] : T[K]
+>obj[k] = props[k] : Pick<T, K>[Extract<K, string>]
+>obj[k] : T[Extract<K, string>]
 >obj : T
->k : K
->props[k] : Pick<T, K>[K]
+>k : Extract<K, string>
+>props[k] : Pick<T, K>[Extract<K, string>]
 >props : Pick<T, K>
->k : K
+>k : Extract<K, string>
     }
 }
 
@@ -468,19 +468,19 @@ class C<T> {
 >K : K
 
         for (let k in props) {
->k : K
+>k : Extract<K, string>
 >props : Pick<T, K>
 
             this.state[k] = props[k];
->this.state[k] = props[k] : Pick<T, K>[K]
->this.state[k] : T[K]
+>this.state[k] = props[k] : Pick<T, K>[Extract<K, string>]
+>this.state[k] : T[Extract<K, string>]
 >this.state : T
 >this : this
 >state : T
->k : K
->props[k] : Pick<T, K>[K]
+>k : Extract<K, string>
+>props[k] : Pick<T, K>[Extract<K, string>]
 >props : Pick<T, K>
->k : K
+>k : Extract<K, string>
         }
     }
 }
diff --git a/tests/baselines/reference/mappedTypeErrors2.errors.txt b/tests/baselines/reference/mappedTypeErrors2.errors.txt
index 18bc7cc7239..9178731d189 100644
--- a/tests/baselines/reference/mappedTypeErrors2.errors.txt
+++ b/tests/baselines/reference/mappedTypeErrors2.errors.txt
@@ -1,10 +1,13 @@
 tests/cases/conformance/types/mapped/mappedTypeErrors2.ts(9,30): error TS2536: Type 'K' cannot be used to index type 'T1<K>'.
 tests/cases/conformance/types/mapped/mappedTypeErrors2.ts(13,30): error TS2536: Type 'K' cannot be used to index type 'T3'.
+tests/cases/conformance/types/mapped/mappedTypeErrors2.ts(15,38): error TS2536: Type 'S' cannot be used to index type '{ [key in AB[S]]: true; }'.
+tests/cases/conformance/types/mapped/mappedTypeErrors2.ts(15,47): error TS2322: Type 'AB[S]' is not assignable to type 'string | number | symbol'.
+  Type 'AB[S]' is not assignable to type 'symbol'.
 tests/cases/conformance/types/mapped/mappedTypeErrors2.ts(15,47): error TS2536: Type 'S' cannot be used to index type 'AB'.
 tests/cases/conformance/types/mapped/mappedTypeErrors2.ts(17,49): error TS2536: Type 'L' cannot be used to index type '{ [key in AB[S]]: true; }'.
 
 
-==== tests/cases/conformance/types/mapped/mappedTypeErrors2.ts (4 errors) ====
+==== tests/cases/conformance/types/mapped/mappedTypeErrors2.ts (6 errors) ====
     // Repros from #17238
     
     type AB = {
@@ -24,6 +27,11 @@ tests/cases/conformance/types/mapped/mappedTypeErrors2.ts(17,49): error TS2536:
 !!! error TS2536: Type 'K' cannot be used to index type 'T3'.
     
     type T5<S extends 'a'|'b'|'extra'> = {[key in AB[S]]: true}[S]; // Error
+                                         ~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2536: Type 'S' cannot be used to index type '{ [key in AB[S]]: true; }'.
+                                                  ~~~~~
+!!! error TS2322: Type 'AB[S]' is not assignable to type 'string | number | symbol'.
+!!! error TS2322:   Type 'AB[S]' is not assignable to type 'symbol'.
                                                   ~~~~~
 !!! error TS2536: Type 'S' cannot be used to index type 'AB'.
     
diff --git a/tests/baselines/reference/mappedTypeRelationships.errors.txt b/tests/baselines/reference/mappedTypeRelationships.errors.txt
index f5d0e66ff3f..60a06e000c2 100644
--- a/tests/baselines/reference/mappedTypeRelationships.errors.txt
+++ b/tests/baselines/reference/mappedTypeRelationships.errors.txt
@@ -10,29 +10,27 @@ tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(25,5): error TS2
 tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(26,5): error TS2322: Type 'T[K]' is not assignable to type 'U[K]'.
   Type 'T' is not assignable to type 'U'.
 tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(26,12): error TS2536: Type 'K' cannot be used to index type 'T'.
-tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(30,5): error TS2322: Type 'Partial<T>[keyof T]' is not assignable to type 'T[keyof T]'.
-  Type 'T[keyof T] | undefined' is not assignable to type 'T[keyof T]'.
-    Type 'undefined' is not assignable to type 'T[keyof T]'.
-tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(35,5): error TS2322: Type 'Partial<T>[K]' is not assignable to type 'T[K]'.
-  Type 'T[K] | undefined' is not assignable to type 'T[K]'.
-    Type 'undefined' is not assignable to type 'T[K]'.
-tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(40,5): error TS2322: Type 'Partial<U>[keyof T]' is not assignable to type 'T[keyof T]'.
-  Type 'U[keyof T] | undefined' is not assignable to type 'T[keyof T]'.
-    Type 'undefined' is not assignable to type 'T[keyof T]'.
-tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(45,5): error TS2322: Type 'Partial<U>[K]' is not assignable to type 'T[K]'.
-  Type 'U[K] | undefined' is not assignable to type 'T[K]'.
-    Type 'undefined' is not assignable to type 'T[K]'.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(30,5): error TS2322: Type 'T[keyof T] | undefined' is not assignable to type 'T[keyof T]'.
+  Type 'undefined' is not assignable to type 'T[keyof T]'.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(35,5): error TS2322: Type 'T[K] | undefined' is not assignable to type 'T[K]'.
+  Type 'undefined' is not assignable to type 'T[K]'.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(40,5): error TS2322: Type 'U[keyof T] | undefined' is not assignable to type 'T[keyof T]'.
+  Type 'undefined' is not assignable to type 'T[keyof T]'.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(41,5): error TS2322: Type 'T[keyof T]' is not assignable to type 'U[keyof T] | undefined'.
+  Type 'T[keyof T]' is not assignable to type 'U[keyof T]'.
+    Type 'T' is not assignable to type 'U'.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(45,5): error TS2322: Type 'U[K] | undefined' is not assignable to type 'T[K]'.
+  Type 'undefined' is not assignable to type 'T[K]'.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(46,5): error TS2322: Type 'T[K]' is not assignable to type 'U[K] | undefined'.
+  Type 'T[K]' is not assignable to type 'U[K]'.
+    Type 'T' is not assignable to type 'U'.
 tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(51,5): error TS2542: Index signature in type 'Readonly<T>' only permits reading.
 tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(56,5): error TS2542: Index signature in type 'Readonly<T>' only permits reading.
-tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(61,5): error TS2322: Type 'T[keyof T]' is not assignable to type 'Readonly<U>[keyof T]'.
-  Type 'T' is not assignable to type 'Readonly<U>'.
-    Type 'T[keyof T]' is not assignable to type 'U[keyof T]'.
-      Type 'T' is not assignable to type 'U'.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(61,5): error TS2322: Type 'T[keyof T]' is not assignable to type 'U[keyof T]'.
+  Type 'T' is not assignable to type 'U'.
 tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(61,5): error TS2542: Index signature in type 'Readonly<U>' only permits reading.
-tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(66,5): error TS2322: Type 'T[K]' is not assignable to type 'Readonly<U>[K]'.
-  Type 'T' is not assignable to type 'Readonly<U>'.
-    Type 'T[K]' is not assignable to type 'U[K]'.
-      Type 'T' is not assignable to type 'U'.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(66,5): error TS2322: Type 'T[K]' is not assignable to type 'U[K]'.
+  Type 'T' is not assignable to type 'U'.
 tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(66,5): error TS2542: Index signature in type 'Readonly<U>' only permits reading.
 tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(72,5): error TS2322: Type 'Partial<T>' is not assignable to type 'T'.
 tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(78,5): error TS2322: Type 'Partial<Thing>' is not assignable to type 'Partial<T>'.
@@ -43,18 +41,26 @@ tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(143,5): error TS
     Type 'T' is not assignable to type 'U'.
 tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(148,5): error TS2322: Type '{ [P in keyof T]: T[P]; }' is not assignable to type '{ [P in keyof U]: U[P]; }'.
   Type 'keyof U' is not assignable to type 'keyof T'.
+    Type 'string | number | symbol' is not assignable to type 'keyof T'.
+      Type 'string' is not assignable to type 'keyof T'.
 tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(153,5): error TS2322: Type '{ [P in K]: T[P]; }' is not assignable to type '{ [P in keyof T]: T[P]; }'.
   Type 'keyof T' is not assignable to type 'K'.
+    Type 'string | number | symbol' is not assignable to type 'K'.
+      Type 'string' is not assignable to type 'K'.
 tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(158,5): error TS2322: Type '{ [P in K]: T[P]; }' is not assignable to type '{ [P in keyof U]: U[P]; }'.
   Type 'keyof U' is not assignable to type 'K'.
+    Type 'string | number | symbol' is not assignable to type 'K'.
+      Type 'string' is not assignable to type 'K'.
 tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(163,5): error TS2322: Type '{ [P in K]: T[P]; }' is not assignable to type '{ [P in keyof T]: U[P]; }'.
   Type 'keyof T' is not assignable to type 'K'.
+    Type 'string | number | symbol' is not assignable to type 'K'.
+      Type 'string' is not assignable to type 'K'.
 tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(168,5): error TS2322: Type '{ [P in K]: T[P]; }' is not assignable to type '{ [P in K]: U[P]; }'.
   Type 'T[P]' is not assignable to type 'U[P]'.
     Type 'T' is not assignable to type 'U'.
 
 
-==== tests/cases/conformance/types/mapped/mappedTypeRelationships.ts (28 errors) ====
+==== tests/cases/conformance/types/mapped/mappedTypeRelationships.ts (30 errors) ====
     function f1<T>(x: T, k: keyof T) {
         return x[k];
     }
@@ -106,37 +112,41 @@ tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(168,5): error TS
     function f10<T>(x: T, y: Partial<T>, k: keyof T) {
         x[k] = y[k];  // Error
         ~~~~
-!!! error TS2322: Type 'Partial<T>[keyof T]' is not assignable to type 'T[keyof T]'.
-!!! error TS2322:   Type 'T[keyof T] | undefined' is not assignable to type 'T[keyof T]'.
-!!! error TS2322:     Type 'undefined' is not assignable to type 'T[keyof T]'.
+!!! error TS2322: Type 'T[keyof T] | undefined' is not assignable to type 'T[keyof T]'.
+!!! error TS2322:   Type 'undefined' is not assignable to type 'T[keyof T]'.
         y[k] = x[k];
     }
     
     function f11<T, K extends keyof T>(x: T, y: Partial<T>, k: K) {
         x[k] = y[k];  // Error
         ~~~~
-!!! error TS2322: Type 'Partial<T>[K]' is not assignable to type 'T[K]'.
-!!! error TS2322:   Type 'T[K] | undefined' is not assignable to type 'T[K]'.
-!!! error TS2322:     Type 'undefined' is not assignable to type 'T[K]'.
+!!! error TS2322: Type 'T[K] | undefined' is not assignable to type 'T[K]'.
+!!! error TS2322:   Type 'undefined' is not assignable to type 'T[K]'.
         y[k] = x[k];
     }
     
     function f12<T, U extends T>(x: T, y: Partial<U>, k: keyof T) {
         x[k] = y[k];  // Error
         ~~~~
-!!! error TS2322: Type 'Partial<U>[keyof T]' is not assignable to type 'T[keyof T]'.
-!!! error TS2322:   Type 'U[keyof T] | undefined' is not assignable to type 'T[keyof T]'.
-!!! error TS2322:     Type 'undefined' is not assignable to type 'T[keyof T]'.
+!!! error TS2322: Type 'U[keyof T] | undefined' is not assignable to type 'T[keyof T]'.
+!!! error TS2322:   Type 'undefined' is not assignable to type 'T[keyof T]'.
         y[k] = x[k];  // Error
+        ~~~~
+!!! error TS2322: Type 'T[keyof T]' is not assignable to type 'U[keyof T] | undefined'.
+!!! error TS2322:   Type 'T[keyof T]' is not assignable to type 'U[keyof T]'.
+!!! error TS2322:     Type 'T' is not assignable to type 'U'.
     }
     
     function f13<T, U extends T, K extends keyof T>(x: T, y: Partial<U>, k: K) {
         x[k] = y[k];  // Error
         ~~~~
-!!! error TS2322: Type 'Partial<U>[K]' is not assignable to type 'T[K]'.
-!!! error TS2322:   Type 'U[K] | undefined' is not assignable to type 'T[K]'.
-!!! error TS2322:     Type 'undefined' is not assignable to type 'T[K]'.
+!!! error TS2322: Type 'U[K] | undefined' is not assignable to type 'T[K]'.
+!!! error TS2322:   Type 'undefined' is not assignable to type 'T[K]'.
         y[k] = x[k];  // Error
+        ~~~~
+!!! error TS2322: Type 'T[K]' is not assignable to type 'U[K] | undefined'.
+!!! error TS2322:   Type 'T[K]' is not assignable to type 'U[K]'.
+!!! error TS2322:     Type 'T' is not assignable to type 'U'.
     }
     
     function f20<T>(x: T, y: Readonly<T>, k: keyof T) {
@@ -157,10 +167,8 @@ tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(168,5): error TS
         x[k] = y[k];
         y[k] = x[k];  // Error
         ~~~~
-!!! error TS2322: Type 'T[keyof T]' is not assignable to type 'Readonly<U>[keyof T]'.
-!!! error TS2322:   Type 'T' is not assignable to type 'Readonly<U>'.
-!!! error TS2322:     Type 'T[keyof T]' is not assignable to type 'U[keyof T]'.
-!!! error TS2322:       Type 'T' is not assignable to type 'U'.
+!!! error TS2322: Type 'T[keyof T]' is not assignable to type 'U[keyof T]'.
+!!! error TS2322:   Type 'T' is not assignable to type 'U'.
         ~~~~
 !!! error TS2542: Index signature in type 'Readonly<U>' only permits reading.
     }
@@ -169,10 +177,8 @@ tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(168,5): error TS
         x[k] = y[k];
         y[k] = x[k];  // Error
         ~~~~
-!!! error TS2322: Type 'T[K]' is not assignable to type 'Readonly<U>[K]'.
-!!! error TS2322:   Type 'T' is not assignable to type 'Readonly<U>'.
-!!! error TS2322:     Type 'T[K]' is not assignable to type 'U[K]'.
-!!! error TS2322:       Type 'T' is not assignable to type 'U'.
+!!! error TS2322: Type 'T[K]' is not assignable to type 'U[K]'.
+!!! error TS2322:   Type 'T' is not assignable to type 'U'.
         ~~~~
 !!! error TS2542: Index signature in type 'Readonly<U>' only permits reading.
     }
@@ -272,6 +278,8 @@ tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(168,5): error TS
         ~
 !!! error TS2322: Type '{ [P in keyof T]: T[P]; }' is not assignable to type '{ [P in keyof U]: U[P]; }'.
 !!! error TS2322:   Type 'keyof U' is not assignable to type 'keyof T'.
+!!! error TS2322:     Type 'string | number | symbol' is not assignable to type 'keyof T'.
+!!! error TS2322:       Type 'string' is not assignable to type 'keyof T'.
     }
     
     function f73<T, K extends keyof T>(x: { [P in K]: T[P] }, y: { [P in keyof T]: T[P] }) {
@@ -280,6 +288,8 @@ tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(168,5): error TS
         ~
 !!! error TS2322: Type '{ [P in K]: T[P]; }' is not assignable to type '{ [P in keyof T]: T[P]; }'.
 !!! error TS2322:   Type 'keyof T' is not assignable to type 'K'.
+!!! error TS2322:     Type 'string | number | symbol' is not assignable to type 'K'.
+!!! error TS2322:       Type 'string' is not assignable to type 'K'.
     }
     
     function f74<T, U extends T, K extends keyof T>(x: { [P in K]: T[P] }, y: { [P in keyof U]: U[P] }) {
@@ -288,6 +298,8 @@ tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(168,5): error TS
         ~
 !!! error TS2322: Type '{ [P in K]: T[P]; }' is not assignable to type '{ [P in keyof U]: U[P]; }'.
 !!! error TS2322:   Type 'keyof U' is not assignable to type 'K'.
+!!! error TS2322:     Type 'string | number | symbol' is not assignable to type 'K'.
+!!! error TS2322:       Type 'string' is not assignable to type 'K'.
     }
     
     function f75<T, U extends T, K extends keyof T>(x: { [P in K]: T[P] }, y: { [P in keyof T]: U[P] }) {
@@ -296,6 +308,8 @@ tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(168,5): error TS
         ~
 !!! error TS2322: Type '{ [P in K]: T[P]; }' is not assignable to type '{ [P in keyof T]: U[P]; }'.
 !!! error TS2322:   Type 'keyof T' is not assignable to type 'K'.
+!!! error TS2322:     Type 'string | number | symbol' is not assignable to type 'K'.
+!!! error TS2322:       Type 'string' is not assignable to type 'K'.
     }
     
     function f76<T, U extends T, K extends keyof T>(x: { [P in K]: T[P] }, y: { [P in K]: U[P] }) {
diff --git a/tests/baselines/reference/mappedTypeWithAny.types b/tests/baselines/reference/mappedTypeWithAny.types
index 36fad9140cc..6bf62c9730c 100644
--- a/tests/baselines/reference/mappedTypeWithAny.types
+++ b/tests/baselines/reference/mappedTypeWithAny.types
@@ -11,7 +11,7 @@ type ItemMap<T> = { [P in keyof T]: Item };
 >Item : Item
 
 declare let x0: keyof any;
->x0 : string
+>x0 : string | number | symbol
 
 declare let x1: { [P in any]: Item };
 >x1 : { [x: string]: Item; }
diff --git a/tests/baselines/reference/mappedTypes4.types b/tests/baselines/reference/mappedTypes4.types
index c003765d517..7292e143b42 100644
--- a/tests/baselines/reference/mappedTypes4.types
+++ b/tests/baselines/reference/mappedTypes4.types
@@ -40,19 +40,19 @@ function boxify<T>(obj: T): Boxified<T> {
 >T : T
 
         for (let k in obj) {
->k : keyof T
+>k : Extract<keyof T, string>
 >obj : T
 
             result[k] = { value: obj[k] };
->result[k] = { value: obj[k] } : { value: T[keyof T]; }
->result[k] : Boxified<T>[keyof T]
+>result[k] = { value: obj[k] } : { value: T[Extract<keyof T, string>]; }
+>result[k] : Boxified<T>[Extract<keyof T, string>]
 >result : Boxified<T>
->k : keyof T
->{ value: obj[k] } : { value: T[keyof T]; }
->value : T[keyof T]
->obj[k] : T[keyof T]
+>k : Extract<keyof T, string>
+>{ value: obj[k] } : { value: T[Extract<keyof T, string>]; }
+>value : T[Extract<keyof T, string>]
+>obj[k] : T[Extract<keyof T, string>]
 >obj : T
->k : keyof T
+>k : Extract<keyof T, string>
         }
         return result;
 >result : Boxified<T>
diff --git a/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.errors.txt b/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.errors.txt
index 82bc36819a5..4c758633a26 100644
--- a/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.errors.txt
+++ b/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.errors.txt
@@ -1,12 +1,14 @@
 error TS2318: Cannot find global type 'Boolean'.
 error TS2318: Cannot find global type 'IArguments'.
 error TS2318: Cannot find global type 'Number'.
+error TS2318: Cannot find global type 'Object'.
 tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.ts(3,12): error TS2693: 'Array' only refers to a type, but is being used as a value here.
 
 
 !!! error TS2318: Cannot find global type 'Boolean'.
 !!! error TS2318: Cannot find global type 'IArguments'.
 !!! error TS2318: Cannot find global type 'Number'.
+!!! error TS2318: Cannot find global type 'Object'.
 ==== tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.ts (1 errors) ====
     // Error missing basic JavaScript objects
     function f(x: number, y: number, z: number) {
diff --git a/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.types b/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.types
index 834449a5a82..6081b16c835 100644
--- a/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.types
+++ b/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.types
@@ -80,9 +80,9 @@ var o = {
 };
 o.hasOwnProperty(Symbol.hasInstance);
 >o.hasOwnProperty(Symbol.hasInstance) : boolean
->o.hasOwnProperty : (v: string) => boolean
+>o.hasOwnProperty : (v: string | number | symbol) => boolean
 >o : { a: number; [Symbol.hasInstance](value: any): boolean; }
->hasOwnProperty : (v: string) => boolean
+>hasOwnProperty : (v: string | number | symbol) => boolean
 >Symbol.hasInstance : any
 >Symbol : any
 >hasInstance : any
diff --git a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.symbols b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.symbols
index d99084339dd..d3cd86ccfe4 100644
--- a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.symbols
+++ b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.symbols
@@ -100,9 +100,9 @@ var o = {
     }
 };
 o.hasOwnProperty(Symbol.hasInstance);
->o.hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>o.hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es5.d.ts, --, --))
 >o : Symbol(o, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 38, 3))
->hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es5.d.ts, --, --))
 >Symbol.hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
 >hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
diff --git a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.types b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.types
index 78e6a6bc3f5..4fdc3764e88 100644
--- a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.types
+++ b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.types
@@ -124,9 +124,9 @@ var o = {
 };
 o.hasOwnProperty(Symbol.hasInstance);
 >o.hasOwnProperty(Symbol.hasInstance) : boolean
->o.hasOwnProperty : { (v: PropertyKey): boolean; (v: string): boolean; }
+>o.hasOwnProperty : (v: string | number | symbol) => boolean
 >o : { a: number; [Symbol.hasInstance](value: any): boolean; }
->hasOwnProperty : { (v: PropertyKey): boolean; (v: string): boolean; }
+>hasOwnProperty : (v: string | number | symbol) => boolean
 >Symbol.hasInstance : symbol
 >Symbol : SymbolConstructor
 >hasInstance : symbol
diff --git a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.symbols b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.symbols
index 5bb813f5c32..0450449ba64 100644
--- a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.symbols
+++ b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.symbols
@@ -100,9 +100,9 @@ var o = {
     }
 };
 o.hasOwnProperty(Symbol.hasInstance);
->o.hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>o.hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es5.d.ts, --, --))
 >o : Symbol(o, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 38, 3))
->hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es5.d.ts, --, --))
 >Symbol.hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
 >hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
diff --git a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.types b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.types
index 4aabae824ee..8c3ad5b55af 100644
--- a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.types
+++ b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.types
@@ -124,9 +124,9 @@ var o = {
 };
 o.hasOwnProperty(Symbol.hasInstance);
 >o.hasOwnProperty(Symbol.hasInstance) : boolean
->o.hasOwnProperty : { (v: PropertyKey): boolean; (v: string): boolean; }
+>o.hasOwnProperty : (v: string | number | symbol) => boolean
 >o : { a: number; [Symbol.hasInstance](value: any): boolean; }
->hasOwnProperty : { (v: PropertyKey): boolean; (v: string): boolean; }
+>hasOwnProperty : (v: string | number | symbol) => boolean
 >Symbol.hasInstance : symbol
 >Symbol : SymbolConstructor
 >hasInstance : symbol
diff --git a/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.symbols b/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.symbols
index c3c24d4690e..3793215b9e2 100644
--- a/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.symbols
+++ b/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.symbols
@@ -100,9 +100,9 @@ var o = {
     }
 };
 o.hasOwnProperty(Symbol.hasInstance);
->o.hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>o.hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es5.d.ts, --, --))
 >o : Symbol(o, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 38, 3))
->hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es5.d.ts, --, --))
 >Symbol.hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
 >hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
diff --git a/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.types b/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.types
index 2782c70ebd9..df4e231ba80 100644
--- a/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.types
+++ b/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.types
@@ -124,9 +124,9 @@ var o = {
 };
 o.hasOwnProperty(Symbol.hasInstance);
 >o.hasOwnProperty(Symbol.hasInstance) : boolean
->o.hasOwnProperty : { (v: PropertyKey): boolean; (v: string): boolean; }
+>o.hasOwnProperty : (v: string | number | symbol) => boolean
 >o : { a: number; [Symbol.hasInstance](value: any): boolean; }
->hasOwnProperty : { (v: PropertyKey): boolean; (v: string): boolean; }
+>hasOwnProperty : (v: string | number | symbol) => boolean
 >Symbol.hasInstance : symbol
 >Symbol : SymbolConstructor
 >hasInstance : symbol
diff --git a/tests/baselines/reference/modularizeLibrary_TargetES6UsingES6Lib.symbols b/tests/baselines/reference/modularizeLibrary_TargetES6UsingES6Lib.symbols
index ba9dd82df1e..2275ddb55ff 100644
--- a/tests/baselines/reference/modularizeLibrary_TargetES6UsingES6Lib.symbols
+++ b/tests/baselines/reference/modularizeLibrary_TargetES6UsingES6Lib.symbols
@@ -65,9 +65,9 @@ var o = {
     }
 };
 o.hasOwnProperty(Symbol.hasInstance);
->o.hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>o.hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es5.d.ts, --, --))
 >o : Symbol(o, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 21, 3))
->hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es5.d.ts, --, --))
 >Symbol.hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
 >hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
diff --git a/tests/baselines/reference/modularizeLibrary_TargetES6UsingES6Lib.types b/tests/baselines/reference/modularizeLibrary_TargetES6UsingES6Lib.types
index 9c0f81701dc..1902ac93f05 100644
--- a/tests/baselines/reference/modularizeLibrary_TargetES6UsingES6Lib.types
+++ b/tests/baselines/reference/modularizeLibrary_TargetES6UsingES6Lib.types
@@ -79,9 +79,9 @@ var o = {
 };
 o.hasOwnProperty(Symbol.hasInstance);
 >o.hasOwnProperty(Symbol.hasInstance) : boolean
->o.hasOwnProperty : { (v: string): boolean; (v: PropertyKey): boolean; }
+>o.hasOwnProperty : (v: string | number | symbol) => boolean
 >o : { a: number; [Symbol.hasInstance](value: any): boolean; }
->hasOwnProperty : { (v: string): boolean; (v: PropertyKey): boolean; }
+>hasOwnProperty : (v: string | number | symbol) => boolean
 >Symbol.hasInstance : symbol
 >Symbol : SymbolConstructor
 >hasInstance : symbol
diff --git a/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6FeatureLibs.types b/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6FeatureLibs.types
index ab24aaf12ba..e9213203637 100644
--- a/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6FeatureLibs.types
+++ b/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6FeatureLibs.types
@@ -16,10 +16,10 @@ var p = new Proxy(t, {});
 >{} : {}
 
 Reflect.ownKeys({});
->Reflect.ownKeys({}) : PropertyKey[]
->Reflect.ownKeys : (target: object) => PropertyKey[]
+>Reflect.ownKeys({}) : (string | number | symbol)[]
+>Reflect.ownKeys : (target: object) => (string | number | symbol)[]
 >Reflect : typeof Reflect
->ownKeys : (target: object) => PropertyKey[]
+>ownKeys : (target: object) => (string | number | symbol)[]
 >{} : {}
 
 function* idGen() {
diff --git a/tests/baselines/reference/moduleExportAlias.types b/tests/baselines/reference/moduleExportAlias.types
index ce4e1a8fe73..924f02d7fa8 100644
--- a/tests/baselines/reference/moduleExportAlias.types
+++ b/tests/baselines/reference/moduleExportAlias.types
@@ -147,7 +147,7 @@ module.exports.func4 = function () { };
 var multipleDeclarationAlias1 = exports = module.exports;
 >multipleDeclarationAlias1 : any
 >exports = module.exports : any
->exports : any
+>exports : typeof import("tests/cases/conformance/salsa/b")
 >module.exports : any
 >module : any
 >exports : any
@@ -212,7 +212,7 @@ var multipleDeclarationAlias5 = module.exports = exports = {};
 >module : any
 >exports : any
 >exports = {} : {}
->exports : any
+>exports : typeof import("tests/cases/conformance/salsa/b")
 >{} : {}
 
 multipleDeclarationAlias5.func9 = function () { };
@@ -225,7 +225,7 @@ multipleDeclarationAlias5.func9 = function () { };
 var multipleDeclarationAlias6 = exports = module.exports = {};
 >multipleDeclarationAlias6 : { [x: string]: any; }
 >exports = module.exports = {} : { [x: string]: any; }
->exports : any
+>exports : typeof import("tests/cases/conformance/salsa/b")
 >module.exports = {} : { [x: string]: any; }
 >module.exports : any
 >module : any
@@ -241,7 +241,7 @@ multipleDeclarationAlias6.func10 = function () { };
 
 exports = module.exports = someOtherVariable = {};
 >exports = module.exports = someOtherVariable = {} : {}
->exports : any
+>exports : typeof import("tests/cases/conformance/salsa/b")
 >module.exports = someOtherVariable = {} : {}
 >module.exports : any
 >module : any
@@ -268,7 +268,7 @@ module.exports.func12 = function () { };
 
 exports = module.exports = someOtherVariable = {};
 >exports = module.exports = someOtherVariable = {} : {}
->exports : any
+>exports : typeof import("tests/cases/conformance/salsa/b")
 >module.exports = someOtherVariable = {} : {}
 >module.exports : any
 >module : any
@@ -295,7 +295,7 @@ module.exports.func12 = function () { };
 
 exports = module.exports = {};
 >exports = module.exports = {} : { [x: string]: any; }
->exports : any
+>exports : typeof import("tests/cases/conformance/salsa/b")
 >module.exports = {} : { [x: string]: any; }
 >module.exports : any
 >module : any
@@ -320,7 +320,7 @@ module.exports.func14 = function () { };
 
 exports = module.exports = {};
 >exports = module.exports = {} : { [x: string]: any; }
->exports : any
+>exports : typeof import("tests/cases/conformance/salsa/b")
 >module.exports = {} : { [x: string]: any; }
 >module.exports : any
 >module : any
@@ -349,7 +349,7 @@ module.exports = exports = {};
 >module : any
 >exports : any
 >exports = {} : {}
->exports : any
+>exports : typeof import("tests/cases/conformance/salsa/b")
 >{} : {}
 
 exports.func17 = function () { };
diff --git a/tests/baselines/reference/moduleExportAlias2.symbols b/tests/baselines/reference/moduleExportAlias2.symbols
new file mode 100644
index 00000000000..52e089050b1
--- /dev/null
+++ b/tests/baselines/reference/moduleExportAlias2.symbols
@@ -0,0 +1,51 @@
+=== tests/cases/conformance/salsa/index.js ===
+/// <reference path='node.d.ts' />
+const C = require("./semver")
+>C : Symbol(C, Decl(index.js, 1, 5))
+>require : Symbol(require, Decl(node.d.ts, 0, 0))
+>"./semver" : Symbol("tests/cases/conformance/salsa/semver", Decl(semver.js, 0, 0))
+
+var two = C.f(1)
+>two : Symbol(two, Decl(index.js, 2, 3))
+>C.f : Symbol(f, Decl(semver.js, 1, 28))
+>C : Symbol(C, Decl(index.js, 1, 5))
+>f : Symbol(f, Decl(semver.js, 1, 28))
+
+var c = new C
+>c : Symbol(c, Decl(index.js, 3, 3))
+>C : Symbol(C, Decl(index.js, 1, 5))
+
+=== tests/cases/conformance/salsa/node.d.ts ===
+declare function require(name: string): any;
+>require : Symbol(require, Decl(node.d.ts, 0, 0))
+>name : Symbol(name, Decl(node.d.ts, 0, 25))
+
+declare var exports: any;
+>exports : Symbol(exports, Decl(node.d.ts, 1, 11))
+
+declare var module: { exports: any };
+>module : Symbol(module, Decl(node.d.ts, 2, 11))
+>exports : Symbol(exports, Decl(node.d.ts, 2, 21))
+
+=== tests/cases/conformance/salsa/semver.js ===
+/// <reference path='node.d.ts' />
+exports = module.exports = C
+>exports : Symbol("tests/cases/conformance/salsa/semver", Decl(semver.js, 0, 0))
+>module.exports : Symbol(exports, Decl(node.d.ts, 2, 21))
+>module : Symbol(export=, Decl(semver.js, 1, 9))
+>exports : Symbol(export=, Decl(semver.js, 1, 9))
+>C : Symbol(C, Decl(semver.js, 2, 22))
+
+exports.f = n => n + 1
+>exports.f : Symbol(f, Decl(semver.js, 1, 28))
+>exports : Symbol(f, Decl(semver.js, 1, 28))
+>f : Symbol(f, Decl(semver.js, 1, 28))
+>n : Symbol(n, Decl(semver.js, 2, 11))
+>n : Symbol(n, Decl(semver.js, 2, 11))
+
+function C() {
+>C : Symbol(C, Decl(semver.js, 2, 22))
+
+    this.p = 1
+>p : Symbol(C.p, Decl(semver.js, 3, 14))
+}
diff --git a/tests/baselines/reference/moduleExportAlias2.types b/tests/baselines/reference/moduleExportAlias2.types
new file mode 100644
index 00000000000..c76c2c33c45
--- /dev/null
+++ b/tests/baselines/reference/moduleExportAlias2.types
@@ -0,0 +1,65 @@
+=== tests/cases/conformance/salsa/index.js ===
+/// <reference path='node.d.ts' />
+const C = require("./semver")
+>C : typeof C
+>require("./semver") : typeof C
+>require : (name: string) => any
+>"./semver" : "./semver"
+
+var two = C.f(1)
+>two : any
+>C.f(1) : any
+>C.f : (n: any) => any
+>C : typeof C
+>f : (n: any) => any
+>1 : 1
+
+var c = new C
+>c : C
+>new C : C
+>C : typeof C
+
+=== tests/cases/conformance/salsa/node.d.ts ===
+declare function require(name: string): any;
+>require : (name: string) => any
+>name : string
+
+declare var exports: any;
+>exports : any
+
+declare var module: { exports: any };
+>module : { exports: any; }
+>exports : any
+
+=== tests/cases/conformance/salsa/semver.js ===
+/// <reference path='node.d.ts' />
+exports = module.exports = C
+>exports = module.exports = C : typeof C
+>exports : typeof import("tests/cases/conformance/salsa/semver")
+>module.exports = C : typeof C
+>module.exports : any
+>module : { exports: any; }
+>exports : any
+>C : typeof C
+
+exports.f = n => n + 1
+>exports.f = n => n + 1 : (n: any) => any
+>exports.f : (n: any) => any
+>exports : typeof import("tests/cases/conformance/salsa/semver")
+>f : (n: any) => any
+>n => n + 1 : (n: any) => any
+>n : any
+>n + 1 : any
+>n : any
+>1 : 1
+
+function C() {
+>C : typeof C
+
+    this.p = 1
+>this.p = 1 : 1
+>this.p : any
+>this : any
+>p : any
+>1 : 1
+}
diff --git a/tests/baselines/reference/moduleExportWithExportPropertyAssignment4.symbols b/tests/baselines/reference/moduleExportWithExportPropertyAssignment4.symbols
index b62a68c83f3..e7cbcfa0828 100644
--- a/tests/baselines/reference/moduleExportWithExportPropertyAssignment4.symbols
+++ b/tests/baselines/reference/moduleExportWithExportPropertyAssignment4.symbols
@@ -13,14 +13,14 @@ mod1.justExport.toFixed()
 >toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --))
 
 mod1.bothBefore.toFixed() // error
->mod1.bothBefore : Symbol(bothBefore)
+>mod1.bothBefore : Symbol(A.bothBefore, Decl(mod1.js, 2, 16), Decl(mod1.js, 0, 0))
 >mod1 : Symbol(mod1, Decl(a.js, 1, 3))
->bothBefore : Symbol(bothBefore)
+>bothBefore : Symbol(A.bothBefore, Decl(mod1.js, 2, 16), Decl(mod1.js, 0, 0))
 
 mod1.bothAfter.toFixed()
->mod1.bothAfter : Symbol(bothAfter)
+>mod1.bothAfter : Symbol(A.bothAfter, Decl(mod1.js, 3, 16), Decl(mod1.js, 8, 1))
 >mod1 : Symbol(mod1, Decl(a.js, 1, 3))
->bothAfter : Symbol(bothAfter)
+>bothAfter : Symbol(A.bothAfter, Decl(mod1.js, 3, 16), Decl(mod1.js, 8, 1))
 
 mod1.justProperty.length
 >mod1.justProperty.length : Symbol(String.length, Decl(lib.d.ts, --, --))
@@ -41,10 +41,10 @@ declare function require(name: string): any;
 === tests/cases/conformance/salsa/mod1.js ===
 /// <reference path='./requires.d.ts' />
 module.exports.bothBefore = 'string'
->module.exports : Symbol(bothBefore, Decl(mod1.js, 0, 0))
+>module.exports : Symbol(A.bothBefore, Decl(mod1.js, 2, 16), Decl(mod1.js, 0, 0))
 >module : Symbol(module, Decl(requires.d.ts, 0, 11))
 >exports : Symbol(exports, Decl(requires.d.ts, 0, 21))
->bothBefore : Symbol(bothBefore, Decl(mod1.js, 0, 0))
+>bothBefore : Symbol(A.bothBefore, Decl(mod1.js, 2, 16), Decl(mod1.js, 0, 0))
 
 A.justExport = 4
 >A.justExport : Symbol(A.justExport, Decl(mod1.js, 1, 36))
@@ -74,10 +74,10 @@ function A() {
 >p : Symbol(A.p, Decl(mod1.js, 6, 14))
 }
 module.exports.bothAfter = 'string'
->module.exports : Symbol(bothAfter, Decl(mod1.js, 8, 1))
+>module.exports : Symbol(A.bothAfter, Decl(mod1.js, 3, 16), Decl(mod1.js, 8, 1))
 >module : Symbol(module, Decl(requires.d.ts, 0, 11))
 >exports : Symbol(exports, Decl(requires.d.ts, 0, 21))
->bothAfter : Symbol(bothAfter, Decl(mod1.js, 8, 1))
+>bothAfter : Symbol(A.bothAfter, Decl(mod1.js, 3, 16), Decl(mod1.js, 8, 1))
 
 module.exports.justProperty = 'string'
 >module.exports : Symbol(justProperty, Decl(mod1.js, 9, 35))
diff --git a/tests/baselines/reference/newOperator.errors.txt b/tests/baselines/reference/newOperator.errors.txt
index ae96023a60b..fb98482d85c 100644
--- a/tests/baselines/reference/newOperator.errors.txt
+++ b/tests/baselines/reference/newOperator.errors.txt
@@ -3,16 +3,15 @@ tests/cases/compiler/newOperator.ts(10,10): error TS2351: Cannot use 'new' with
 tests/cases/compiler/newOperator.ts(11,10): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
 tests/cases/compiler/newOperator.ts(12,5): error TS2693: 'string' only refers to a type, but is being used as a value here.
 tests/cases/compiler/newOperator.ts(18,14): error TS2693: 'string' only refers to a type, but is being used as a value here.
-tests/cases/compiler/newOperator.ts(18,20): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+tests/cases/compiler/newOperator.ts(18,21): error TS1011: An element access expression should take an argument.
 tests/cases/compiler/newOperator.ts(21,1): error TS2693: 'string' only refers to a type, but is being used as a value here.
-tests/cases/compiler/newOperator.ts(22,1): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+tests/cases/compiler/newOperator.ts(22,2): error TS1011: An element access expression should take an argument.
 tests/cases/compiler/newOperator.ts(28,13): error TS2304: Cannot find name 'q'.
 tests/cases/compiler/newOperator.ts(31,10): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-tests/cases/compiler/newOperator.ts(44,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-tests/cases/compiler/newOperator.ts(45,23): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+tests/cases/compiler/newOperator.ts(45,24): error TS1011: An element access expression should take an argument.
 
 
-==== tests/cases/compiler/newOperator.ts (12 errors) ====
+==== tests/cases/compiler/newOperator.ts (11 errors) ====
     interface ifc { }
     // Attempting to 'new' an interface yields poor error
     var i = new ifc();
@@ -41,18 +40,17 @@ tests/cases/compiler/newOperator.ts(45,23): error TS1150: 'new T[]' cannot be us
     var t3 = new string[]( );
                  ~~~~~~
 !!! error TS2693: 'string' only refers to a type, but is being used as a value here.
-                       ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                        
+!!! error TS1011: An element access expression should take an argument.
     var t4 =
     new
     string
     ~~~~~~
 !!! error TS2693: 'string' only refers to a type, but is being used as a value here.
     [
-    ~
+     
+!!! error TS1011: An element access expression should take an argument.
         ]
-    ~~~~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
         (
             );
     
@@ -78,11 +76,9 @@ tests/cases/compiler/newOperator.ts(45,23): error TS1150: 'new T[]' cannot be us
     
     class S {
         public get xs(): M.T[] {
-                   ~~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
             return new M.T[];
-                          ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                           
+!!! error TS1011: An element access expression should take an argument.
         }
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/newOperator.types b/tests/baselines/reference/newOperator.types
index 76d52f48294..309235a0f7e 100644
--- a/tests/baselines/reference/newOperator.types
+++ b/tests/baselines/reference/newOperator.types
@@ -49,6 +49,7 @@ var t3 = new string[]( );
 >new string[]( ) : any
 >string[] : any
 >string : any
+> : any
 
 var t4 =
 >t4 : any
@@ -62,6 +63,8 @@ string
 
 [
     ]
+> : any
+
     (
         );
 
@@ -109,6 +112,7 @@ class S {
 >M.T : typeof M.T
 >M : typeof M
 >T : typeof M.T
+> : any
     }
 }
 
diff --git a/tests/baselines/reference/noCrashOnThisTypeUsage.js b/tests/baselines/reference/noCrashOnThisTypeUsage.js
new file mode 100644
index 00000000000..32fb972c865
--- /dev/null
+++ b/tests/baselines/reference/noCrashOnThisTypeUsage.js
@@ -0,0 +1,48 @@
+//// [noCrashOnThisTypeUsage.ts]
+interface IListenable {
+    changeListeners: Function[] | null
+    observe(handler: (change: any, oldValue?: any) => void, fireImmediately?: boolean): void
+}
+
+function notifyListeners<T>(listenable: IListenable, change: T) {
+}
+
+export class ObservableValue<T> {
+    constructor(
+        public value: T
+    ) {
+        const newValue: T = value;
+        const oldValue: any = null;
+        notifyListeners(this, {
+            type: "update",
+            object: this,
+            newValue,
+            oldValue
+        });
+    }
+    changeListeners: Function[] | null = [];
+    observe(handler: (change: any, oldValue?: any) => void, fireImmediately?: boolean) {}
+}
+
+//// [noCrashOnThisTypeUsage.js]
+"use strict";
+exports.__esModule = true;
+function notifyListeners(listenable, change) {
+}
+var ObservableValue = /** @class */ (function () {
+    function ObservableValue(value) {
+        this.value = value;
+        this.changeListeners = [];
+        var newValue = value;
+        var oldValue = null;
+        notifyListeners(this, {
+            type: "update",
+            object: this,
+            newValue: newValue,
+            oldValue: oldValue
+        });
+    }
+    ObservableValue.prototype.observe = function (handler, fireImmediately) { };
+    return ObservableValue;
+}());
+exports.ObservableValue = ObservableValue;
diff --git a/tests/baselines/reference/noCrashOnThisTypeUsage.symbols b/tests/baselines/reference/noCrashOnThisTypeUsage.symbols
new file mode 100644
index 00000000000..84ab25a3392
--- /dev/null
+++ b/tests/baselines/reference/noCrashOnThisTypeUsage.symbols
@@ -0,0 +1,73 @@
+=== tests/cases/compiler/noCrashOnThisTypeUsage.ts ===
+interface IListenable {
+>IListenable : Symbol(IListenable, Decl(noCrashOnThisTypeUsage.ts, 0, 0))
+
+    changeListeners: Function[] | null
+>changeListeners : Symbol(IListenable.changeListeners, Decl(noCrashOnThisTypeUsage.ts, 0, 23))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+    observe(handler: (change: any, oldValue?: any) => void, fireImmediately?: boolean): void
+>observe : Symbol(IListenable.observe, Decl(noCrashOnThisTypeUsage.ts, 1, 38))
+>handler : Symbol(handler, Decl(noCrashOnThisTypeUsage.ts, 2, 12))
+>change : Symbol(change, Decl(noCrashOnThisTypeUsage.ts, 2, 22))
+>oldValue : Symbol(oldValue, Decl(noCrashOnThisTypeUsage.ts, 2, 34))
+>fireImmediately : Symbol(fireImmediately, Decl(noCrashOnThisTypeUsage.ts, 2, 59))
+}
+
+function notifyListeners<T>(listenable: IListenable, change: T) {
+>notifyListeners : Symbol(notifyListeners, Decl(noCrashOnThisTypeUsage.ts, 3, 1))
+>T : Symbol(T, Decl(noCrashOnThisTypeUsage.ts, 5, 25))
+>listenable : Symbol(listenable, Decl(noCrashOnThisTypeUsage.ts, 5, 28))
+>IListenable : Symbol(IListenable, Decl(noCrashOnThisTypeUsage.ts, 0, 0))
+>change : Symbol(change, Decl(noCrashOnThisTypeUsage.ts, 5, 52))
+>T : Symbol(T, Decl(noCrashOnThisTypeUsage.ts, 5, 25))
+}
+
+export class ObservableValue<T> {
+>ObservableValue : Symbol(ObservableValue, Decl(noCrashOnThisTypeUsage.ts, 6, 1))
+>T : Symbol(T, Decl(noCrashOnThisTypeUsage.ts, 8, 29))
+
+    constructor(
+        public value: T
+>value : Symbol(ObservableValue.value, Decl(noCrashOnThisTypeUsage.ts, 9, 16))
+>T : Symbol(T, Decl(noCrashOnThisTypeUsage.ts, 8, 29))
+
+    ) {
+        const newValue: T = value;
+>newValue : Symbol(newValue, Decl(noCrashOnThisTypeUsage.ts, 12, 13))
+>T : Symbol(T, Decl(noCrashOnThisTypeUsage.ts, 8, 29))
+>value : Symbol(value, Decl(noCrashOnThisTypeUsage.ts, 9, 16))
+
+        const oldValue: any = null;
+>oldValue : Symbol(oldValue, Decl(noCrashOnThisTypeUsage.ts, 13, 13))
+
+        notifyListeners(this, {
+>notifyListeners : Symbol(notifyListeners, Decl(noCrashOnThisTypeUsage.ts, 3, 1))
+>this : Symbol(ObservableValue, Decl(noCrashOnThisTypeUsage.ts, 6, 1))
+
+            type: "update",
+>type : Symbol(type, Decl(noCrashOnThisTypeUsage.ts, 14, 31))
+
+            object: this,
+>object : Symbol(object, Decl(noCrashOnThisTypeUsage.ts, 15, 27))
+>this : Symbol(ObservableValue, Decl(noCrashOnThisTypeUsage.ts, 6, 1))
+
+            newValue,
+>newValue : Symbol(newValue, Decl(noCrashOnThisTypeUsage.ts, 16, 25))
+
+            oldValue
+>oldValue : Symbol(oldValue, Decl(noCrashOnThisTypeUsage.ts, 17, 21))
+
+        });
+    }
+    changeListeners: Function[] | null = [];
+>changeListeners : Symbol(ObservableValue.changeListeners, Decl(noCrashOnThisTypeUsage.ts, 20, 5))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+    observe(handler: (change: any, oldValue?: any) => void, fireImmediately?: boolean) {}
+>observe : Symbol(ObservableValue.observe, Decl(noCrashOnThisTypeUsage.ts, 21, 44))
+>handler : Symbol(handler, Decl(noCrashOnThisTypeUsage.ts, 22, 12))
+>change : Symbol(change, Decl(noCrashOnThisTypeUsage.ts, 22, 22))
+>oldValue : Symbol(oldValue, Decl(noCrashOnThisTypeUsage.ts, 22, 34))
+>fireImmediately : Symbol(fireImmediately, Decl(noCrashOnThisTypeUsage.ts, 22, 59))
+}
diff --git a/tests/baselines/reference/noCrashOnThisTypeUsage.types b/tests/baselines/reference/noCrashOnThisTypeUsage.types
new file mode 100644
index 00000000000..81851f96a5e
--- /dev/null
+++ b/tests/baselines/reference/noCrashOnThisTypeUsage.types
@@ -0,0 +1,80 @@
+=== tests/cases/compiler/noCrashOnThisTypeUsage.ts ===
+interface IListenable {
+>IListenable : IListenable
+
+    changeListeners: Function[] | null
+>changeListeners : Function[] | null
+>Function : Function
+>null : null
+
+    observe(handler: (change: any, oldValue?: any) => void, fireImmediately?: boolean): void
+>observe : (handler: (change: any, oldValue?: any) => void, fireImmediately?: boolean | undefined) => void
+>handler : (change: any, oldValue?: any) => void
+>change : any
+>oldValue : any
+>fireImmediately : boolean | undefined
+}
+
+function notifyListeners<T>(listenable: IListenable, change: T) {
+>notifyListeners : <T>(listenable: IListenable, change: T) => void
+>T : T
+>listenable : IListenable
+>IListenable : IListenable
+>change : T
+>T : T
+}
+
+export class ObservableValue<T> {
+>ObservableValue : ObservableValue<T>
+>T : T
+
+    constructor(
+        public value: T
+>value : T
+>T : T
+
+    ) {
+        const newValue: T = value;
+>newValue : T
+>T : T
+>value : T
+
+        const oldValue: any = null;
+>oldValue : any
+>null : null
+
+        notifyListeners(this, {
+>notifyListeners(this, {            type: "update",            object: this,            newValue,            oldValue        }) : void
+>notifyListeners : <T>(listenable: IListenable, change: T) => void
+>this : this
+>{            type: "update",            object: this,            newValue,            oldValue        } : { type: string; object: this; newValue: T; oldValue: any; }
+
+            type: "update",
+>type : string
+>"update" : "update"
+
+            object: this,
+>object : this
+>this : this
+
+            newValue,
+>newValue : T
+
+            oldValue
+>oldValue : any
+
+        });
+    }
+    changeListeners: Function[] | null = [];
+>changeListeners : Function[] | null
+>Function : Function
+>null : null
+>[] : never[]
+
+    observe(handler: (change: any, oldValue?: any) => void, fireImmediately?: boolean) {}
+>observe : (handler: (change: any, oldValue?: any) => void, fireImmediately?: boolean | undefined) => void
+>handler : (change: any, oldValue?: any) => void
+>change : any
+>oldValue : any
+>fireImmediately : boolean | undefined
+}
diff --git a/tests/baselines/reference/noUnusedLocals_selfReference.errors.txt b/tests/baselines/reference/noUnusedLocals_selfReference.errors.txt
index 4202a580f84..ff2291c84d6 100644
--- a/tests/baselines/reference/noUnusedLocals_selfReference.errors.txt
+++ b/tests/baselines/reference/noUnusedLocals_selfReference.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/compiler/noUnusedLocals_selfReference.ts(3,1): error TS6133: 'f' is declared but its value is never read.
 tests/cases/compiler/noUnusedLocals_selfReference.ts(5,5): error TS6133: 'g' is declared but its value is never read.
-tests/cases/compiler/noUnusedLocals_selfReference.ts(9,1): error TS6133: 'C' is declared but its value is never read.
-tests/cases/compiler/noUnusedLocals_selfReference.ts(12,1): error TS6133: 'E' is declared but its value is never read.
-tests/cases/compiler/noUnusedLocals_selfReference.ts(13,1): error TS6133: 'I' is declared but its value is never read.
-tests/cases/compiler/noUnusedLocals_selfReference.ts(14,1): error TS6133: 'T' is declared but its value is never read.
+tests/cases/compiler/noUnusedLocals_selfReference.ts(9,1): error TS6196: 'C' is declared but never used.
+tests/cases/compiler/noUnusedLocals_selfReference.ts(12,1): error TS6196: 'E' is declared but never used.
+tests/cases/compiler/noUnusedLocals_selfReference.ts(13,1): error TS6196: 'I' is declared but never used.
+tests/cases/compiler/noUnusedLocals_selfReference.ts(14,1): error TS6196: 'T' is declared but never used.
 tests/cases/compiler/noUnusedLocals_selfReference.ts(15,1): error TS6133: 'N' is declared but its value is never read.
 tests/cases/compiler/noUnusedLocals_selfReference.ts(22,19): error TS6133: 'm' is declared but its value is never read.
 
@@ -23,18 +23,18 @@ tests/cases/compiler/noUnusedLocals_selfReference.ts(22,19): error TS6133: 'm' i
     }
     class C {
     ~~~~~~~
-!!! error TS6133: 'C' is declared but its value is never read.
+!!! error TS6196: 'C' is declared but never used.
         m() { C; }
     }
     enum E { A = 0, B = E.A }
     ~~~~~~
-!!! error TS6133: 'E' is declared but its value is never read.
+!!! error TS6196: 'E' is declared but never used.
     interface I { x: I };
     ~~~~~~~~~~~
-!!! error TS6133: 'I' is declared but its value is never read.
+!!! error TS6196: 'I' is declared but never used.
     type T = { x: T };
     ~~~~~~
-!!! error TS6133: 'T' is declared but its value is never read.
+!!! error TS6196: 'T' is declared but never used.
     namespace N { N; }
     ~~~~~~~~~~~
 !!! error TS6133: 'N' is declared but its value is never read.
diff --git a/tests/baselines/reference/numberPropertyAccess.types b/tests/baselines/reference/numberPropertyAccess.types
index e7ffcbc246d..b2baf38873c 100644
--- a/tests/baselines/reference/numberPropertyAccess.types
+++ b/tests/baselines/reference/numberPropertyAccess.types
@@ -13,9 +13,9 @@ var a = x.toExponential();
 var b = x.hasOwnProperty('toFixed');
 >b : boolean
 >x.hasOwnProperty('toFixed') : boolean
->x.hasOwnProperty : (v: string) => boolean
+>x.hasOwnProperty : (v: string | number | symbol) => boolean
 >x : number
->hasOwnProperty : (v: string) => boolean
+>hasOwnProperty : (v: string | number | symbol) => boolean
 >'toFixed' : "toFixed"
 
 var c = x['toExponential']();
@@ -28,7 +28,7 @@ var c = x['toExponential']();
 var d = x['hasOwnProperty']('toFixed');
 >d : boolean
 >x['hasOwnProperty']('toFixed') : boolean
->x['hasOwnProperty'] : (v: string) => boolean
+>x['hasOwnProperty'] : (v: string | number | symbol) => boolean
 >x : number
 >'hasOwnProperty' : "hasOwnProperty"
 >'toFixed' : "toFixed"
diff --git a/tests/baselines/reference/objectLitArrayDeclNoNew.errors.txt b/tests/baselines/reference/objectLitArrayDeclNoNew.errors.txt
index 0c683946550..62b1505dc5b 100644
--- a/tests/baselines/reference/objectLitArrayDeclNoNew.errors.txt
+++ b/tests/baselines/reference/objectLitArrayDeclNoNew.errors.txt
@@ -1,7 +1,8 @@
+tests/cases/compiler/objectLitArrayDeclNoNew.ts(22,20): error TS1011: An element access expression should take an argument.
 tests/cases/compiler/objectLitArrayDeclNoNew.ts(27,1): error TS1128: Declaration or statement expected.
 
 
-==== tests/cases/compiler/objectLitArrayDeclNoNew.ts (1 errors) ====
+==== tests/cases/compiler/objectLitArrayDeclNoNew.ts (2 errors) ====
     declare var console;
     "use strict";
     module Test {
@@ -24,6 +25,8 @@ tests/cases/compiler/objectLitArrayDeclNoNew.ts(27,1): error TS1128: Declaration
           var state:IState= null;
           return {
            tokens: Gar[],//IToken[],  // Missing new. Correct syntax is: tokens: new IToken[]
+                       
+!!! error TS1011: An element access expression should take an argument.
            endState: state
           };
          }
diff --git a/tests/baselines/reference/objectLitArrayDeclNoNew.types b/tests/baselines/reference/objectLitArrayDeclNoNew.types
index bacd7e09a3c..8ecafcfd367 100644
--- a/tests/baselines/reference/objectLitArrayDeclNoNew.types
+++ b/tests/baselines/reference/objectLitArrayDeclNoNew.types
@@ -52,6 +52,7 @@ module Test {
 >tokens : any
 >Gar[] : any
 >Gar : typeof Gar
+> : any
 
        endState: state
 >endState : IState
diff --git a/tests/baselines/reference/objectLitGetterSetter.types b/tests/baselines/reference/objectLitGetterSetter.types
index c2ce173e029..05c748162d9 100644
--- a/tests/baselines/reference/objectLitGetterSetter.types
+++ b/tests/baselines/reference/objectLitGetterSetter.types
@@ -5,9 +5,9 @@
 
             Object.defineProperty(obj, "accProperty", <PropertyDescriptor>({
 >Object.defineProperty(obj, "accProperty", <PropertyDescriptor>({                get: function () {                    eval("public = 1;");                    return 11;                },                set: function (v) {                }            })) : any
->Object.defineProperty : (o: any, p: string, attributes: PropertyDescriptor & ThisType<any>) => any
+>Object.defineProperty : (o: any, p: string | number | symbol, attributes: PropertyDescriptor & ThisType<any>) => any
 >Object : ObjectConstructor
->defineProperty : (o: any, p: string, attributes: PropertyDescriptor & ThisType<any>) => any
+>defineProperty : (o: any, p: string | number | symbol, attributes: PropertyDescriptor & ThisType<any>) => any
 >obj : {}
 >"accProperty" : "accProperty"
 ><PropertyDescriptor>({                get: function () {                    eval("public = 1;");                    return 11;                },                set: function (v) {                }            }) : PropertyDescriptor
diff --git a/tests/baselines/reference/objectLiteralNormalization.symbols b/tests/baselines/reference/objectLiteralNormalization.symbols
index 69882d81f76..416065ee5c9 100644
--- a/tests/baselines/reference/objectLiteralNormalization.symbols
+++ b/tests/baselines/reference/objectLiteralNormalization.symbols
@@ -15,14 +15,14 @@ a1.a;  // number
 >a : Symbol(a, Decl(objectLiteralNormalization.ts, 1, 11), Decl(objectLiteralNormalization.ts, 1, 21), Decl(objectLiteralNormalization.ts, 1, 39))
 
 a1.b;  // string | undefined
->a1.b : Symbol(b, Decl(objectLiteralNormalization.ts, 1, 27), Decl(objectLiteralNormalization.ts, 1, 45))
+>a1.b : Symbol(b, Decl(objectLiteralNormalization.ts, 1, 45), Decl(objectLiteralNormalization.ts, 1, 27), Decl(objectLiteralNormalization.ts, 1, 45))
 >a1 : Symbol(a1, Decl(objectLiteralNormalization.ts, 1, 3))
->b : Symbol(b, Decl(objectLiteralNormalization.ts, 1, 27), Decl(objectLiteralNormalization.ts, 1, 45))
+>b : Symbol(b, Decl(objectLiteralNormalization.ts, 1, 45), Decl(objectLiteralNormalization.ts, 1, 27), Decl(objectLiteralNormalization.ts, 1, 45))
 
 a1.c;  // boolean | undefined
->a1.c : Symbol(c, Decl(objectLiteralNormalization.ts, 1, 53))
+>a1.c : Symbol(c, Decl(objectLiteralNormalization.ts, 1, 53), Decl(objectLiteralNormalization.ts, 1, 53))
 >a1 : Symbol(a1, Decl(objectLiteralNormalization.ts, 1, 3))
->c : Symbol(c, Decl(objectLiteralNormalization.ts, 1, 53))
+>c : Symbol(c, Decl(objectLiteralNormalization.ts, 1, 53), Decl(objectLiteralNormalization.ts, 1, 53))
 
 a1 = { a: 1 };
 >a1 : Symbol(a1, Decl(objectLiteralNormalization.ts, 1, 3))
@@ -48,14 +48,14 @@ let a2 = [{ a: 1, b: 2 }, { a: "abc" }, {}][0];
 >a : Symbol(a, Decl(objectLiteralNormalization.ts, 10, 27))
 
 a2.a;  // string | number | undefined
->a2.a : Symbol(a, Decl(objectLiteralNormalization.ts, 10, 11), Decl(objectLiteralNormalization.ts, 10, 27))
+>a2.a : Symbol(a, Decl(objectLiteralNormalization.ts, 10, 11), Decl(objectLiteralNormalization.ts, 10, 27), Decl(objectLiteralNormalization.ts, 10, 27))
 >a2 : Symbol(a2, Decl(objectLiteralNormalization.ts, 10, 3))
->a : Symbol(a, Decl(objectLiteralNormalization.ts, 10, 11), Decl(objectLiteralNormalization.ts, 10, 27))
+>a : Symbol(a, Decl(objectLiteralNormalization.ts, 10, 11), Decl(objectLiteralNormalization.ts, 10, 27), Decl(objectLiteralNormalization.ts, 10, 27))
 
 a2.b;  // number | undefined
->a2.b : Symbol(b, Decl(objectLiteralNormalization.ts, 10, 17))
+>a2.b : Symbol(b, Decl(objectLiteralNormalization.ts, 10, 17), Decl(objectLiteralNormalization.ts, 1, 45))
 >a2 : Symbol(a2, Decl(objectLiteralNormalization.ts, 10, 3))
->b : Symbol(b, Decl(objectLiteralNormalization.ts, 10, 17))
+>b : Symbol(b, Decl(objectLiteralNormalization.ts, 10, 17), Decl(objectLiteralNormalization.ts, 1, 45))
 
 a2 = { a: 10, b: 20 };
 >a2 : Symbol(a2, Decl(objectLiteralNormalization.ts, 10, 3))
@@ -144,32 +144,32 @@ d1.pos;
 >pos : Symbol(pos, Decl(objectLiteralNormalization.ts, 33, 22), Decl(objectLiteralNormalization.ts, 33, 58))
 
 d1.pos.x;
->d1.pos.x : Symbol(x, Decl(objectLiteralNormalization.ts, 33, 29))
+>d1.pos.x : Symbol(x, Decl(objectLiteralNormalization.ts, 33, 29), Decl(objectLiteralNormalization.ts, 33, 29))
 >d1.pos : Symbol(pos, Decl(objectLiteralNormalization.ts, 33, 22), Decl(objectLiteralNormalization.ts, 33, 58))
 >d1 : Symbol(d1, Decl(objectLiteralNormalization.ts, 33, 3))
 >pos : Symbol(pos, Decl(objectLiteralNormalization.ts, 33, 22), Decl(objectLiteralNormalization.ts, 33, 58))
->x : Symbol(x, Decl(objectLiteralNormalization.ts, 33, 29))
+>x : Symbol(x, Decl(objectLiteralNormalization.ts, 33, 29), Decl(objectLiteralNormalization.ts, 33, 29))
 
 d1.pos.y;
->d1.pos.y : Symbol(y, Decl(objectLiteralNormalization.ts, 33, 35))
+>d1.pos.y : Symbol(y, Decl(objectLiteralNormalization.ts, 33, 35), Decl(objectLiteralNormalization.ts, 33, 35))
 >d1.pos : Symbol(pos, Decl(objectLiteralNormalization.ts, 33, 22), Decl(objectLiteralNormalization.ts, 33, 58))
 >d1 : Symbol(d1, Decl(objectLiteralNormalization.ts, 33, 3))
 >pos : Symbol(pos, Decl(objectLiteralNormalization.ts, 33, 22), Decl(objectLiteralNormalization.ts, 33, 58))
->y : Symbol(y, Decl(objectLiteralNormalization.ts, 33, 35))
+>y : Symbol(y, Decl(objectLiteralNormalization.ts, 33, 35), Decl(objectLiteralNormalization.ts, 33, 35))
 
 d1.pos.a;
->d1.pos.a : Symbol(a, Decl(objectLiteralNormalization.ts, 33, 73))
+>d1.pos.a : Symbol(a, Decl(objectLiteralNormalization.ts, 10, 27), Decl(objectLiteralNormalization.ts, 33, 73))
 >d1.pos : Symbol(pos, Decl(objectLiteralNormalization.ts, 33, 22), Decl(objectLiteralNormalization.ts, 33, 58))
 >d1 : Symbol(d1, Decl(objectLiteralNormalization.ts, 33, 3))
 >pos : Symbol(pos, Decl(objectLiteralNormalization.ts, 33, 22), Decl(objectLiteralNormalization.ts, 33, 58))
->a : Symbol(a, Decl(objectLiteralNormalization.ts, 33, 73))
+>a : Symbol(a, Decl(objectLiteralNormalization.ts, 10, 27), Decl(objectLiteralNormalization.ts, 33, 73))
 
 d1.pos.b;
->d1.pos.b : Symbol(b, Decl(objectLiteralNormalization.ts, 33, 86))
+>d1.pos.b : Symbol(b, Decl(objectLiteralNormalization.ts, 1, 45), Decl(objectLiteralNormalization.ts, 33, 86))
 >d1.pos : Symbol(pos, Decl(objectLiteralNormalization.ts, 33, 22), Decl(objectLiteralNormalization.ts, 33, 58))
 >d1 : Symbol(d1, Decl(objectLiteralNormalization.ts, 33, 3))
 >pos : Symbol(pos, Decl(objectLiteralNormalization.ts, 33, 22), Decl(objectLiteralNormalization.ts, 33, 58))
->b : Symbol(b, Decl(objectLiteralNormalization.ts, 33, 86))
+>b : Symbol(b, Decl(objectLiteralNormalization.ts, 1, 45), Decl(objectLiteralNormalization.ts, 33, 86))
 
 declare function f<T>(...items: T[]): T;
 >f : Symbol(f, Decl(objectLiteralNormalization.ts, 39, 9))
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.errors.txt b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.errors.txt
index 19c12ebf62f..4f27c62e67d 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.errors.txt
+++ b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.errors.txt
@@ -1,8 +1,8 @@
 tests/cases/conformance/types/members/objectTypeHidingMembersOfExtendedObject.ts(11,5): error TS2411: Property 'constructor' of type 'Function' is not assignable to string index type 'Object'.
 tests/cases/conformance/types/members/objectTypeHidingMembersOfExtendedObject.ts(11,5): error TS2411: Property 'data' of type 'A' is not assignable to string index type 'Object'.
-tests/cases/conformance/types/members/objectTypeHidingMembersOfExtendedObject.ts(11,5): error TS2411: Property 'hasOwnProperty' of type '(v: string) => boolean' is not assignable to string index type 'Object'.
+tests/cases/conformance/types/members/objectTypeHidingMembersOfExtendedObject.ts(11,5): error TS2411: Property 'hasOwnProperty' of type '(v: string | number | symbol) => boolean' is not assignable to string index type 'Object'.
 tests/cases/conformance/types/members/objectTypeHidingMembersOfExtendedObject.ts(11,5): error TS2411: Property 'isPrototypeOf' of type '(v: Object) => boolean' is not assignable to string index type 'Object'.
-tests/cases/conformance/types/members/objectTypeHidingMembersOfExtendedObject.ts(11,5): error TS2411: Property 'propertyIsEnumerable' of type '(v: string) => boolean' is not assignable to string index type 'Object'.
+tests/cases/conformance/types/members/objectTypeHidingMembersOfExtendedObject.ts(11,5): error TS2411: Property 'propertyIsEnumerable' of type '(v: string | number | symbol) => boolean' is not assignable to string index type 'Object'.
 tests/cases/conformance/types/members/objectTypeHidingMembersOfExtendedObject.ts(11,5): error TS2411: Property 'toLocaleString' of type '() => string' is not assignable to string index type 'Object'.
 tests/cases/conformance/types/members/objectTypeHidingMembersOfExtendedObject.ts(11,5): error TS2411: Property 'toString' of type '() => string' is not assignable to string index type 'Object'.
 tests/cases/conformance/types/members/objectTypeHidingMembersOfExtendedObject.ts(11,5): error TS2411: Property 'valueOf' of type '() => Object' is not assignable to string index type 'Object'.
@@ -25,11 +25,11 @@ tests/cases/conformance/types/members/objectTypeHidingMembersOfExtendedObject.ts
         ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2411: Property 'data' of type 'A' is not assignable to string index type 'Object'.
         ~~~~~~~~~~~~~~~~~~~~
-!!! error TS2411: Property 'hasOwnProperty' of type '(v: string) => boolean' is not assignable to string index type 'Object'.
+!!! error TS2411: Property 'hasOwnProperty' of type '(v: string | number | symbol) => boolean' is not assignable to string index type 'Object'.
         ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2411: Property 'isPrototypeOf' of type '(v: Object) => boolean' is not assignable to string index type 'Object'.
         ~~~~~~~~~~~~~~~~~~~~
-!!! error TS2411: Property 'propertyIsEnumerable' of type '(v: string) => boolean' is not assignable to string index type 'Object'.
+!!! error TS2411: Property 'propertyIsEnumerable' of type '(v: string | number | symbol) => boolean' is not assignable to string index type 'Object'.
         ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2411: Property 'toLocaleString' of type '() => string' is not assignable to string index type 'Object'.
         ~~~~~~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.errors.txt b/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.errors.txt
index d09701c3b06..2fadffd195d 100644
--- a/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.errors.txt
+++ b/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/types/members/objectTypeWithStringIndexerHidingObjectIndexer.ts(5,5): error TS2411: Property 'constructor' of type 'Function' is not assignable to string index type 'Object'.
-tests/cases/conformance/types/members/objectTypeWithStringIndexerHidingObjectIndexer.ts(5,5): error TS2411: Property 'hasOwnProperty' of type '(v: string) => boolean' is not assignable to string index type 'Object'.
+tests/cases/conformance/types/members/objectTypeWithStringIndexerHidingObjectIndexer.ts(5,5): error TS2411: Property 'hasOwnProperty' of type '(v: string | number | symbol) => boolean' is not assignable to string index type 'Object'.
 tests/cases/conformance/types/members/objectTypeWithStringIndexerHidingObjectIndexer.ts(5,5): error TS2411: Property 'isPrototypeOf' of type '(v: Object) => boolean' is not assignable to string index type 'Object'.
-tests/cases/conformance/types/members/objectTypeWithStringIndexerHidingObjectIndexer.ts(5,5): error TS2411: Property 'propertyIsEnumerable' of type '(v: string) => boolean' is not assignable to string index type 'Object'.
+tests/cases/conformance/types/members/objectTypeWithStringIndexerHidingObjectIndexer.ts(5,5): error TS2411: Property 'propertyIsEnumerable' of type '(v: string | number | symbol) => boolean' is not assignable to string index type 'Object'.
 tests/cases/conformance/types/members/objectTypeWithStringIndexerHidingObjectIndexer.ts(5,5): error TS2411: Property 'toLocaleString' of type '() => string' is not assignable to string index type 'Object'.
 tests/cases/conformance/types/members/objectTypeWithStringIndexerHidingObjectIndexer.ts(5,5): error TS2411: Property 'toString' of type '() => string' is not assignable to string index type 'Object'.
 tests/cases/conformance/types/members/objectTypeWithStringIndexerHidingObjectIndexer.ts(5,5): error TS2411: Property 'valueOf' of type '() => Object' is not assignable to string index type 'Object'.
@@ -16,11 +16,11 @@ tests/cases/conformance/types/members/objectTypeWithStringIndexerHidingObjectInd
         ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2411: Property 'constructor' of type 'Function' is not assignable to string index type 'Object'.
         ~~~~~~~~~~~~~~~~~~~~
-!!! error TS2411: Property 'hasOwnProperty' of type '(v: string) => boolean' is not assignable to string index type 'Object'.
+!!! error TS2411: Property 'hasOwnProperty' of type '(v: string | number | symbol) => boolean' is not assignable to string index type 'Object'.
         ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2411: Property 'isPrototypeOf' of type '(v: Object) => boolean' is not assignable to string index type 'Object'.
         ~~~~~~~~~~~~~~~~~~~~
-!!! error TS2411: Property 'propertyIsEnumerable' of type '(v: string) => boolean' is not assignable to string index type 'Object'.
+!!! error TS2411: Property 'propertyIsEnumerable' of type '(v: string | number | symbol) => boolean' is not assignable to string index type 'Object'.
         ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2411: Property 'toLocaleString' of type '() => string' is not assignable to string index type 'Object'.
         ~~~~~~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/organizeImports/Unused_false_positive_export_shorthand.ts b/tests/baselines/reference/organizeImports/Unused_false_positive_export_shorthand.ts
new file mode 100644
index 00000000000..5cf0cbcae24
--- /dev/null
+++ b/tests/baselines/reference/organizeImports/Unused_false_positive_export_shorthand.ts
@@ -0,0 +1,9 @@
+// ==ORIGINAL==
+
+import { x } from "a";
+export { x };
+
+// ==ORGANIZED==
+
+import { x } from "a";
+export { x };
diff --git a/tests/baselines/reference/organizeImports/Unused_false_positive_shorthand_assignment.ts b/tests/baselines/reference/organizeImports/Unused_false_positive_shorthand_assignment.ts
new file mode 100644
index 00000000000..578b3dfc5e7
--- /dev/null
+++ b/tests/baselines/reference/organizeImports/Unused_false_positive_shorthand_assignment.ts
@@ -0,0 +1,9 @@
+// ==ORIGINAL==
+
+import { x } from "a";
+const o = { x };
+
+// ==ORGANIZED==
+
+import { x } from "a";
+const o = { x };
diff --git a/tests/baselines/reference/parserComputedPropertyName41.types b/tests/baselines/reference/parserComputedPropertyName41.types
index 897c4252f26..071ee36e18f 100644
--- a/tests/baselines/reference/parserComputedPropertyName41.types
+++ b/tests/baselines/reference/parserComputedPropertyName41.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName41.ts ===
 var v = {
->v : { [x: string]: boolean; }
->{    [0 in []]: true} : { [x: string]: boolean; }
+>v : {}
+>{    [0 in []]: true} : {}
 
     [0 in []]: true
 >[0 in []] : boolean
diff --git a/tests/baselines/reference/parserObjectCreationArrayLiteral1.errors.txt b/tests/baselines/reference/parserObjectCreationArrayLiteral1.errors.txt
index 051d2357635..413090769ad 100644
--- a/tests/baselines/reference/parserObjectCreationArrayLiteral1.errors.txt
+++ b/tests/baselines/reference/parserObjectCreationArrayLiteral1.errors.txt
@@ -1,10 +1,10 @@
 tests/cases/conformance/parser/ecmascript5/parserObjectCreationArrayLiteral1.ts(1,5): error TS2304: Cannot find name 'Foo'.
-tests/cases/conformance/parser/ecmascript5/parserObjectCreationArrayLiteral1.ts(1,8): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+tests/cases/conformance/parser/ecmascript5/parserObjectCreationArrayLiteral1.ts(1,9): error TS1011: An element access expression should take an argument.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/parserObjectCreationArrayLiteral1.ts (2 errors) ====
     new Foo[];
         ~~~
 !!! error TS2304: Cannot find name 'Foo'.
-           ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
\ No newline at end of file
+            
+!!! error TS1011: An element access expression should take an argument.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserObjectCreationArrayLiteral1.types b/tests/baselines/reference/parserObjectCreationArrayLiteral1.types
index 37a7fa0fa11..a44cf719566 100644
--- a/tests/baselines/reference/parserObjectCreationArrayLiteral1.types
+++ b/tests/baselines/reference/parserObjectCreationArrayLiteral1.types
@@ -3,4 +3,5 @@ new Foo[];
 >new Foo[] : any
 >Foo[] : any
 >Foo : any
+> : any
 
diff --git a/tests/baselines/reference/parserObjectCreationArrayLiteral3.errors.txt b/tests/baselines/reference/parserObjectCreationArrayLiteral3.errors.txt
index b7d18f471da..690558164ee 100644
--- a/tests/baselines/reference/parserObjectCreationArrayLiteral3.errors.txt
+++ b/tests/baselines/reference/parserObjectCreationArrayLiteral3.errors.txt
@@ -1,10 +1,10 @@
 tests/cases/conformance/parser/ecmascript5/parserObjectCreationArrayLiteral3.ts(1,5): error TS2304: Cannot find name 'Foo'.
-tests/cases/conformance/parser/ecmascript5/parserObjectCreationArrayLiteral3.ts(1,8): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+tests/cases/conformance/parser/ecmascript5/parserObjectCreationArrayLiteral3.ts(1,9): error TS1011: An element access expression should take an argument.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/parserObjectCreationArrayLiteral3.ts (2 errors) ====
     new Foo[]();
         ~~~
 !!! error TS2304: Cannot find name 'Foo'.
-           ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
\ No newline at end of file
+            
+!!! error TS1011: An element access expression should take an argument.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserObjectCreationArrayLiteral3.types b/tests/baselines/reference/parserObjectCreationArrayLiteral3.types
index c44eea0c755..0a7eb3bb820 100644
--- a/tests/baselines/reference/parserObjectCreationArrayLiteral3.types
+++ b/tests/baselines/reference/parserObjectCreationArrayLiteral3.types
@@ -3,4 +3,5 @@ new Foo[]();
 >new Foo[]() : any
 >Foo[] : any
 >Foo : any
+> : any
 
diff --git a/tests/baselines/reference/parserRealSource10.errors.txt b/tests/baselines/reference/parserRealSource10.errors.txt
index 6fd27b8351e..d53ef3c16f9 100644
--- a/tests/baselines/reference/parserRealSource10.errors.txt
+++ b/tests/baselines/reference/parserRealSource10.errors.txt
@@ -1,12 +1,12 @@
 tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(4,21): error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
 tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(127,33): error TS2449: Class 'TokenInfo' used before its declaration.
-tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(127,42): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(127,43): error TS1011: An element access expression should take an argument.
 tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(128,36): error TS2693: 'string' only refers to a type, but is being used as a value here.
-tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(128,42): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(128,43): error TS1011: An element access expression should take an argument.
 tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(129,41): error TS2693: 'number' only refers to a type, but is being used as a value here.
-tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(129,47): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(129,48): error TS1011: An element access expression should take an argument.
 tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(130,35): error TS2693: 'boolean' only refers to a type, but is being used as a value here.
-tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(130,42): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(130,43): error TS1011: An element access expression should take an argument.
 tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(179,54): error TS2304: Cannot find name 'ErrorRecoverySet'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(184,28): error TS2304: Cannot find name 'ErrorRecoverySet'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(188,34): error TS2304: Cannot find name 'NodeType'.
@@ -340,7 +340,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(312,128): error
 tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(312,149): error TS2304: Cannot find name 'ErrorRecoverySet'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(355,52): error TS2304: Cannot find name 'NodeType'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(356,53): error TS2304: Cannot find name 'NodeType'.
-tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(449,40): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(449,41): error TS1011: An element access expression should take an argument.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts (343 errors) ====
@@ -475,23 +475,23 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(449,40): error
         export var tokenTable = new TokenInfo[];
                                     ~~~~~~~~~
 !!! error TS2449: Class 'TokenInfo' used before its declaration.
-                                             ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                                              
+!!! error TS1011: An element access expression should take an argument.
         export var nodeTypeTable = new string[];
                                        ~~~~~~
 !!! error TS2693: 'string' only refers to a type, but is being used as a value here.
-                                             ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                                              
+!!! error TS1011: An element access expression should take an argument.
         export var nodeTypeToTokTable = new number[];
                                             ~~~~~~
 !!! error TS2693: 'number' only refers to a type, but is being used as a value here.
-                                                  ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                                                   
+!!! error TS1011: An element access expression should take an argument.
         export var noRegexTable = new boolean[];
                                       ~~~~~~~
 !!! error TS2693: 'boolean' only refers to a type, but is being used as a value here.
-                                             ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                                              
+!!! error TS1011: An element access expression should take an argument.
     
         noRegexTable[TokenID.Identifier] = true;
         noRegexTable[TokenID.StringLiteral] = true;
@@ -1477,8 +1477,8 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(449,40): error
     
         // TODO: new with length TokenID.LimFixed
         export var staticTokens = new Token[];
-                                           ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                                            
+!!! error TS1011: An element access expression should take an argument.
         export function initializeStaticTokens() {
             for (var i = 0; i <= TokenID.LimFixed; i++) {
                 staticTokens[i] = new Token(i);
diff --git a/tests/baselines/reference/parserRealSource10.types b/tests/baselines/reference/parserRealSource10.types
index 90773019475..9962a763c72 100644
--- a/tests/baselines/reference/parserRealSource10.types
+++ b/tests/baselines/reference/parserRealSource10.types
@@ -365,24 +365,28 @@ module TypeScript {
 >new TokenInfo[] : any
 >TokenInfo[] : any
 >TokenInfo : typeof TokenInfo
+> : any
 
     export var nodeTypeTable = new string[];
 >nodeTypeTable : any
 >new string[] : any
 >string[] : any
 >string : any
+> : any
 
     export var nodeTypeToTokTable = new number[];
 >nodeTypeToTokTable : any
 >new number[] : any
 >number[] : any
 >number : any
+> : any
 
     export var noRegexTable = new boolean[];
 >noRegexTable : any
 >new boolean[] : any
 >boolean[] : any
 >boolean : any
+> : any
 
     noRegexTable[TokenID.Identifier] = true;
 >noRegexTable[TokenID.Identifier] = true : true
@@ -3949,6 +3953,7 @@ module TypeScript {
 >new Token[] : any
 >Token[] : any
 >Token : typeof Token
+> : any
 
     export function initializeStaticTokens() {
 >initializeStaticTokens : () => void
diff --git a/tests/baselines/reference/parserRealSource11.errors.txt b/tests/baselines/reference/parserRealSource11.errors.txt
index 598b447d965..0b676969a02 100644
--- a/tests/baselines/reference/parserRealSource11.errors.txt
+++ b/tests/baselines/reference/parserRealSource11.errors.txt
@@ -40,7 +40,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(151,57): error
 tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(155,26): error TS2304: Cannot find name 'NodeType'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(184,19): error TS2304: Cannot find name 'NodeType'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(192,32): error TS2304: Cannot find name 'SymbolScope'.
-tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(193,40): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(193,41): error TS1011: An element access expression should take an argument.
 tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(196,19): error TS2304: Cannot find name 'NodeType'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(199,42): error TS2304: Cannot find name 'ControlFlowContext'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(219,33): error TS2304: Cannot find name 'NodeType'.
@@ -215,7 +215,6 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(838,24): error
 tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(841,61): error TS2304: Cannot find name 'TypeSymbol'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(850,52): error TS2304: Cannot find name 'TokenID'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(863,36): error TS2304: Cannot find name 'TypeFlow'.
-tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(867,29): error TS1015: Parameter cannot have question mark and initializer.
 tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(868,38): error TS2304: Cannot find name 'NodeType'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(877,40): error TS2304: Cannot find name 'NodeType'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(891,27): error TS2304: Cannot find name 'VarFlags'.
@@ -252,9 +251,9 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(1004,44): error
 tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(1004,67): error TS2304: Cannot find name 'FncFlags'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(1005,57): error TS2304: Cannot find name 'FncFlags'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(1007,47): error TS2304: Cannot find name 'Symbol'.
-tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(1009,45): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(1009,46): error TS1011: An element access expression should take an argument.
 tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(1022,32): error TS2304: Cannot find name 'Symbol'.
-tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(1024,47): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(1024,48): error TS1011: An element access expression should take an argument.
 tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(1032,36): error TS2304: Cannot find name 'ControlFlowContext'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(1033,29): error TS2304: Cannot find name 'BasicBlock'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(1034,28): error TS2304: Cannot find name 'BasicBlock'.
@@ -517,7 +516,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(2356,30): error
 tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(2356,48): error TS2304: Cannot find name 'TokenID'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts (517 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts (516 errors) ====
     // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. 
     // See LICENSE.txt in the project root for complete license information.
     
@@ -795,8 +794,8 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(2356,48): error
                                    ~~~~~~~~~~~
 !!! error TS2304: Cannot find name 'SymbolScope'.
             public members: AST[] = new AST[];
-                                           ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                                            
+!!! error TS1011: An element access expression should take an argument.
     
             constructor () {
                 super(NodeType.List);
@@ -1819,8 +1818,6 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(2356,48): error
             }
     
             public getAliasName(aliasAST?: AST = this.alias) : string {
-                                ~~~~~~~~
-!!! error TS1015: Parameter cannot have question mark and initializer.
                 if (aliasAST.nodeType == NodeType.Name) {
                                          ~~~~~~~~
 !!! error TS2304: Cannot find name 'NodeType'.
@@ -2035,8 +2032,8 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(2356,48): error
 !!! error TS2304: Cannot find name 'Symbol'.
                 if (this.envids == null) {
                     this.envids = new Identifier[];
-                                                ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                                                 
+!!! error TS1011: An element access expression should take an argument.
                 }
                 this.envids[this.envids.length] = id;
                 var outerFnc = this.enclosingFnc;
@@ -2054,8 +2051,8 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(2356,48): error
 !!! error TS2304: Cannot find name 'Symbol'.
                 if (this.jumpRefs == null) {
                     this.jumpRefs = new Identifier[];
-                                                  ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                                                   
+!!! error TS1011: An element access expression should take an argument.
                 }
                 var id = new Identifier(sym.name);
                 this.jumpRefs[this.jumpRefs.length] = id;
diff --git a/tests/baselines/reference/parserRealSource11.types b/tests/baselines/reference/parserRealSource11.types
index 389db34d7c6..389292c7f03 100644
--- a/tests/baselines/reference/parserRealSource11.types
+++ b/tests/baselines/reference/parserRealSource11.types
@@ -853,6 +853,7 @@ module TypeScript {
 >new AST[] : any
 >AST[] : any
 >AST : typeof AST
+> : any
 
         constructor () {
             super(NodeType.List);
@@ -4642,6 +4643,7 @@ module TypeScript {
 >new Identifier[] : any
 >Identifier[] : any
 >Identifier : typeof Identifier
+> : any
             }
             this.envids[this.envids.length] = id;
 >this.envids[this.envids.length] = id : Identifier
@@ -4724,6 +4726,7 @@ module TypeScript {
 >new Identifier[] : any
 >Identifier[] : any
 >Identifier : typeof Identifier
+> : any
             }
             var id = new Identifier(sym.name);
 >id : Identifier
diff --git a/tests/baselines/reference/parserRealSource4.errors.txt b/tests/baselines/reference/parserRealSource4.errors.txt
index 5fe47b7a8e3..ed703c60c20 100644
--- a/tests/baselines/reference/parserRealSource4.errors.txt
+++ b/tests/baselines/reference/parserRealSource4.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/parser/ecmascript5/parserRealSource4.ts(4,21): error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
-tests/cases/conformance/parser/ecmascript5/parserRealSource4.ts(195,37): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+tests/cases/conformance/parser/ecmascript5/parserRealSource4.ts(195,38): error TS1011: An element access expression should take an argument.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/parserRealSource4.ts (2 errors) ====
@@ -200,8 +200,8 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource4.ts(195,37): error T
         export class HashTable {
             public itemCount: number = 0;
             public table = new HashEntry[];
-                                        ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                                         
+!!! error TS1011: An element access expression should take an argument.
     
             constructor (public size: number, public hashFn: (key) =>number,
                         public equalsFn: (key1, key2) =>boolean) {
diff --git a/tests/baselines/reference/parserRealSource4.types b/tests/baselines/reference/parserRealSource4.types
index 175ea23db81..ed0d23feb41 100644
--- a/tests/baselines/reference/parserRealSource4.types
+++ b/tests/baselines/reference/parserRealSource4.types
@@ -748,6 +748,7 @@ module TypeScript {
 >new HashEntry[] : any
 >HashEntry[] : any
 >HashEntry : typeof HashEntry
+> : any
 
         constructor (public size: number, public hashFn: (key) =>number,
 >size : number
diff --git a/tests/baselines/reference/parserRealSource7.errors.txt b/tests/baselines/reference/parserRealSource7.errors.txt
index 7d9627d4823..4afc02b71aa 100644
--- a/tests/baselines/reference/parserRealSource7.errors.txt
+++ b/tests/baselines/reference/parserRealSource7.errors.txt
@@ -2,7 +2,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource7.ts(4,21): error TS6
 tests/cases/conformance/parser/ecmascript5/parserRealSource7.ts(12,38): error TS2304: Cannot find name 'ASTList'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource7.ts(12,62): error TS2304: Cannot find name 'TypeLink'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource7.ts(16,37): error TS2552: Cannot find name 'TypeLink'. Did you mean 'typeLink'?
-tests/cases/conformance/parser/ecmascript5/parserRealSource7.ts(16,45): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+tests/cases/conformance/parser/ecmascript5/parserRealSource7.ts(16,46): error TS1011: An element access expression should take an argument.
 tests/cases/conformance/parser/ecmascript5/parserRealSource7.ts(21,36): error TS2552: Cannot find name 'TypeLink'. Did you mean 'typeLink'?
 tests/cases/conformance/parser/ecmascript5/parserRealSource7.ts(29,29): error TS2304: Cannot find name 'Type'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource7.ts(29,45): error TS2304: Cannot find name 'TypeDeclaration'.
@@ -328,8 +328,8 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource7.ts(828,13): error T
                     baseTypeLinks = new TypeLink[];
                                         ~~~~~~~~
 !!! error TS2552: Cannot find name 'TypeLink'. Did you mean 'typeLink'?
-                                                ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                                                 
+!!! error TS1011: An element access expression should take an argument.
                 }
                 for (var i = 0; i < len; i++) {
                     var baseExpr = bases.members[i];
diff --git a/tests/baselines/reference/parserRealSource7.types b/tests/baselines/reference/parserRealSource7.types
index 6a52d684573..838b2576d24 100644
--- a/tests/baselines/reference/parserRealSource7.types
+++ b/tests/baselines/reference/parserRealSource7.types
@@ -48,6 +48,7 @@ module TypeScript {
 >new TypeLink[] : any
 >TypeLink[] : any
 >TypeLink : any
+> : any
             }
             for (var i = 0; i < len; i++) {
 >i : number
diff --git a/tests/baselines/reference/parserRealSource9.errors.txt b/tests/baselines/reference/parserRealSource9.errors.txt
index 6533fdbcfc4..0d918c7878c 100644
--- a/tests/baselines/reference/parserRealSource9.errors.txt
+++ b/tests/baselines/reference/parserRealSource9.errors.txt
@@ -4,7 +4,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource9.ts(9,48): error TS2
 tests/cases/conformance/parser/ecmascript5/parserRealSource9.ts(9,67): error TS2304: Cannot find name 'SymbolScope'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource9.ts(10,30): error TS2304: Cannot find name 'Type'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource9.ts(12,35): error TS2304: Cannot find name 'Type'.
-tests/cases/conformance/parser/ecmascript5/parserRealSource9.ts(12,39): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+tests/cases/conformance/parser/ecmascript5/parserRealSource9.ts(12,40): error TS1011: An element access expression should take an argument.
 tests/cases/conformance/parser/ecmascript5/parserRealSource9.ts(29,36): error TS2304: Cannot find name 'SymbolScope'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource9.ts(29,55): error TS2304: Cannot find name 'Type'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource9.ts(67,54): error TS2304: Cannot find name 'SignatureGroup'.
@@ -58,8 +58,8 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource9.ts(200,48): error T
                     extendsList = new Type[];
                                       ~~~~
 !!! error TS2304: Cannot find name 'Type'.
-                                          ~~
-!!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                                           
+!!! error TS1011: An element access expression should take an argument.
                     for (var i = 0, len = typeLinks.length; i < len; i++) {
                         var typeLink = typeLinks[i];
                         this.checker.resolvingBases = true;
diff --git a/tests/baselines/reference/parserRealSource9.types b/tests/baselines/reference/parserRealSource9.types
index 7293d9f3d26..17a8591b3ec 100644
--- a/tests/baselines/reference/parserRealSource9.types
+++ b/tests/baselines/reference/parserRealSource9.types
@@ -35,6 +35,7 @@ module TypeScript {
 >new Type[] : any
 >Type[] : any
 >Type : any
+> : any
 
                 for (var i = 0, len = typeLinks.length; i < len; i++) {
 >i : number
diff --git a/tests/baselines/reference/parserUsingConstructorAsIdentifier.types b/tests/baselines/reference/parserUsingConstructorAsIdentifier.types
index fa5e60a12b8..d0cd25f887d 100644
--- a/tests/baselines/reference/parserUsingConstructorAsIdentifier.types
+++ b/tests/baselines/reference/parserUsingConstructorAsIdentifier.types
@@ -90,9 +90,9 @@
 
                 Object.defineProperty(constructor.prototype, "constructor", { value: constructor, writable: true, configurable: true, enumerable: true });
 >Object.defineProperty(constructor.prototype, "constructor", { value: constructor, writable: true, configurable: true, enumerable: true }) : any
->Object.defineProperty : (o: any, p: string, attributes: PropertyDescriptor & ThisType<any>) => any
+>Object.defineProperty : (o: any, p: string | number | symbol, attributes: PropertyDescriptor & ThisType<any>) => any
 >Object : ObjectConstructor
->defineProperty : (o: any, p: string, attributes: PropertyDescriptor & ThisType<any>) => any
+>defineProperty : (o: any, p: string | number | symbol, attributes: PropertyDescriptor & ThisType<any>) => any
 >constructor.prototype : any
 >constructor : any
 >prototype : any
diff --git a/tests/baselines/reference/parserharness.types b/tests/baselines/reference/parserharness.types
index 505cfe67c82..cc8bae97706 100644
--- a/tests/baselines/reference/parserharness.types
+++ b/tests/baselines/reference/parserharness.types
@@ -2810,11 +2810,11 @@ module Harness {
 
                     if (this.fileCollection.hasOwnProperty(p)) {
 >this.fileCollection.hasOwnProperty(p) : boolean
->this.fileCollection.hasOwnProperty : (v: string) => boolean
+>this.fileCollection.hasOwnProperty : (v: string | number | symbol) => boolean
 >this.fileCollection : {}
 >this : this
 >fileCollection : {}
->hasOwnProperty : (v: string) => boolean
+>hasOwnProperty : (v: string | number | symbol) => boolean
 >p : string
 
                         var current = <Harness.Compiler.WriterAggregator>this.fileCollection[p];
diff --git a/tests/baselines/reference/promiseType.symbols b/tests/baselines/reference/promiseType.symbols
index 5eea680f9fb..f33d26b8506 100644
--- a/tests/baselines/reference/promiseType.symbols
+++ b/tests/baselines/reference/promiseType.symbols
@@ -91,9 +91,9 @@ async function F() {
 >e : Symbol(e, Decl(promiseType.ts, 47, 11))
 
         return Promise.reject(Error());
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
     }
 }
@@ -150,9 +150,9 @@ async function I() {
 >e : Symbol(e, Decl(promiseType.ts, 77, 11))
 
         return Promise.reject(Error());
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
     }
 }
@@ -227,9 +227,9 @@ const p18 = p.catch(() => Promise.reject(1));
 >p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseType.ts, 0, 11))
 >catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const p19 = p.catch(() => Promise.resolve(1));
 >p19 : Symbol(p19, Decl(promiseType.ts, 96, 5))
@@ -305,9 +305,9 @@ const p29 = p.then(() => Promise.reject(1));
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseType.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const p30 = p.then(undefined, undefined);
 >p30 : Symbol(p30, Decl(promiseType.ts, 109, 5))
@@ -384,9 +384,9 @@ const p39 = p.then(undefined, () => Promise.reject(1));
 >p : Symbol(p, Decl(promiseType.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >undefined : Symbol(undefined)
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const p40 = p.then(null, undefined);
 >p40 : Symbol(p40, Decl(promiseType.ts, 120, 5))
@@ -453,9 +453,9 @@ const p49 = p.then(null, () => Promise.reject(1));
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseType.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const p50 = p.then(() => "1", undefined);
 >p50 : Symbol(p50, Decl(promiseType.ts, 131, 5))
@@ -522,9 +522,9 @@ const p59 = p.then(() => "1", () => Promise.reject(1));
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseType.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const p60 = p.then(() => x, undefined);
 >p60 : Symbol(p60, Decl(promiseType.ts, 142, 5))
@@ -601,9 +601,9 @@ const p69 = p.then(() => x, () => Promise.reject(1));
 >p : Symbol(p, Decl(promiseType.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >x : Symbol(x, Decl(promiseType.ts, 1, 11))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const p70 = p.then(() => undefined, undefined);
 >p70 : Symbol(p70, Decl(promiseType.ts, 153, 5))
@@ -680,9 +680,9 @@ const p79 = p.then(() => undefined, () => Promise.reject(1));
 >p : Symbol(p, Decl(promiseType.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >undefined : Symbol(undefined)
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const p80 = p.then(() => null, undefined);
 >p80 : Symbol(p80, Decl(promiseType.ts, 164, 5))
@@ -749,9 +749,9 @@ const p89 = p.then(() => null, () => Promise.reject(1));
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseType.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const p90 = p.then(() => {}, undefined);
 >p90 : Symbol(p90, Decl(promiseType.ts, 175, 5))
@@ -818,9 +818,9 @@ const p99 = p.then(() => {}, () => Promise.reject(1));
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseType.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const pa0 = p.then(() => {throw 1}, undefined);
 >pa0 : Symbol(pa0, Decl(promiseType.ts, 186, 5))
@@ -887,9 +887,9 @@ const pa9 = p.then(() => {throw 1}, () => Promise.reject(1));
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseType.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const pb0 = p.then(() => Promise.resolve("1"), undefined);
 >pb0 : Symbol(pb0, Decl(promiseType.ts, 197, 5))
@@ -986,18 +986,18 @@ const pb9 = p.then(() => Promise.resolve("1"), () => Promise.reject(1));
 >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
 >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const pc0 = p.then(() => Promise.reject("1"), undefined);
 >pc0 : Symbol(pc0, Decl(promiseType.ts, 208, 5))
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseType.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >undefined : Symbol(undefined)
 
 const pc1 = p.then(() => Promise.reject("1"), null);
@@ -1005,27 +1005,27 @@ const pc1 = p.then(() => Promise.reject("1"), null);
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseType.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const pc2 = p.then(() => Promise.reject("1"), () => 1);
 >pc2 : Symbol(pc2, Decl(promiseType.ts, 210, 5))
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseType.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const pc3 = p.then(() => Promise.reject("1"), () => x);
 >pc3 : Symbol(pc3, Decl(promiseType.ts, 211, 5))
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseType.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >x : Symbol(x, Decl(promiseType.ts, 1, 11))
 
 const pc4 = p.then(() => Promise.reject("1"), () => undefined);
@@ -1033,9 +1033,9 @@ const pc4 = p.then(() => Promise.reject("1"), () => undefined);
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseType.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >undefined : Symbol(undefined)
 
 const pc5 = p.then(() => Promise.reject("1"), () => null);
@@ -1043,36 +1043,36 @@ const pc5 = p.then(() => Promise.reject("1"), () => null);
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseType.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const pc6 = p.then(() => Promise.reject("1"), () => {});
 >pc6 : Symbol(pc6, Decl(promiseType.ts, 214, 5))
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseType.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const pc7 = p.then(() => Promise.reject("1"), () => {throw 1});
 >pc7 : Symbol(pc7, Decl(promiseType.ts, 215, 5))
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseType.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const pc8 = p.then(() => Promise.reject("1"), () => Promise.resolve(1));
 >pc8 : Symbol(pc8, Decl(promiseType.ts, 216, 5))
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseType.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
 >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
@@ -1082,10 +1082,10 @@ const pc9 = p.then(() => Promise.reject("1"), () => Promise.reject(1));
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseType.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
diff --git a/tests/baselines/reference/promiseType.types b/tests/baselines/reference/promiseType.types
index 3228d266319..f5674143bb8 100644
--- a/tests/baselines/reference/promiseType.types
+++ b/tests/baselines/reference/promiseType.types
@@ -105,9 +105,9 @@ async function F() {
 
         return Promise.reject(Error());
 >Promise.reject(Error()) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >Error() : Error
 >Error : ErrorConstructor
     }
@@ -170,9 +170,9 @@ async function I() {
 
         return Promise.reject(Error());
 >Promise.reject(Error()) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >Error() : Error
 >Error : ErrorConstructor
     }
@@ -271,9 +271,9 @@ const p18 = p.catch(() => Promise.reject(1));
 >catch : <TResult = never>(onrejected?: (reason: any) => TResult | PromiseLike<TResult>) => Promise<boolean | TResult>
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
 const p19 = p.catch(() => Promise.resolve(1));
@@ -379,9 +379,9 @@ const p29 = p.then(() => Promise.reject(1));
 >then : <TResult1 = boolean, TResult2 = never>(onfulfilled?: (value: boolean) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
 const p30 = p.then(undefined, undefined);
@@ -484,9 +484,9 @@ const p39 = p.then(undefined, () => Promise.reject(1));
 >undefined : undefined
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
 const p40 = p.then(null, undefined);
@@ -589,9 +589,9 @@ const p49 = p.then(null, () => Promise.reject(1));
 >null : null
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
 const p50 = p.then(() => "1", undefined);
@@ -704,9 +704,9 @@ const p59 = p.then(() => "1", () => Promise.reject(1));
 >"1" : "1"
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
 const p60 = p.then(() => x, undefined);
@@ -819,9 +819,9 @@ const p69 = p.then(() => x, () => Promise.reject(1));
 >x : any
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
 const p70 = p.then(() => undefined, undefined);
@@ -934,9 +934,9 @@ const p79 = p.then(() => undefined, () => Promise.reject(1));
 >undefined : undefined
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
 const p80 = p.then(() => null, undefined);
@@ -1049,9 +1049,9 @@ const p89 = p.then(() => null, () => Promise.reject(1));
 >null : null
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
 const p90 = p.then(() => {}, undefined);
@@ -1154,9 +1154,9 @@ const p99 = p.then(() => {}, () => Promise.reject(1));
 >() => {} : () => void
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
 const pa0 = p.then(() => {throw 1}, undefined);
@@ -1269,9 +1269,9 @@ const pa9 = p.then(() => {throw 1}, () => Promise.reject(1));
 >1 : 1
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
 const pb0 = p.then(() => Promise.resolve("1"), undefined);
@@ -1424,9 +1424,9 @@ const pb9 = p.then(() => Promise.resolve("1"), () => Promise.reject(1));
 >"1" : "1"
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
 const pc0 = p.then(() => Promise.reject("1"), undefined);
@@ -1437,9 +1437,9 @@ const pc0 = p.then(() => Promise.reject("1"), undefined);
 >then : <TResult1 = boolean, TResult2 = never>(onfulfilled?: (value: boolean) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
 >() => Promise.reject("1") : () => Promise<never>
 >Promise.reject("1") : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >"1" : "1"
 >undefined : undefined
 
@@ -1451,9 +1451,9 @@ const pc1 = p.then(() => Promise.reject("1"), null);
 >then : <TResult1 = boolean, TResult2 = never>(onfulfilled?: (value: boolean) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
 >() => Promise.reject("1") : () => Promise<never>
 >Promise.reject("1") : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >"1" : "1"
 >null : null
 
@@ -1465,9 +1465,9 @@ const pc2 = p.then(() => Promise.reject("1"), () => 1);
 >then : <TResult1 = boolean, TResult2 = never>(onfulfilled?: (value: boolean) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
 >() => Promise.reject("1") : () => Promise<never>
 >Promise.reject("1") : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >"1" : "1"
 >() => 1 : () => number
 >1 : 1
@@ -1480,9 +1480,9 @@ const pc3 = p.then(() => Promise.reject("1"), () => x);
 >then : <TResult1 = boolean, TResult2 = never>(onfulfilled?: (value: boolean) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
 >() => Promise.reject("1") : () => Promise<never>
 >Promise.reject("1") : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >"1" : "1"
 >() => x : () => any
 >x : any
@@ -1495,9 +1495,9 @@ const pc4 = p.then(() => Promise.reject("1"), () => undefined);
 >then : <TResult1 = boolean, TResult2 = never>(onfulfilled?: (value: boolean) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
 >() => Promise.reject("1") : () => Promise<never>
 >Promise.reject("1") : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >"1" : "1"
 >() => undefined : () => any
 >undefined : undefined
@@ -1510,9 +1510,9 @@ const pc5 = p.then(() => Promise.reject("1"), () => null);
 >then : <TResult1 = boolean, TResult2 = never>(onfulfilled?: (value: boolean) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
 >() => Promise.reject("1") : () => Promise<never>
 >Promise.reject("1") : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >"1" : "1"
 >() => null : () => any
 >null : null
@@ -1525,9 +1525,9 @@ const pc6 = p.then(() => Promise.reject("1"), () => {});
 >then : <TResult1 = boolean, TResult2 = never>(onfulfilled?: (value: boolean) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
 >() => Promise.reject("1") : () => Promise<never>
 >Promise.reject("1") : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >"1" : "1"
 >() => {} : () => void
 
@@ -1539,9 +1539,9 @@ const pc7 = p.then(() => Promise.reject("1"), () => {throw 1});
 >then : <TResult1 = boolean, TResult2 = never>(onfulfilled?: (value: boolean) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
 >() => Promise.reject("1") : () => Promise<never>
 >Promise.reject("1") : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >"1" : "1"
 >() => {throw 1} : () => never
 >1 : 1
@@ -1554,9 +1554,9 @@ const pc8 = p.then(() => Promise.reject("1"), () => Promise.resolve(1));
 >then : <TResult1 = boolean, TResult2 = never>(onfulfilled?: (value: boolean) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
 >() => Promise.reject("1") : () => Promise<never>
 >Promise.reject("1") : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >"1" : "1"
 >() => Promise.resolve(1) : () => Promise<number>
 >Promise.resolve(1) : Promise<number>
@@ -1573,14 +1573,14 @@ const pc9 = p.then(() => Promise.reject("1"), () => Promise.reject(1));
 >then : <TResult1 = boolean, TResult2 = never>(onfulfilled?: (value: boolean) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
 >() => Promise.reject("1") : () => Promise<never>
 >Promise.reject("1") : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >"1" : "1"
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
diff --git a/tests/baselines/reference/promiseTypeStrictNull.symbols b/tests/baselines/reference/promiseTypeStrictNull.symbols
index 3fabb7f16b7..30609978642 100644
--- a/tests/baselines/reference/promiseTypeStrictNull.symbols
+++ b/tests/baselines/reference/promiseTypeStrictNull.symbols
@@ -91,9 +91,9 @@ async function F() {
 >e : Symbol(e, Decl(promiseTypeStrictNull.ts, 47, 11))
 
         return Promise.reject(Error());
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
     }
 }
@@ -150,9 +150,9 @@ async function I() {
 >e : Symbol(e, Decl(promiseTypeStrictNull.ts, 77, 11))
 
         return Promise.reject(Error());
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
     }
 }
@@ -227,9 +227,9 @@ const p18 = p.catch(() => Promise.reject(1));
 >p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11))
 >catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const p19 = p.catch(() => Promise.resolve(1));
 >p19 : Symbol(p19, Decl(promiseTypeStrictNull.ts, 96, 5))
@@ -305,9 +305,9 @@ const p29 = p.then(() => Promise.reject(1));
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const p30 = p.then(undefined, undefined);
 >p30 : Symbol(p30, Decl(promiseTypeStrictNull.ts, 109, 5))
@@ -384,9 +384,9 @@ const p39 = p.then(undefined, () => Promise.reject(1));
 >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >undefined : Symbol(undefined)
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const p40 = p.then(null, undefined);
 >p40 : Symbol(p40, Decl(promiseTypeStrictNull.ts, 120, 5))
@@ -453,9 +453,9 @@ const p49 = p.then(null, () => Promise.reject(1));
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const p50 = p.then(() => "1", undefined);
 >p50 : Symbol(p50, Decl(promiseTypeStrictNull.ts, 131, 5))
@@ -522,9 +522,9 @@ const p59 = p.then(() => "1", () => Promise.reject(1));
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const p60 = p.then(() => x, undefined);
 >p60 : Symbol(p60, Decl(promiseTypeStrictNull.ts, 142, 5))
@@ -601,9 +601,9 @@ const p69 = p.then(() => x, () => Promise.reject(1));
 >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >x : Symbol(x, Decl(promiseTypeStrictNull.ts, 1, 11))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const p70 = p.then(() => undefined, undefined);
 >p70 : Symbol(p70, Decl(promiseTypeStrictNull.ts, 153, 5))
@@ -680,9 +680,9 @@ const p79 = p.then(() => undefined, () => Promise.reject(1));
 >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >undefined : Symbol(undefined)
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const p80 = p.then(() => null, undefined);
 >p80 : Symbol(p80, Decl(promiseTypeStrictNull.ts, 164, 5))
@@ -749,9 +749,9 @@ const p89 = p.then(() => null, () => Promise.reject(1));
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const p90 = p.then(() => {}, undefined);
 >p90 : Symbol(p90, Decl(promiseTypeStrictNull.ts, 175, 5))
@@ -818,9 +818,9 @@ const p99 = p.then(() => {}, () => Promise.reject(1));
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const pa0 = p.then(() => {throw 1}, undefined);
 >pa0 : Symbol(pa0, Decl(promiseTypeStrictNull.ts, 186, 5))
@@ -887,9 +887,9 @@ const pa9 = p.then(() => {throw 1}, () => Promise.reject(1));
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const pb0 = p.then(() => Promise.resolve("1"), undefined);
 >pb0 : Symbol(pb0, Decl(promiseTypeStrictNull.ts, 197, 5))
@@ -986,18 +986,18 @@ const pb9 = p.then(() => Promise.resolve("1"), () => Promise.reject(1));
 >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
 >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const pc0 = p.then(() => Promise.reject("1"), undefined);
 >pc0 : Symbol(pc0, Decl(promiseTypeStrictNull.ts, 208, 5))
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >undefined : Symbol(undefined)
 
 const pc1 = p.then(() => Promise.reject("1"), null);
@@ -1005,27 +1005,27 @@ const pc1 = p.then(() => Promise.reject("1"), null);
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const pc2 = p.then(() => Promise.reject("1"), () => 1);
 >pc2 : Symbol(pc2, Decl(promiseTypeStrictNull.ts, 210, 5))
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const pc3 = p.then(() => Promise.reject("1"), () => x);
 >pc3 : Symbol(pc3, Decl(promiseTypeStrictNull.ts, 211, 5))
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >x : Symbol(x, Decl(promiseTypeStrictNull.ts, 1, 11))
 
 const pc4 = p.then(() => Promise.reject("1"), () => undefined);
@@ -1033,9 +1033,9 @@ const pc4 = p.then(() => Promise.reject("1"), () => undefined);
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >undefined : Symbol(undefined)
 
 const pc5 = p.then(() => Promise.reject("1"), () => null);
@@ -1043,36 +1043,36 @@ const pc5 = p.then(() => Promise.reject("1"), () => null);
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const pc6 = p.then(() => Promise.reject("1"), () => {});
 >pc6 : Symbol(pc6, Decl(promiseTypeStrictNull.ts, 214, 5))
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const pc7 = p.then(() => Promise.reject("1"), () => {throw 1});
 >pc7 : Symbol(pc7, Decl(promiseTypeStrictNull.ts, 215, 5))
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
 const pc8 = p.then(() => Promise.reject("1"), () => Promise.resolve(1));
 >pc8 : Symbol(pc8, Decl(promiseTypeStrictNull.ts, 216, 5))
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
 >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
@@ -1082,10 +1082,10 @@ const pc9 = p.then(() => Promise.reject("1"), () => Promise.reject(1));
 >p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11))
 >then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
->reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --))
 
diff --git a/tests/baselines/reference/promiseTypeStrictNull.types b/tests/baselines/reference/promiseTypeStrictNull.types
index 7bb75ec66f2..99c16c0b511 100644
--- a/tests/baselines/reference/promiseTypeStrictNull.types
+++ b/tests/baselines/reference/promiseTypeStrictNull.types
@@ -105,9 +105,9 @@ async function F() {
 
         return Promise.reject(Error());
 >Promise.reject(Error()) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >Error() : Error
 >Error : ErrorConstructor
     }
@@ -170,9 +170,9 @@ async function I() {
 
         return Promise.reject(Error());
 >Promise.reject(Error()) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >Error() : Error
 >Error : ErrorConstructor
     }
@@ -271,9 +271,9 @@ const p18 = p.catch(() => Promise.reject(1));
 >catch : <TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null | undefined) => Promise<boolean | TResult>
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
 const p19 = p.catch(() => Promise.resolve(1));
@@ -379,9 +379,9 @@ const p29 = p.then(() => Promise.reject(1));
 >then : <TResult1 = boolean, TResult2 = never>(onfulfilled?: ((value: boolean) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
 const p30 = p.then(undefined, undefined);
@@ -484,9 +484,9 @@ const p39 = p.then(undefined, () => Promise.reject(1));
 >undefined : undefined
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
 const p40 = p.then(null, undefined);
@@ -589,9 +589,9 @@ const p49 = p.then(null, () => Promise.reject(1));
 >null : null
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
 const p50 = p.then(() => "1", undefined);
@@ -704,9 +704,9 @@ const p59 = p.then(() => "1", () => Promise.reject(1));
 >"1" : "1"
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
 const p60 = p.then(() => x, undefined);
@@ -819,9 +819,9 @@ const p69 = p.then(() => x, () => Promise.reject(1));
 >x : any
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
 const p70 = p.then(() => undefined, undefined);
@@ -934,9 +934,9 @@ const p79 = p.then(() => undefined, () => Promise.reject(1));
 >undefined : undefined
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
 const p80 = p.then(() => null, undefined);
@@ -1049,9 +1049,9 @@ const p89 = p.then(() => null, () => Promise.reject(1));
 >null : null
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
 const p90 = p.then(() => {}, undefined);
@@ -1154,9 +1154,9 @@ const p99 = p.then(() => {}, () => Promise.reject(1));
 >() => {} : () => void
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
 const pa0 = p.then(() => {throw 1}, undefined);
@@ -1269,9 +1269,9 @@ const pa9 = p.then(() => {throw 1}, () => Promise.reject(1));
 >1 : 1
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
 const pb0 = p.then(() => Promise.resolve("1"), undefined);
@@ -1424,9 +1424,9 @@ const pb9 = p.then(() => Promise.resolve("1"), () => Promise.reject(1));
 >"1" : "1"
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
 const pc0 = p.then(() => Promise.reject("1"), undefined);
@@ -1437,9 +1437,9 @@ const pc0 = p.then(() => Promise.reject("1"), undefined);
 >then : <TResult1 = boolean, TResult2 = never>(onfulfilled?: ((value: boolean) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>
 >() => Promise.reject("1") : () => Promise<never>
 >Promise.reject("1") : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >"1" : "1"
 >undefined : undefined
 
@@ -1451,9 +1451,9 @@ const pc1 = p.then(() => Promise.reject("1"), null);
 >then : <TResult1 = boolean, TResult2 = never>(onfulfilled?: ((value: boolean) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>
 >() => Promise.reject("1") : () => Promise<never>
 >Promise.reject("1") : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >"1" : "1"
 >null : null
 
@@ -1465,9 +1465,9 @@ const pc2 = p.then(() => Promise.reject("1"), () => 1);
 >then : <TResult1 = boolean, TResult2 = never>(onfulfilled?: ((value: boolean) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>
 >() => Promise.reject("1") : () => Promise<never>
 >Promise.reject("1") : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >"1" : "1"
 >() => 1 : () => number
 >1 : 1
@@ -1480,9 +1480,9 @@ const pc3 = p.then(() => Promise.reject("1"), () => x);
 >then : <TResult1 = boolean, TResult2 = never>(onfulfilled?: ((value: boolean) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>
 >() => Promise.reject("1") : () => Promise<never>
 >Promise.reject("1") : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >"1" : "1"
 >() => x : () => any
 >x : any
@@ -1495,9 +1495,9 @@ const pc4 = p.then(() => Promise.reject("1"), () => undefined);
 >then : <TResult1 = boolean, TResult2 = never>(onfulfilled?: ((value: boolean) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>
 >() => Promise.reject("1") : () => Promise<never>
 >Promise.reject("1") : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >"1" : "1"
 >() => undefined : () => undefined
 >undefined : undefined
@@ -1510,9 +1510,9 @@ const pc5 = p.then(() => Promise.reject("1"), () => null);
 >then : <TResult1 = boolean, TResult2 = never>(onfulfilled?: ((value: boolean) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>
 >() => Promise.reject("1") : () => Promise<never>
 >Promise.reject("1") : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >"1" : "1"
 >() => null : () => null
 >null : null
@@ -1525,9 +1525,9 @@ const pc6 = p.then(() => Promise.reject("1"), () => {});
 >then : <TResult1 = boolean, TResult2 = never>(onfulfilled?: ((value: boolean) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>
 >() => Promise.reject("1") : () => Promise<never>
 >Promise.reject("1") : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >"1" : "1"
 >() => {} : () => void
 
@@ -1539,9 +1539,9 @@ const pc7 = p.then(() => Promise.reject("1"), () => {throw 1});
 >then : <TResult1 = boolean, TResult2 = never>(onfulfilled?: ((value: boolean) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>
 >() => Promise.reject("1") : () => Promise<never>
 >Promise.reject("1") : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >"1" : "1"
 >() => {throw 1} : () => never
 >1 : 1
@@ -1554,9 +1554,9 @@ const pc8 = p.then(() => Promise.reject("1"), () => Promise.resolve(1));
 >then : <TResult1 = boolean, TResult2 = never>(onfulfilled?: ((value: boolean) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>
 >() => Promise.reject("1") : () => Promise<never>
 >Promise.reject("1") : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >"1" : "1"
 >() => Promise.resolve(1) : () => Promise<number>
 >Promise.resolve(1) : Promise<number>
@@ -1573,14 +1573,14 @@ const pc9 = p.then(() => Promise.reject("1"), () => Promise.reject(1));
 >then : <TResult1 = boolean, TResult2 = never>(onfulfilled?: ((value: boolean) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>
 >() => Promise.reject("1") : () => Promise<never>
 >Promise.reject("1") : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >"1" : "1"
 >() => Promise.reject(1) : () => Promise<never>
 >Promise.reject(1) : Promise<never>
->Promise.reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>Promise.reject : <T = never>(reason?: any) => Promise<T>
 >Promise : PromiseConstructor
->reject : { (reason: any): Promise<never>; <T>(reason: any): Promise<T>; }
+>reject : <T = never>(reason?: any) => Promise<T>
 >1 : 1
 
diff --git a/tests/baselines/reference/propertyAccess.types b/tests/baselines/reference/propertyAccess.types
index 983718ee1fd..82af3d51316 100644
--- a/tests/baselines/reference/propertyAccess.types
+++ b/tests/baselines/reference/propertyAccess.types
@@ -139,10 +139,10 @@ var aa = obj.x;
 
 // Dotted property access of property that exists on value's apparent type
 var bb = obj.hasOwnProperty;
->bb : (v: string) => boolean
->obj.hasOwnProperty : (v: string) => boolean
+>bb : (v: string | number | symbol) => boolean
+>obj.hasOwnProperty : (v: string | number | symbol) => boolean
 >obj : { 10: string; x: string; y: number; z: { n: string; m: number; o: () => boolean; }; 'literal property': number; }
->hasOwnProperty : (v: string) => boolean
+>hasOwnProperty : (v: string | number | symbol) => boolean
 
 // Dotted property access of property that doesn't exist on value's apparent type
 var cc = obj.qqq; // error
diff --git a/tests/baselines/reference/recursiveTypeRelations.errors.txt b/tests/baselines/reference/recursiveTypeRelations.errors.txt
index f29d5742185..8c5596958c3 100644
--- a/tests/baselines/reference/recursiveTypeRelations.errors.txt
+++ b/tests/baselines/reference/recursiveTypeRelations.errors.txt
@@ -6,7 +6,7 @@ tests/cases/compiler/recursiveTypeRelations.ts(27,61): error TS2304: Cannot find
 ==== tests/cases/compiler/recursiveTypeRelations.ts (3 errors) ====
     // Repro from #14896
     
-    type Attributes<Keys extends string> = {
+    type Attributes<Keys extends keyof any> = {
         [Key in Keys]: string;
     }
     
diff --git a/tests/baselines/reference/recursiveTypeRelations.js b/tests/baselines/reference/recursiveTypeRelations.js
index c477ecf1294..9c0887ab446 100644
--- a/tests/baselines/reference/recursiveTypeRelations.js
+++ b/tests/baselines/reference/recursiveTypeRelations.js
@@ -1,7 +1,7 @@
 //// [recursiveTypeRelations.ts]
 // Repro from #14896
 
-type Attributes<Keys extends string> = {
+type Attributes<Keys extends keyof any> = {
     [Key in Keys]: string;
 }
 
diff --git a/tests/baselines/reference/recursiveTypeRelations.symbols b/tests/baselines/reference/recursiveTypeRelations.symbols
index 2c940df2487..39032cd2f94 100644
--- a/tests/baselines/reference/recursiveTypeRelations.symbols
+++ b/tests/baselines/reference/recursiveTypeRelations.symbols
@@ -1,7 +1,7 @@
 === tests/cases/compiler/recursiveTypeRelations.ts ===
 // Repro from #14896
 
-type Attributes<Keys extends string> = {
+type Attributes<Keys extends keyof any> = {
 >Attributes : Symbol(Attributes, Decl(recursiveTypeRelations.ts, 0, 0))
 >Keys : Symbol(Keys, Decl(recursiveTypeRelations.ts, 2, 16))
 
diff --git a/tests/baselines/reference/recursiveTypeRelations.types b/tests/baselines/reference/recursiveTypeRelations.types
index ce6d007d066..f3d56637b18 100644
--- a/tests/baselines/reference/recursiveTypeRelations.types
+++ b/tests/baselines/reference/recursiveTypeRelations.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/recursiveTypeRelations.ts ===
 // Repro from #14896
 
-type Attributes<Keys extends string> = {
+type Attributes<Keys extends keyof any> = {
 >Attributes : { [Key in Keys]: string; }
 >Keys : Keys
 
@@ -97,7 +97,7 @@ export function css<S extends { [K in keyof S]: string }>(styles: S, ...classNam
     if (typeof arg == "object") {
 >typeof arg == "object" : boolean
 >typeof arg : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
->arg : object & { [K in keyof S]?: boolean; }
+>arg : keyof S | (object & { [K in keyof S]?: boolean; })
 >"object" : "object"
 
       return Object.keys(arg).reduce<ClassNameObject>((obj: ClassNameObject, key: keyof S) => {
diff --git a/tests/baselines/reference/staticInstanceResolution2.types b/tests/baselines/reference/staticInstanceResolution2.types
index 68abb3a08ce..e44f99d212f 100644
--- a/tests/baselines/reference/staticInstanceResolution2.types
+++ b/tests/baselines/reference/staticInstanceResolution2.types
@@ -4,9 +4,9 @@ class A { }
 
 A.hasOwnProperty('foo');
 >A.hasOwnProperty('foo') : boolean
->A.hasOwnProperty : (v: string) => boolean
+>A.hasOwnProperty : (v: string | number | symbol) => boolean
 >A : typeof A
->hasOwnProperty : (v: string) => boolean
+>hasOwnProperty : (v: string | number | symbol) => boolean
 >'foo' : "foo"
 
 class B {
@@ -16,9 +16,9 @@ class B {
 }
 B.hasOwnProperty('foo');
 >B.hasOwnProperty('foo') : boolean
->B.hasOwnProperty : (v: string) => boolean
+>B.hasOwnProperty : (v: string | number | symbol) => boolean
 >B : typeof B
->hasOwnProperty : (v: string) => boolean
+>hasOwnProperty : (v: string | number | symbol) => boolean
 >'foo' : "foo"
 
 
diff --git a/tests/baselines/reference/stringPropertyAccess.types b/tests/baselines/reference/stringPropertyAccess.types
index fd2ec13da74..da8298178b6 100644
--- a/tests/baselines/reference/stringPropertyAccess.types
+++ b/tests/baselines/reference/stringPropertyAccess.types
@@ -14,9 +14,9 @@ var a = x.charAt(0);
 var b = x.hasOwnProperty('charAt');
 >b : boolean
 >x.hasOwnProperty('charAt') : boolean
->x.hasOwnProperty : (v: string) => boolean
+>x.hasOwnProperty : (v: string | number | symbol) => boolean
 >x : string
->hasOwnProperty : (v: string) => boolean
+>hasOwnProperty : (v: string | number | symbol) => boolean
 >'charAt' : "charAt"
 
 var c = x['charAt'](0);
@@ -30,7 +30,7 @@ var c = x['charAt'](0);
 var e = x['hasOwnProperty']('toFixed');
 >e : boolean
 >x['hasOwnProperty']('toFixed') : boolean
->x['hasOwnProperty'] : (v: string) => boolean
+>x['hasOwnProperty'] : (v: string | number | symbol) => boolean
 >x : string
 >'hasOwnProperty' : "hasOwnProperty"
 >'toFixed' : "toFixed"
diff --git a/tests/baselines/reference/symbolProperty3.types b/tests/baselines/reference/symbolProperty3.types
index df4707a207c..6975051d002 100644
--- a/tests/baselines/reference/symbolProperty3.types
+++ b/tests/baselines/reference/symbolProperty3.types
@@ -4,8 +4,8 @@ var s = Symbol;
 >Symbol : SymbolConstructor
 
 var x = {
->x : { [x: string]: number | (() => void); }
->{    [s]: 0,    [s]() { },    get [s]() {        return 0;    }} : { [x: string]: number | (() => void); }
+>x : {}
+>{    [s]: 0,    [s]() { },    get [s]() {        return 0;    }} : {}
 
     [s]: 0,
 >[s] : number
diff --git a/tests/baselines/reference/symbolType1.symbols b/tests/baselines/reference/symbolType1.symbols
index ded0dcff47b..98c6a263632 100644
--- a/tests/baselines/reference/symbolType1.symbols
+++ b/tests/baselines/reference/symbolType1.symbols
@@ -9,7 +9,7 @@ Symbol instanceof Symbol();
 
 (Symbol() || {}) instanceof Object; // This one should be okay, it's a valid way of distinguishing types
 >Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
->Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 Symbol instanceof (Symbol() || {});
 >Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
diff --git a/tests/baselines/reference/taggedTemplatesWithTypeArguments1.js b/tests/baselines/reference/taggedTemplatesWithTypeArguments1.js
new file mode 100644
index 00000000000..b31d3270208
--- /dev/null
+++ b/tests/baselines/reference/taggedTemplatesWithTypeArguments1.js
@@ -0,0 +1,72 @@
+//// [taggedTemplatesWithTypeArguments1.ts]
+declare function f<T>(strs: TemplateStringsArray, ...callbacks: Array<(x: T) => any>): void;
+
+interface Stuff {
+    x: number;
+    y: string;
+    z: boolean;
+}
+
+export const a = f<Stuff> `
+    hello
+    ${stuff => stuff.x}
+    brave
+    ${stuff => stuff.y}
+    world
+    ${stuff => stuff.z}
+`;
+
+declare function g<Input, T, U, V>(
+    strs: TemplateStringsArray,
+    t: (i: Input) => T, u: (i: Input) => U, v: (i: Input) => V): T | U | V;
+
+export const b = g<Stuff, number, string, boolean> `
+    hello
+    ${stuff => stuff.x}
+    brave
+    ${stuff => stuff.y}
+    world
+    ${stuff => stuff.z}
+`;
+
+declare let obj: {
+    prop: <T>(strs: TemplateStringsArray, x: (input: T) => T) => {
+        returnedObjProp: T
+    }
+}
+
+export let c = obj["prop"]<Stuff> `${(input) => ({ ...input })}`
+c.returnedObjProp.x;
+c.returnedObjProp.y;
+c.returnedObjProp.z;
+
+c = obj.prop<Stuff> `${(input) => ({ ...input })}`
+c.returnedObjProp.x;
+c.returnedObjProp.y;
+c.returnedObjProp.z;
+
+//// [taggedTemplatesWithTypeArguments1.js]
+export const a = f `
+    hello
+    ${stuff => stuff.x}
+    brave
+    ${stuff => stuff.y}
+    world
+    ${stuff => stuff.z}
+`;
+export const b = g `
+    hello
+    ${stuff => stuff.x}
+    brave
+    ${stuff => stuff.y}
+    world
+    ${stuff => stuff.z}
+`;
+export let c = obj["prop"] `${(input) => ({ ...input })}`;
+c.returnedObjProp.x;
+c.returnedObjProp.y;
+c.returnedObjProp.z;
+c = obj.prop `${(input) => ({ ...input })}`;
+c.returnedObjProp.x;
+c.returnedObjProp.y;
+c.returnedObjProp.z;
diff --git a/tests/baselines/reference/taggedTemplatesWithTypeArguments1.symbols b/tests/baselines/reference/taggedTemplatesWithTypeArguments1.symbols
new file mode 100644
index 00000000000..798d2e18c68
--- /dev/null
+++ b/tests/baselines/reference/taggedTemplatesWithTypeArguments1.symbols
@@ -0,0 +1,186 @@
+=== tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments1.ts ===
+declare function f<T>(strs: TemplateStringsArray, ...callbacks: Array<(x: T) => any>): void;
+>f : Symbol(f, Decl(taggedTemplatesWithTypeArguments1.ts, 0, 0))
+>T : Symbol(T, Decl(taggedTemplatesWithTypeArguments1.ts, 0, 19))
+>strs : Symbol(strs, Decl(taggedTemplatesWithTypeArguments1.ts, 0, 22))
+>TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.es5.d.ts, --, --))
+>callbacks : Symbol(callbacks, Decl(taggedTemplatesWithTypeArguments1.ts, 0, 49))
+>Array : Symbol(Array, Decl(lib.es2016.array.include.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --) ... and 1 more)
+>x : Symbol(x, Decl(taggedTemplatesWithTypeArguments1.ts, 0, 71))
+>T : Symbol(T, Decl(taggedTemplatesWithTypeArguments1.ts, 0, 19))
+
+interface Stuff {
+>Stuff : Symbol(Stuff, Decl(taggedTemplatesWithTypeArguments1.ts, 0, 92))
+
+    x: number;
+>x : Symbol(Stuff.x, Decl(taggedTemplatesWithTypeArguments1.ts, 2, 17))
+
+    y: string;
+>y : Symbol(Stuff.y, Decl(taggedTemplatesWithTypeArguments1.ts, 3, 14))
+
+    z: boolean;
+>z : Symbol(Stuff.z, Decl(taggedTemplatesWithTypeArguments1.ts, 4, 14))
+}
+
+export const a = f<Stuff> `
+>a : Symbol(a, Decl(taggedTemplatesWithTypeArguments1.ts, 8, 12))
+>f : Symbol(f, Decl(taggedTemplatesWithTypeArguments1.ts, 0, 0))
+>Stuff : Symbol(Stuff, Decl(taggedTemplatesWithTypeArguments1.ts, 0, 92))
+
+    hello
+    ${stuff => stuff.x}
+>stuff : Symbol(stuff, Decl(taggedTemplatesWithTypeArguments1.ts, 10, 6))
+>stuff.x : Symbol(Stuff.x, Decl(taggedTemplatesWithTypeArguments1.ts, 2, 17))
+>stuff : Symbol(stuff, Decl(taggedTemplatesWithTypeArguments1.ts, 10, 6))
+>x : Symbol(Stuff.x, Decl(taggedTemplatesWithTypeArguments1.ts, 2, 17))
+
+    brave
+    ${stuff => stuff.y}
+>stuff : Symbol(stuff, Decl(taggedTemplatesWithTypeArguments1.ts, 12, 6))
+>stuff.y : Symbol(Stuff.y, Decl(taggedTemplatesWithTypeArguments1.ts, 3, 14))
+>stuff : Symbol(stuff, Decl(taggedTemplatesWithTypeArguments1.ts, 12, 6))
+>y : Symbol(Stuff.y, Decl(taggedTemplatesWithTypeArguments1.ts, 3, 14))
+
+    world
+    ${stuff => stuff.z}
+>stuff : Symbol(stuff, Decl(taggedTemplatesWithTypeArguments1.ts, 14, 6))
+>stuff.z : Symbol(Stuff.z, Decl(taggedTemplatesWithTypeArguments1.ts, 4, 14))
+>stuff : Symbol(stuff, Decl(taggedTemplatesWithTypeArguments1.ts, 14, 6))
+>z : Symbol(Stuff.z, Decl(taggedTemplatesWithTypeArguments1.ts, 4, 14))
+
+`;
+
+declare function g<Input, T, U, V>(
+>g : Symbol(g, Decl(taggedTemplatesWithTypeArguments1.ts, 15, 2))
+>Input : Symbol(Input, Decl(taggedTemplatesWithTypeArguments1.ts, 17, 19))
+>T : Symbol(T, Decl(taggedTemplatesWithTypeArguments1.ts, 17, 25))
+>U : Symbol(U, Decl(taggedTemplatesWithTypeArguments1.ts, 17, 28))
+>V : Symbol(V, Decl(taggedTemplatesWithTypeArguments1.ts, 17, 31))
+
+    strs: TemplateStringsArray,
+>strs : Symbol(strs, Decl(taggedTemplatesWithTypeArguments1.ts, 17, 35))
+>TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.es5.d.ts, --, --))
+
+    t: (i: Input) => T, u: (i: Input) => U, v: (i: Input) => V): T | U | V;
+>t : Symbol(t, Decl(taggedTemplatesWithTypeArguments1.ts, 18, 31))
+>i : Symbol(i, Decl(taggedTemplatesWithTypeArguments1.ts, 19, 8))
+>Input : Symbol(Input, Decl(taggedTemplatesWithTypeArguments1.ts, 17, 19))
+>T : Symbol(T, Decl(taggedTemplatesWithTypeArguments1.ts, 17, 25))
+>u : Symbol(u, Decl(taggedTemplatesWithTypeArguments1.ts, 19, 23))
+>i : Symbol(i, Decl(taggedTemplatesWithTypeArguments1.ts, 19, 28))
+>Input : Symbol(Input, Decl(taggedTemplatesWithTypeArguments1.ts, 17, 19))
+>U : Symbol(U, Decl(taggedTemplatesWithTypeArguments1.ts, 17, 28))
+>v : Symbol(v, Decl(taggedTemplatesWithTypeArguments1.ts, 19, 43))
+>i : Symbol(i, Decl(taggedTemplatesWithTypeArguments1.ts, 19, 48))
+>Input : Symbol(Input, Decl(taggedTemplatesWithTypeArguments1.ts, 17, 19))
+>V : Symbol(V, Decl(taggedTemplatesWithTypeArguments1.ts, 17, 31))
+>T : Symbol(T, Decl(taggedTemplatesWithTypeArguments1.ts, 17, 25))
+>U : Symbol(U, Decl(taggedTemplatesWithTypeArguments1.ts, 17, 28))
+>V : Symbol(V, Decl(taggedTemplatesWithTypeArguments1.ts, 17, 31))
+
+export const b = g<Stuff, number, string, boolean> `
+>b : Symbol(b, Decl(taggedTemplatesWithTypeArguments1.ts, 21, 12))
+>g : Symbol(g, Decl(taggedTemplatesWithTypeArguments1.ts, 15, 2))
+>Stuff : Symbol(Stuff, Decl(taggedTemplatesWithTypeArguments1.ts, 0, 92))
+
+    hello
+    ${stuff => stuff.x}
+>stuff : Symbol(stuff, Decl(taggedTemplatesWithTypeArguments1.ts, 23, 6))
+>stuff.x : Symbol(Stuff.x, Decl(taggedTemplatesWithTypeArguments1.ts, 2, 17))
+>stuff : Symbol(stuff, Decl(taggedTemplatesWithTypeArguments1.ts, 23, 6))
+>x : Symbol(Stuff.x, Decl(taggedTemplatesWithTypeArguments1.ts, 2, 17))
+
+    brave
+    ${stuff => stuff.y}
+>stuff : Symbol(stuff, Decl(taggedTemplatesWithTypeArguments1.ts, 25, 6))
+>stuff.y : Symbol(Stuff.y, Decl(taggedTemplatesWithTypeArguments1.ts, 3, 14))
+>stuff : Symbol(stuff, Decl(taggedTemplatesWithTypeArguments1.ts, 25, 6))
+>y : Symbol(Stuff.y, Decl(taggedTemplatesWithTypeArguments1.ts, 3, 14))
+
+    world
+    ${stuff => stuff.z}
+>stuff : Symbol(stuff, Decl(taggedTemplatesWithTypeArguments1.ts, 27, 6))
+>stuff.z : Symbol(Stuff.z, Decl(taggedTemplatesWithTypeArguments1.ts, 4, 14))
+>stuff : Symbol(stuff, Decl(taggedTemplatesWithTypeArguments1.ts, 27, 6))
+>z : Symbol(Stuff.z, Decl(taggedTemplatesWithTypeArguments1.ts, 4, 14))
+
+`;
+
+declare let obj: {
+>obj : Symbol(obj, Decl(taggedTemplatesWithTypeArguments1.ts, 30, 11))
+
+    prop: <T>(strs: TemplateStringsArray, x: (input: T) => T) => {
+>prop : Symbol(prop, Decl(taggedTemplatesWithTypeArguments1.ts, 30, 18))
+>T : Symbol(T, Decl(taggedTemplatesWithTypeArguments1.ts, 31, 11))
+>strs : Symbol(strs, Decl(taggedTemplatesWithTypeArguments1.ts, 31, 14))
+>TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.es5.d.ts, --, --))
+>x : Symbol(x, Decl(taggedTemplatesWithTypeArguments1.ts, 31, 41))
+>input : Symbol(input, Decl(taggedTemplatesWithTypeArguments1.ts, 31, 46))
+>T : Symbol(T, Decl(taggedTemplatesWithTypeArguments1.ts, 31, 11))
+>T : Symbol(T, Decl(taggedTemplatesWithTypeArguments1.ts, 31, 11))
+
+        returnedObjProp: T
+>returnedObjProp : Symbol(returnedObjProp, Decl(taggedTemplatesWithTypeArguments1.ts, 31, 66))
+>T : Symbol(T, Decl(taggedTemplatesWithTypeArguments1.ts, 31, 11))
+    }
+}
+
+export let c = obj["prop"]<Stuff> `${(input) => ({ ...input })}`
+>c : Symbol(c, Decl(taggedTemplatesWithTypeArguments1.ts, 36, 10))
+>obj : Symbol(obj, Decl(taggedTemplatesWithTypeArguments1.ts, 30, 11))
+>"prop" : Symbol(prop, Decl(taggedTemplatesWithTypeArguments1.ts, 30, 18))
+>Stuff : Symbol(Stuff, Decl(taggedTemplatesWithTypeArguments1.ts, 0, 92))
+>input : Symbol(input, Decl(taggedTemplatesWithTypeArguments1.ts, 36, 38))
+>input : Symbol(input, Decl(taggedTemplatesWithTypeArguments1.ts, 36, 38))
+
+c.returnedObjProp.x;
+>c.returnedObjProp.x : Symbol(Stuff.x, Decl(taggedTemplatesWithTypeArguments1.ts, 2, 17))
+>c.returnedObjProp : Symbol(returnedObjProp, Decl(taggedTemplatesWithTypeArguments1.ts, 31, 66))
+>c : Symbol(c, Decl(taggedTemplatesWithTypeArguments1.ts, 36, 10))
+>returnedObjProp : Symbol(returnedObjProp, Decl(taggedTemplatesWithTypeArguments1.ts, 31, 66))
+>x : Symbol(Stuff.x, Decl(taggedTemplatesWithTypeArguments1.ts, 2, 17))
+
+c.returnedObjProp.y;
+>c.returnedObjProp.y : Symbol(Stuff.y, Decl(taggedTemplatesWithTypeArguments1.ts, 3, 14))
+>c.returnedObjProp : Symbol(returnedObjProp, Decl(taggedTemplatesWithTypeArguments1.ts, 31, 66))
+>c : Symbol(c, Decl(taggedTemplatesWithTypeArguments1.ts, 36, 10))
+>returnedObjProp : Symbol(returnedObjProp, Decl(taggedTemplatesWithTypeArguments1.ts, 31, 66))
+>y : Symbol(Stuff.y, Decl(taggedTemplatesWithTypeArguments1.ts, 3, 14))
+
+c.returnedObjProp.z;
+>c.returnedObjProp.z : Symbol(Stuff.z, Decl(taggedTemplatesWithTypeArguments1.ts, 4, 14))
+>c.returnedObjProp : Symbol(returnedObjProp, Decl(taggedTemplatesWithTypeArguments1.ts, 31, 66))
+>c : Symbol(c, Decl(taggedTemplatesWithTypeArguments1.ts, 36, 10))
+>returnedObjProp : Symbol(returnedObjProp, Decl(taggedTemplatesWithTypeArguments1.ts, 31, 66))
+>z : Symbol(Stuff.z, Decl(taggedTemplatesWithTypeArguments1.ts, 4, 14))
+
+c = obj.prop<Stuff> `${(input) => ({ ...input })}`
+>c : Symbol(c, Decl(taggedTemplatesWithTypeArguments1.ts, 36, 10))
+>obj.prop : Symbol(prop, Decl(taggedTemplatesWithTypeArguments1.ts, 30, 18))
+>obj : Symbol(obj, Decl(taggedTemplatesWithTypeArguments1.ts, 30, 11))
+>prop : Symbol(prop, Decl(taggedTemplatesWithTypeArguments1.ts, 30, 18))
+>Stuff : Symbol(Stuff, Decl(taggedTemplatesWithTypeArguments1.ts, 0, 92))
+>input : Symbol(input, Decl(taggedTemplatesWithTypeArguments1.ts, 41, 24))
+>input : Symbol(input, Decl(taggedTemplatesWithTypeArguments1.ts, 41, 24))
+
+c.returnedObjProp.x;
+>c.returnedObjProp.x : Symbol(Stuff.x, Decl(taggedTemplatesWithTypeArguments1.ts, 2, 17))
+>c.returnedObjProp : Symbol(returnedObjProp, Decl(taggedTemplatesWithTypeArguments1.ts, 31, 66))
+>c : Symbol(c, Decl(taggedTemplatesWithTypeArguments1.ts, 36, 10))
+>returnedObjProp : Symbol(returnedObjProp, Decl(taggedTemplatesWithTypeArguments1.ts, 31, 66))
+>x : Symbol(Stuff.x, Decl(taggedTemplatesWithTypeArguments1.ts, 2, 17))
+
+c.returnedObjProp.y;
+>c.returnedObjProp.y : Symbol(Stuff.y, Decl(taggedTemplatesWithTypeArguments1.ts, 3, 14))
+>c.returnedObjProp : Symbol(returnedObjProp, Decl(taggedTemplatesWithTypeArguments1.ts, 31, 66))
+>c : Symbol(c, Decl(taggedTemplatesWithTypeArguments1.ts, 36, 10))
+>returnedObjProp : Symbol(returnedObjProp, Decl(taggedTemplatesWithTypeArguments1.ts, 31, 66))
+>y : Symbol(Stuff.y, Decl(taggedTemplatesWithTypeArguments1.ts, 3, 14))
+
+c.returnedObjProp.z;
+>c.returnedObjProp.z : Symbol(Stuff.z, Decl(taggedTemplatesWithTypeArguments1.ts, 4, 14))
+>c.returnedObjProp : Symbol(returnedObjProp, Decl(taggedTemplatesWithTypeArguments1.ts, 31, 66))
+>c : Symbol(c, Decl(taggedTemplatesWithTypeArguments1.ts, 36, 10))
+>returnedObjProp : Symbol(returnedObjProp, Decl(taggedTemplatesWithTypeArguments1.ts, 31, 66))
+>z : Symbol(Stuff.z, Decl(taggedTemplatesWithTypeArguments1.ts, 4, 14))
+
diff --git a/tests/baselines/reference/taggedTemplatesWithTypeArguments1.types b/tests/baselines/reference/taggedTemplatesWithTypeArguments1.types
new file mode 100644
index 00000000000..afa83c1b890
--- /dev/null
+++ b/tests/baselines/reference/taggedTemplatesWithTypeArguments1.types
@@ -0,0 +1,208 @@
+=== tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments1.ts ===
+declare function f<T>(strs: TemplateStringsArray, ...callbacks: Array<(x: T) => any>): void;
+>f : <T>(strs: TemplateStringsArray, ...callbacks: ((x: T) => any)[]) => void
+>T : T
+>strs : TemplateStringsArray
+>TemplateStringsArray : TemplateStringsArray
+>callbacks : ((x: T) => any)[]
+>Array : T[]
+>x : T
+>T : T
+
+interface Stuff {
+>Stuff : Stuff
+
+    x: number;
+>x : number
+
+    y: string;
+>y : string
+
+    z: boolean;
+>z : boolean
+}
+
+export const a = f<Stuff> `
+>a : void
+>f<Stuff> `    hello    ${stuff => stuff.x}    brave    ${stuff => stuff.y}    world    ${stuff => stuff.z}` : void
+>f : <T>(strs: TemplateStringsArray, ...callbacks: ((x: T) => any)[]) => void
+>Stuff : Stuff
+>`    hello    ${stuff => stuff.x}    brave    ${stuff => stuff.y}    world    ${stuff => stuff.z}` : string
+
+    hello
+    ${stuff => stuff.x}
+>stuff => stuff.x : (stuff: Stuff) => number
+>stuff : Stuff
+>stuff.x : number
+>stuff : Stuff
+>x : number
+
+    brave
+    ${stuff => stuff.y}
+>stuff => stuff.y : (stuff: Stuff) => string
+>stuff : Stuff
+>stuff.y : string
+>stuff : Stuff
+>y : string
+
+    world
+    ${stuff => stuff.z}
+>stuff => stuff.z : (stuff: Stuff) => boolean
+>stuff : Stuff
+>stuff.z : boolean
+>stuff : Stuff
+>z : boolean
+
+`;
+
+declare function g<Input, T, U, V>(
+>g : <Input, T, U, V>(strs: TemplateStringsArray, t: (i: Input) => T, u: (i: Input) => U, v: (i: Input) => V) => T | U | V
+>Input : Input
+>T : T
+>U : U
+>V : V
+
+    strs: TemplateStringsArray,
+>strs : TemplateStringsArray
+>TemplateStringsArray : TemplateStringsArray
+
+    t: (i: Input) => T, u: (i: Input) => U, v: (i: Input) => V): T | U | V;
+>t : (i: Input) => T
+>i : Input
+>Input : Input
+>T : T
+>u : (i: Input) => U
+>i : Input
+>Input : Input
+>U : U
+>v : (i: Input) => V
+>i : Input
+>Input : Input
+>V : V
+>T : T
+>U : U
+>V : V
+
+export const b = g<Stuff, number, string, boolean> `
+>b : string | number | boolean
+>g<Stuff, number, string, boolean> `    hello    ${stuff => stuff.x}    brave    ${stuff => stuff.y}    world    ${stuff => stuff.z}` : string | number | boolean
+>g : <Input, T, U, V>(strs: TemplateStringsArray, t: (i: Input) => T, u: (i: Input) => U, v: (i: Input) => V) => T | U | V
+>Stuff : Stuff
+>`    hello    ${stuff => stuff.x}    brave    ${stuff => stuff.y}    world    ${stuff => stuff.z}` : string
+
+    hello
+    ${stuff => stuff.x}
+>stuff => stuff.x : (stuff: Stuff) => number
+>stuff : Stuff
+>stuff.x : number
+>stuff : Stuff
+>x : number
+
+    brave
+    ${stuff => stuff.y}
+>stuff => stuff.y : (stuff: Stuff) => string
+>stuff : Stuff
+>stuff.y : string
+>stuff : Stuff
+>y : string
+
+    world
+    ${stuff => stuff.z}
+>stuff => stuff.z : (stuff: Stuff) => boolean
+>stuff : Stuff
+>stuff.z : boolean
+>stuff : Stuff
+>z : boolean
+
+`;
+
+declare let obj: {
+>obj : { prop: <T>(strs: TemplateStringsArray, x: (input: T) => T) => { returnedObjProp: T; }; }
+
+    prop: <T>(strs: TemplateStringsArray, x: (input: T) => T) => {
+>prop : <T>(strs: TemplateStringsArray, x: (input: T) => T) => { returnedObjProp: T; }
+>T : T
+>strs : TemplateStringsArray
+>TemplateStringsArray : TemplateStringsArray
+>x : (input: T) => T
+>input : T
+>T : T
+>T : T
+
+        returnedObjProp: T
+>returnedObjProp : T
+>T : T
+    }
+}
+
+export let c = obj["prop"]<Stuff> `${(input) => ({ ...input })}`
+>c : { returnedObjProp: Stuff; }
+>obj["prop"]<Stuff> `${(input) => ({ ...input })}` : { returnedObjProp: Stuff; }
+>obj["prop"] : <T>(strs: TemplateStringsArray, x: (input: T) => T) => { returnedObjProp: T; }
+>obj : { prop: <T>(strs: TemplateStringsArray, x: (input: T) => T) => { returnedObjProp: T; }; }
+>"prop" : "prop"
+>Stuff : Stuff
+>`${(input) => ({ ...input })}` : string
+>(input) => ({ ...input }) : (input: Stuff) => { x: number; y: string; z: boolean; }
+>input : Stuff
+>({ ...input }) : { x: number; y: string; z: boolean; }
+>{ ...input } : { x: number; y: string; z: boolean; }
+>input : Stuff
+
+c.returnedObjProp.x;
+>c.returnedObjProp.x : number
+>c.returnedObjProp : Stuff
+>c : { returnedObjProp: Stuff; }
+>returnedObjProp : Stuff
+>x : number
+
+c.returnedObjProp.y;
+>c.returnedObjProp.y : string
+>c.returnedObjProp : Stuff
+>c : { returnedObjProp: Stuff; }
+>returnedObjProp : Stuff
+>y : string
+
+c.returnedObjProp.z;
+>c.returnedObjProp.z : boolean
+>c.returnedObjProp : Stuff
+>c : { returnedObjProp: Stuff; }
+>returnedObjProp : Stuff
+>z : boolean
+
+c = obj.prop<Stuff> `${(input) => ({ ...input })}`
+>c = obj.prop<Stuff> `${(input) => ({ ...input })}` : { returnedObjProp: Stuff; }
+>c : { returnedObjProp: Stuff; }
+>obj.prop<Stuff> `${(input) => ({ ...input })}` : { returnedObjProp: Stuff; }
+>obj.prop : <T>(strs: TemplateStringsArray, x: (input: T) => T) => { returnedObjProp: T; }
+>obj : { prop: <T>(strs: TemplateStringsArray, x: (input: T) => T) => { returnedObjProp: T; }; }
+>prop : <T>(strs: TemplateStringsArray, x: (input: T) => T) => { returnedObjProp: T; }
+>Stuff : Stuff
+>`${(input) => ({ ...input })}` : string
+>(input) => ({ ...input }) : (input: Stuff) => { x: number; y: string; z: boolean; }
+>input : Stuff
+>({ ...input }) : { x: number; y: string; z: boolean; }
+>{ ...input } : { x: number; y: string; z: boolean; }
+>input : Stuff
+
+c.returnedObjProp.x;
+>c.returnedObjProp.x : number
+>c.returnedObjProp : Stuff
+>c : { returnedObjProp: Stuff; }
+>returnedObjProp : Stuff
+>x : number
+
+c.returnedObjProp.y;
+>c.returnedObjProp.y : string
+>c.returnedObjProp : Stuff
+>c : { returnedObjProp: Stuff; }
+>returnedObjProp : Stuff
+>y : string
+
+c.returnedObjProp.z;
+>c.returnedObjProp.z : boolean
+>c.returnedObjProp : Stuff
+>c : { returnedObjProp: Stuff; }
+>returnedObjProp : Stuff
+>z : boolean
+
diff --git a/tests/baselines/reference/taggedTemplatesWithTypeArguments2.errors.txt b/tests/baselines/reference/taggedTemplatesWithTypeArguments2.errors.txt
new file mode 100644
index 00000000000..44607433031
--- /dev/null
+++ b/tests/baselines/reference/taggedTemplatesWithTypeArguments2.errors.txt
@@ -0,0 +1,61 @@
+tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments2.ts(13,30): error TS2345: Argument of type '"hello"' is not assignable to parameter of type 'number'.
+tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments2.ts(15,11): error TS2347: Untyped function calls may not accept type arguments.
+tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments2.ts(17,30): error TS2345: Argument of type '"hello"' is not assignable to parameter of type 'number'.
+tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments2.ts(35,5): error TS2377: Constructors for derived classes must contain a 'super' call.
+tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments2.ts(36,9): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
+tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments2.ts(36,14): error TS1034: 'super' must be followed by an argument list or member access.
+
+
+==== tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments2.ts (6 errors) ====
+    export interface SomethingTaggable {
+        <T>(t: TemplateStringsArray, ...args: T[]): SomethingNewable;
+    }
+    
+    export interface SomethingNewable {
+        new <T>(...args: T[]): any;
+    }
+    
+    declare const tag: SomethingTaggable;
+    
+    const a = new tag `${100} ${200}`<string>("hello", "world");
+    
+    const b = new tag<number> `${"hello"} ${"world"}`(100, 200);
+                                 ~~~~~~~
+!!! error TS2345: Argument of type '"hello"' is not assignable to parameter of type 'number'.
+    
+    const c = new tag<number> `${100} ${200}`<string>("hello", "world");
+              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2347: Untyped function calls may not accept type arguments.
+    
+    const d = new tag<number> `${"hello"} ${"world"}`<string>(100, 200);
+                                 ~~~~~~~
+!!! error TS2345: Argument of type '"hello"' is not assignable to parameter of type 'number'.
+    
+    /**
+     * Testing ASI. This should never parse as
+     *
+     * ```ts
+     * new tag<number>;
+     * `hello${369}`();
+     * ```
+     */
+    const e = new tag<number>
+    `hello`();
+    
+    class SomeBase<A, B, C> {
+        a!: A; b!: B; c!: C;
+    }
+    
+    class SomeDerived<T> extends SomeBase<number, string, T> {
+        constructor() {
+        ~~~~~~~~~~~~~~~
+            super<number, string, T> `hello world`;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ~~~~~
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
+                 ~
+!!! error TS1034: 'super' must be followed by an argument list or member access.
+        }
+    ~~~~~
+!!! error TS2377: Constructors for derived classes must contain a 'super' call.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/taggedTemplatesWithTypeArguments2.js b/tests/baselines/reference/taggedTemplatesWithTypeArguments2.js
new file mode 100644
index 00000000000..bc170467fa8
--- /dev/null
+++ b/tests/baselines/reference/taggedTemplatesWithTypeArguments2.js
@@ -0,0 +1,61 @@
+//// [taggedTemplatesWithTypeArguments2.ts]
+export interface SomethingTaggable {
+    <T>(t: TemplateStringsArray, ...args: T[]): SomethingNewable;
+}
+
+export interface SomethingNewable {
+    new <T>(...args: T[]): any;
+}
+
+declare const tag: SomethingTaggable;
+
+const a = new tag `${100} ${200}`<string>("hello", "world");
+
+const b = new tag<number> `${"hello"} ${"world"}`(100, 200);
+
+const c = new tag<number> `${100} ${200}`<string>("hello", "world");
+
+const d = new tag<number> `${"hello"} ${"world"}`<string>(100, 200);
+
+/**
+ * Testing ASI. This should never parse as
+ *
+ * ```ts
+ * new tag<number>;
+ * `hello${369}`();
+ * ```
+ */
+const e = new tag<number>
+`hello`();
+
+class SomeBase<A, B, C> {
+    a!: A; b!: B; c!: C;
+}
+
+class SomeDerived<T> extends SomeBase<number, string, T> {
+    constructor() {
+        super<number, string, T> `hello world`;
+    }
+}
+
+//// [taggedTemplatesWithTypeArguments2.js]
+const a = new tag `${100} ${200}`("hello", "world");
+const b = new tag `${"hello"} ${"world"}`(100, 200);
+const c = (new tag `${100} ${200}`)("hello", "world");
+const d = (new tag `${"hello"} ${"world"}`)(100, 200);
+/**
+ * Testing ASI. This should never parse as
+ *
+ * ```ts
+ * new tag<number>;
+ * `hello${369}`();
+ * ```
+ */
+const e = new tag `hello`();
+class SomeBase {
+}
+class SomeDerived extends SomeBase {
+    constructor() {
+        super. `hello world`;
+    }
+}
diff --git a/tests/baselines/reference/taggedTemplatesWithTypeArguments2.symbols b/tests/baselines/reference/taggedTemplatesWithTypeArguments2.symbols
new file mode 100644
index 00000000000..631770a30dd
--- /dev/null
+++ b/tests/baselines/reference/taggedTemplatesWithTypeArguments2.symbols
@@ -0,0 +1,83 @@
+=== tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments2.ts ===
+export interface SomethingTaggable {
+>SomethingTaggable : Symbol(SomethingTaggable, Decl(taggedTemplatesWithTypeArguments2.ts, 0, 0))
+
+    <T>(t: TemplateStringsArray, ...args: T[]): SomethingNewable;
+>T : Symbol(T, Decl(taggedTemplatesWithTypeArguments2.ts, 1, 5))
+>t : Symbol(t, Decl(taggedTemplatesWithTypeArguments2.ts, 1, 8))
+>TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.es5.d.ts, --, --))
+>args : Symbol(args, Decl(taggedTemplatesWithTypeArguments2.ts, 1, 32))
+>T : Symbol(T, Decl(taggedTemplatesWithTypeArguments2.ts, 1, 5))
+>SomethingNewable : Symbol(SomethingNewable, Decl(taggedTemplatesWithTypeArguments2.ts, 2, 1))
+}
+
+export interface SomethingNewable {
+>SomethingNewable : Symbol(SomethingNewable, Decl(taggedTemplatesWithTypeArguments2.ts, 2, 1))
+
+    new <T>(...args: T[]): any;
+>T : Symbol(T, Decl(taggedTemplatesWithTypeArguments2.ts, 5, 9))
+>args : Symbol(args, Decl(taggedTemplatesWithTypeArguments2.ts, 5, 12))
+>T : Symbol(T, Decl(taggedTemplatesWithTypeArguments2.ts, 5, 9))
+}
+
+declare const tag: SomethingTaggable;
+>tag : Symbol(tag, Decl(taggedTemplatesWithTypeArguments2.ts, 8, 13))
+>SomethingTaggable : Symbol(SomethingTaggable, Decl(taggedTemplatesWithTypeArguments2.ts, 0, 0))
+
+const a = new tag `${100} ${200}`<string>("hello", "world");
+>a : Symbol(a, Decl(taggedTemplatesWithTypeArguments2.ts, 10, 5))
+>tag : Symbol(tag, Decl(taggedTemplatesWithTypeArguments2.ts, 8, 13))
+
+const b = new tag<number> `${"hello"} ${"world"}`(100, 200);
+>b : Symbol(b, Decl(taggedTemplatesWithTypeArguments2.ts, 12, 5))
+>tag : Symbol(tag, Decl(taggedTemplatesWithTypeArguments2.ts, 8, 13))
+
+const c = new tag<number> `${100} ${200}`<string>("hello", "world");
+>c : Symbol(c, Decl(taggedTemplatesWithTypeArguments2.ts, 14, 5))
+>tag : Symbol(tag, Decl(taggedTemplatesWithTypeArguments2.ts, 8, 13))
+
+const d = new tag<number> `${"hello"} ${"world"}`<string>(100, 200);
+>d : Symbol(d, Decl(taggedTemplatesWithTypeArguments2.ts, 16, 5))
+>tag : Symbol(tag, Decl(taggedTemplatesWithTypeArguments2.ts, 8, 13))
+
+/**
+ * Testing ASI. This should never parse as
+ *
+ * ```ts
+ * new tag<number>;
+ * `hello${369}`();
+ * ```
+ */
+const e = new tag<number>
+>e : Symbol(e, Decl(taggedTemplatesWithTypeArguments2.ts, 26, 5))
+>tag : Symbol(tag, Decl(taggedTemplatesWithTypeArguments2.ts, 8, 13))
+
+`hello`();
+
+class SomeBase<A, B, C> {
+>SomeBase : Symbol(SomeBase, Decl(taggedTemplatesWithTypeArguments2.ts, 27, 10))
+>A : Symbol(A, Decl(taggedTemplatesWithTypeArguments2.ts, 29, 15))
+>B : Symbol(B, Decl(taggedTemplatesWithTypeArguments2.ts, 29, 17))
+>C : Symbol(C, Decl(taggedTemplatesWithTypeArguments2.ts, 29, 20))
+
+    a!: A; b!: B; c!: C;
+>a : Symbol(SomeBase.a, Decl(taggedTemplatesWithTypeArguments2.ts, 29, 25))
+>A : Symbol(A, Decl(taggedTemplatesWithTypeArguments2.ts, 29, 15))
+>b : Symbol(SomeBase.b, Decl(taggedTemplatesWithTypeArguments2.ts, 30, 10))
+>B : Symbol(B, Decl(taggedTemplatesWithTypeArguments2.ts, 29, 17))
+>c : Symbol(SomeBase.c, Decl(taggedTemplatesWithTypeArguments2.ts, 30, 17))
+>C : Symbol(C, Decl(taggedTemplatesWithTypeArguments2.ts, 29, 20))
+}
+
+class SomeDerived<T> extends SomeBase<number, string, T> {
+>SomeDerived : Symbol(SomeDerived, Decl(taggedTemplatesWithTypeArguments2.ts, 31, 1))
+>T : Symbol(T, Decl(taggedTemplatesWithTypeArguments2.ts, 33, 18))
+>SomeBase : Symbol(SomeBase, Decl(taggedTemplatesWithTypeArguments2.ts, 27, 10))
+>T : Symbol(T, Decl(taggedTemplatesWithTypeArguments2.ts, 33, 18))
+
+    constructor() {
+        super<number, string, T> `hello world`;
+>super : Symbol(SomeBase, Decl(taggedTemplatesWithTypeArguments2.ts, 27, 10))
+>T : Symbol(T, Decl(taggedTemplatesWithTypeArguments2.ts, 33, 18))
+    }
+}
diff --git a/tests/baselines/reference/taggedTemplatesWithTypeArguments2.types b/tests/baselines/reference/taggedTemplatesWithTypeArguments2.types
new file mode 100644
index 00000000000..8aef2009d1b
--- /dev/null
+++ b/tests/baselines/reference/taggedTemplatesWithTypeArguments2.types
@@ -0,0 +1,120 @@
+=== tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments2.ts ===
+export interface SomethingTaggable {
+>SomethingTaggable : SomethingTaggable
+
+    <T>(t: TemplateStringsArray, ...args: T[]): SomethingNewable;
+>T : T
+>t : TemplateStringsArray
+>TemplateStringsArray : TemplateStringsArray
+>args : T[]
+>T : T
+>SomethingNewable : SomethingNewable
+}
+
+export interface SomethingNewable {
+>SomethingNewable : SomethingNewable
+
+    new <T>(...args: T[]): any;
+>T : T
+>args : T[]
+>T : T
+}
+
+declare const tag: SomethingTaggable;
+>tag : SomethingTaggable
+>SomethingTaggable : SomethingTaggable
+
+const a = new tag `${100} ${200}`<string>("hello", "world");
+>a : any
+>new tag `${100} ${200}`<string>("hello", "world") : any
+>tag `${100} ${200}` : SomethingNewable
+>tag : SomethingTaggable
+>`${100} ${200}` : string
+>100 : 100
+>200 : 200
+>"hello" : "hello"
+>"world" : "world"
+
+const b = new tag<number> `${"hello"} ${"world"}`(100, 200);
+>b : any
+>new tag<number> `${"hello"} ${"world"}`(100, 200) : any
+>tag<number> `${"hello"} ${"world"}` : any
+>tag : SomethingTaggable
+>`${"hello"} ${"world"}` : string
+>"hello" : "hello"
+>"world" : "world"
+>100 : 100
+>200 : 200
+
+const c = new tag<number> `${100} ${200}`<string>("hello", "world");
+>c : any
+>new tag<number> `${100} ${200}`<string>("hello", "world") : any
+>new tag<number> `${100} ${200}` : any
+>tag<number> `${100} ${200}` : SomethingNewable
+>tag : SomethingTaggable
+>`${100} ${200}` : string
+>100 : 100
+>200 : 200
+>"hello" : "hello"
+>"world" : "world"
+
+const d = new tag<number> `${"hello"} ${"world"}`<string>(100, 200);
+>d : any
+>new tag<number> `${"hello"} ${"world"}`<string>(100, 200) : any
+>new tag<number> `${"hello"} ${"world"}` : any
+>tag<number> `${"hello"} ${"world"}` : any
+>tag : SomethingTaggable
+>`${"hello"} ${"world"}` : string
+>"hello" : "hello"
+>"world" : "world"
+>100 : 100
+>200 : 200
+
+/**
+ * Testing ASI. This should never parse as
+ *
+ * ```ts
+ * new tag<number>;
+ * `hello${369}`();
+ * ```
+ */
+const e = new tag<number>
+>e : any
+>new tag<number>`hello`() : any
+>tag<number>`hello` : SomethingNewable
+>tag : SomethingTaggable
+
+`hello`();
+>`hello` : "hello"
+
+class SomeBase<A, B, C> {
+>SomeBase : SomeBase<A, B, C>
+>A : A
+>B : B
+>C : C
+
+    a!: A; b!: B; c!: C;
+>a : A
+>A : A
+>b : B
+>B : B
+>c : C
+>C : C
+}
+
+class SomeDerived<T> extends SomeBase<number, string, T> {
+>SomeDerived : SomeDerived<T>
+>T : T
+>SomeBase : SomeBase<number, string, T>
+>T : T
+
+    constructor() {
+        super<number, string, T> `hello world`;
+>super<number, string, T> `hello world` : any
+>super : any
+>super : SomeBase<number, string, T>
+> : any
+>T : T
+>`hello world` : "hello world"
+    }
+}
diff --git a/tests/baselines/reference/textChanges/insertNodeAfterInClass1.js b/tests/baselines/reference/textChanges/insertNodeAfterInClass1.js
index 841d43fef97..87206e588f2 100644
--- a/tests/baselines/reference/textChanges/insertNodeAfterInClass1.js
+++ b/tests/baselines/reference/textChanges/insertNodeAfterInClass1.js
@@ -7,6 +7,6 @@ class A {
 ===MODIFIED===
 
 class A {
-    x;
+    x
     a: boolean;
 }
diff --git a/tests/baselines/reference/textChanges/insertNodeInInterfaceAfterNodeWithoutSeparator2.js b/tests/baselines/reference/textChanges/insertNodeInInterfaceAfterNodeWithoutSeparator2.js
index 6e88a371eb6..780af267ac8 100644
--- a/tests/baselines/reference/textChanges/insertNodeInInterfaceAfterNodeWithoutSeparator2.js
+++ b/tests/baselines/reference/textChanges/insertNodeInInterfaceAfterNodeWithoutSeparator2.js
@@ -7,6 +7,6 @@ interface A {
 ===MODIFIED===
 
 interface A {
-    x();
+    x()
     [1]: any;
 }
diff --git a/tests/baselines/reference/tripleSlashInCommentNotParsed.js b/tests/baselines/reference/tripleSlashInCommentNotParsed.js
new file mode 100644
index 00000000000..5b16e26c4f4
--- /dev/null
+++ b/tests/baselines/reference/tripleSlashInCommentNotParsed.js
@@ -0,0 +1,11 @@
+//// [tripleSlashInCommentNotParsed.ts]
+/*
+/// <reference path="non-existing-file.d.ts" />
+*/
+void 0;
+
+//// [tripleSlashInCommentNotParsed.js]
+/*
+/// <reference path="non-existing-file.d.ts" />
+*/
+void 0;
diff --git a/tests/baselines/reference/tripleSlashInCommentNotParsed.symbols b/tests/baselines/reference/tripleSlashInCommentNotParsed.symbols
new file mode 100644
index 00000000000..3df0d7dfddd
--- /dev/null
+++ b/tests/baselines/reference/tripleSlashInCommentNotParsed.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/tripleSlashInCommentNotParsed.ts ===
+/*
+No type information for this code./// <reference path="non-existing-file.d.ts" />
+No type information for this code.*/
+No type information for this code.void 0;
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/tripleSlashInCommentNotParsed.types b/tests/baselines/reference/tripleSlashInCommentNotParsed.types
new file mode 100644
index 00000000000..c4390cce54d
--- /dev/null
+++ b/tests/baselines/reference/tripleSlashInCommentNotParsed.types
@@ -0,0 +1,8 @@
+=== tests/cases/compiler/tripleSlashInCommentNotParsed.ts ===
+/*
+/// <reference path="non-existing-file.d.ts" />
+*/
+void 0;
+>void 0 : undefined
+>0 : 0
+
diff --git a/tests/baselines/reference/typeFromPropertyAssignment19.errors.txt b/tests/baselines/reference/typeFromPropertyAssignment19.errors.txt
deleted file mode 100644
index d43728d360b..00000000000
--- a/tests/baselines/reference/typeFromPropertyAssignment19.errors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-tests/cases/conformance/salsa/semver.js(2,1): error TS2539: Cannot assign to '"tests/cases/conformance/salsa/semver"' because it is not a variable.
-
-
-==== tests/cases/conformance/salsa/index.js (0 errors) ====
-    /// <reference path='./types.d.ts'/>
-    const C = require("./semver")
-    var two = C.f(1)
-    
-==== tests/cases/conformance/salsa/types.d.ts (0 errors) ====
-    declare var require: any;
-    declare var module: any;
-==== tests/cases/conformance/salsa/semver.js (1 errors) ====
-    /// <reference path='./types.d.ts'/>
-    exports = module.exports = C
-    ~~~~~~~
-!!! error TS2539: Cannot assign to '"tests/cases/conformance/salsa/semver"' because it is not a variable.
-    C.f = n => n + 1
-    function C() {
-        this.p = 1
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/typeFromPropertyAssignment19.types b/tests/baselines/reference/typeFromPropertyAssignment19.types
index ee219e7164a..b0200fc2311 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment19.types
+++ b/tests/baselines/reference/typeFromPropertyAssignment19.types
@@ -25,7 +25,7 @@ declare var module: any;
 /// <reference path='./types.d.ts'/>
 exports = module.exports = C
 >exports = module.exports = C : typeof C
->exports : any
+>exports : typeof import("tests/cases/conformance/salsa/semver")
 >module.exports = C : typeof C
 >module.exports : any
 >module : any
diff --git a/tests/baselines/reference/typeGuardsTypeParameters.types b/tests/baselines/reference/typeGuardsTypeParameters.types
index 13fb9965235..c508c92a979 100644
--- a/tests/baselines/reference/typeGuardsTypeParameters.types
+++ b/tests/baselines/reference/typeGuardsTypeParameters.types
@@ -80,19 +80,19 @@ function fun<T>(item: { [P in keyof T]: T[P] }) {
 >[] : never[]
 
     for (const key in item) {
->key : keyof T
+>key : Extract<keyof T, string>
 >item : { [P in keyof T]: T[P]; }
 
         const value = item[key];
->value : { [P in keyof T]: T[P]; }[keyof T]
->item[key] : { [P in keyof T]: T[P]; }[keyof T]
+>value : { [P in keyof T]: T[P]; }[Extract<keyof T, string>]
+>item[key] : { [P in keyof T]: T[P]; }[Extract<keyof T, string>]
 >item : { [P in keyof T]: T[P]; }
->key : keyof T
+>key : Extract<keyof T, string>
 
         if (typeof value === "string") {
 >typeof value === "string" : boolean
 >typeof value : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
->value : { [P in keyof T]: T[P]; }[keyof T]
+>value : { [P in keyof T]: T[P]; }[Extract<keyof T, string>]
 >"string" : "string"
 
             strings.push(value);
@@ -100,7 +100,7 @@ function fun<T>(item: { [P in keyof T]: T[P] }) {
 >strings.push : (...items: string[]) => number
 >strings : string[]
 >push : (...items: string[]) => number
->value : { [P in keyof T]: T[P]; }[keyof T] & string
+>value : { [P in keyof T]: T[P]; }[Extract<keyof T, string>] & string
         }
     }
 }
diff --git a/tests/baselines/reference/typePredicateStructuralMatch.types b/tests/baselines/reference/typePredicateStructuralMatch.types
index 9f7a129da15..c01f5f5b06a 100644
--- a/tests/baselines/reference/typePredicateStructuralMatch.types
+++ b/tests/baselines/reference/typePredicateStructuralMatch.types
@@ -46,9 +46,9 @@ function isResponseInData<T>(value: T | { data: T}): value is { data: T } {
 
     return value.hasOwnProperty('data');
 >value.hasOwnProperty('data') : boolean
->value.hasOwnProperty : (v: string) => boolean
+>value.hasOwnProperty : (v: string | number | symbol) => boolean
 >value : T | { data: T; }
->hasOwnProperty : (v: string) => boolean
+>hasOwnProperty : (v: string | number | symbol) => boolean
 >'data' : "data"
 }
 
@@ -84,9 +84,9 @@ function isPlainResponse<T>(value: T | { data: T}): value is T {
     return !value.hasOwnProperty('data');
 >!value.hasOwnProperty('data') : boolean
 >value.hasOwnProperty('data') : boolean
->value.hasOwnProperty : (v: string) => boolean
+>value.hasOwnProperty : (v: string | number | symbol) => boolean
 >value : T | { data: T; }
->hasOwnProperty : (v: string) => boolean
+>hasOwnProperty : (v: string | number | symbol) => boolean
 >'data' : "data"
 }
 
diff --git a/tests/baselines/reference/uniqueSymbols.types b/tests/baselines/reference/uniqueSymbols.types
index 621d3df4236..55ce8d9c87e 100644
--- a/tests/baselines/reference/uniqueSymbols.types
+++ b/tests/baselines/reference/uniqueSymbols.types
@@ -402,8 +402,8 @@ const constInitToLReadonlyNestedTypeWithIndexedAccess: L["nested"]["readonlyNest
 
 // type argument inference
 const promiseForConstCall = Promise.resolve(constCall);
->promiseForConstCall : Promise<symbol>
->Promise.resolve(constCall) : Promise<symbol>
+>promiseForConstCall : Promise<unique symbol>
+>Promise.resolve(constCall) : Promise<unique symbol>
 >Promise.resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
 >Promise : PromiseConstructor
 >resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
@@ -454,19 +454,19 @@ declare function g(x: typeof N.s): void;
 
 // argument inference
 f(s);
->f(s) : symbol
+>f(s) : unique symbol
 >f : <T>(x: T) => T
 >s : unique symbol
 
 f(N.s);
->f(N.s) : symbol
+>f(N.s) : unique symbol
 >f : <T>(x: T) => T
 >N.s : unique symbol
 >N : typeof N
 >s : unique symbol
 
 f(N["s"]);
->f(N["s"]) : symbol
+>f(N["s"]) : unique symbol
 >f : <T>(x: T) => T
 >N["s"] : unique symbol
 >N : typeof N
diff --git a/tests/baselines/reference/uniqueSymbolsDeclarations.js b/tests/baselines/reference/uniqueSymbolsDeclarations.js
index 6b52b210977..728c507c747 100644
--- a/tests/baselines/reference/uniqueSymbolsDeclarations.js
+++ b/tests/baselines/reference/uniqueSymbolsDeclarations.js
@@ -482,7 +482,7 @@ declare const constInitToLReadonlyTypeWithTypeQuery: typeof l.readonlyType;
 declare const constInitToLReadonlyNestedTypeWithTypeQuery: typeof l.nested.readonlyNestedType;
 declare const constInitToLReadonlyTypeWithIndexedAccess: L["readonlyType"];
 declare const constInitToLReadonlyNestedTypeWithIndexedAccess: L["nested"]["readonlyNestedType"];
-declare const promiseForConstCall: Promise<symbol>;
+declare const promiseForConstCall: Promise<typeof constCall>;
 declare const arrayOfConstCall: symbol[];
 declare const s: unique symbol;
 declare namespace N {
diff --git a/tests/baselines/reference/uniqueSymbolsDeclarations.types b/tests/baselines/reference/uniqueSymbolsDeclarations.types
index a841354269f..6bfee5a0403 100644
--- a/tests/baselines/reference/uniqueSymbolsDeclarations.types
+++ b/tests/baselines/reference/uniqueSymbolsDeclarations.types
@@ -402,8 +402,8 @@ const constInitToLReadonlyNestedTypeWithIndexedAccess: L["nested"]["readonlyNest
 
 // type argument inference
 const promiseForConstCall = Promise.resolve(constCall);
->promiseForConstCall : Promise<symbol>
->Promise.resolve(constCall) : Promise<symbol>
+>promiseForConstCall : Promise<unique symbol>
+>Promise.resolve(constCall) : Promise<unique symbol>
 >Promise.resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
 >Promise : PromiseConstructor
 >resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
@@ -454,19 +454,19 @@ declare function g(x: typeof N.s): void;
 
 // argument inference
 f(s);
->f(s) : symbol
+>f(s) : unique symbol
 >f : <T>(x: T) => T
 >s : unique symbol
 
 f(N.s);
->f(N.s) : symbol
+>f(N.s) : unique symbol
 >f : <T>(x: T) => T
 >N.s : unique symbol
 >N : typeof N
 >s : unique symbol
 
 f(N["s"]);
->f(N["s"]) : symbol
+>f(N["s"]) : unique symbol
 >f : <T>(x: T) => T
 >N["s"] : unique symbol
 >N : typeof N
diff --git a/tests/baselines/reference/unspecializedConstraints.types b/tests/baselines/reference/unspecializedConstraints.types
index f5d081968d9..4c3d0c00d0d 100644
--- a/tests/baselines/reference/unspecializedConstraints.types
+++ b/tests/baselines/reference/unspecializedConstraints.types
@@ -464,12 +464,12 @@ module ts {
 
    
     var hasOwnProperty = Object.prototype.hasOwnProperty;
->hasOwnProperty : (v: string) => boolean
->Object.prototype.hasOwnProperty : (v: string) => boolean
+>hasOwnProperty : (v: string | number | symbol) => boolean
+>Object.prototype.hasOwnProperty : (v: string | number | symbol) => boolean
 >Object.prototype : Object
 >Object : ObjectConstructor
 >prototype : Object
->hasOwnProperty : (v: string) => boolean
+>hasOwnProperty : (v: string | number | symbol) => boolean
 
     function getProperty<T>(map: Map<T>, key: string): T {
 >getProperty : <T>(map: Map<T>, key: string) => T
@@ -484,7 +484,7 @@ module ts {
 >!hasOwnProperty.call(map, key) : boolean
 >hasOwnProperty.call(map, key) : any
 >hasOwnProperty.call : (this: Function, thisArg: any, ...argArray: any[]) => any
->hasOwnProperty : (v: string) => boolean
+>hasOwnProperty : (v: string | number | symbol) => boolean
 >call : (this: Function, thisArg: any, ...argArray: any[]) => any
 >map : Map<T>
 >key : string
@@ -507,7 +507,7 @@ module ts {
         return hasOwnProperty.call(map, key);
 >hasOwnProperty.call(map, key) : any
 >hasOwnProperty.call : (this: Function, thisArg: any, ...argArray: any[]) => any
->hasOwnProperty : (v: string) => boolean
+>hasOwnProperty : (v: string | number | symbol) => boolean
 >call : (this: Function, thisArg: any, ...argArray: any[]) => any
 >map : Map<T>
 >key : string
diff --git a/tests/baselines/reference/unusedClassesinModule1.errors.txt b/tests/baselines/reference/unusedClassesinModule1.errors.txt
index 12b82ee97b6..488c434c537 100644
--- a/tests/baselines/reference/unusedClassesinModule1.errors.txt
+++ b/tests/baselines/reference/unusedClassesinModule1.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/compiler/unusedClassesinModule1.ts(2,5): error TS6133: 'Calculator' is declared but its value is never read.
+tests/cases/compiler/unusedClassesinModule1.ts(2,5): error TS6196: 'Calculator' is declared but never used.
 
 
 ==== tests/cases/compiler/unusedClassesinModule1.ts (1 errors) ====
     module A {
         class Calculator {
         ~~~~~~~~~~~~~~~~
-!!! error TS6133: 'Calculator' is declared but its value is never read.
+!!! error TS6196: 'Calculator' is declared but never used.
             public handelChar() {
             }
         }
diff --git a/tests/baselines/reference/unusedClassesinNamespace1.errors.txt b/tests/baselines/reference/unusedClassesinNamespace1.errors.txt
index 4d4f26dde7b..44050f75b54 100644
--- a/tests/baselines/reference/unusedClassesinNamespace1.errors.txt
+++ b/tests/baselines/reference/unusedClassesinNamespace1.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/compiler/unusedClassesinNamespace1.ts(2,5): error TS6133: 'c1' is declared but its value is never read.
+tests/cases/compiler/unusedClassesinNamespace1.ts(2,5): error TS6196: 'c1' is declared but never used.
 
 
 ==== tests/cases/compiler/unusedClassesinNamespace1.ts (1 errors) ====
     namespace Validation {
         class c1 {
         ~~~~~~~~
-!!! error TS6133: 'c1' is declared but its value is never read.
+!!! error TS6196: 'c1' is declared but never used.
     
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/unusedClassesinNamespace2.errors.txt b/tests/baselines/reference/unusedClassesinNamespace2.errors.txt
index c98aeb28369..6c6f5f815b6 100644
--- a/tests/baselines/reference/unusedClassesinNamespace2.errors.txt
+++ b/tests/baselines/reference/unusedClassesinNamespace2.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/compiler/unusedClassesinNamespace2.ts(2,5): error TS6133: 'c1' is declared but its value is never read.
+tests/cases/compiler/unusedClassesinNamespace2.ts(2,5): error TS6196: 'c1' is declared but never used.
 
 
 ==== tests/cases/compiler/unusedClassesinNamespace2.ts (1 errors) ====
     namespace Validation {
         class c1 {
         ~~~~~~~~
-!!! error TS6133: 'c1' is declared but its value is never read.
+!!! error TS6196: 'c1' is declared but never used.
     
         }
     
diff --git a/tests/baselines/reference/unusedClassesinNamespace4.errors.txt b/tests/baselines/reference/unusedClassesinNamespace4.errors.txt
index 7545f0e2dde..209654569c9 100644
--- a/tests/baselines/reference/unusedClassesinNamespace4.errors.txt
+++ b/tests/baselines/reference/unusedClassesinNamespace4.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/unusedClassesinNamespace4.ts(10,5): error TS6133: 'c3' is declared but its value is never read.
+tests/cases/compiler/unusedClassesinNamespace4.ts(10,5): error TS6196: 'c3' is declared but never used.
 
 
 ==== tests/cases/compiler/unusedClassesinNamespace4.ts (1 errors) ====
@@ -13,7 +13,7 @@ tests/cases/compiler/unusedClassesinNamespace4.ts(10,5): error TS6133: 'c3' is d
     
         class c3 extends c1 {
         ~~~~~~~~
-!!! error TS6133: 'c3' is declared but its value is never read.
+!!! error TS6196: 'c3' is declared but never used.
     
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/unusedClassesinNamespace5.errors.txt b/tests/baselines/reference/unusedClassesinNamespace5.errors.txt
index 3512a1634c5..58cfa661603 100644
--- a/tests/baselines/reference/unusedClassesinNamespace5.errors.txt
+++ b/tests/baselines/reference/unusedClassesinNamespace5.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/unusedClassesinNamespace5.ts(10,5): error TS6133: 'c3' is declared but its value is never read.
+tests/cases/compiler/unusedClassesinNamespace5.ts(10,5): error TS6196: 'c3' is declared but never used.
 
 
 ==== tests/cases/compiler/unusedClassesinNamespace5.ts (1 errors) ====
@@ -13,7 +13,7 @@ tests/cases/compiler/unusedClassesinNamespace5.ts(10,5): error TS6133: 'c3' is d
     
         class c3 {
         ~~~~~~~~
-!!! error TS6133: 'c3' is declared but its value is never read.
+!!! error TS6196: 'c3' is declared but never used.
             public x: c1;
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/unusedIdentifiersConsolidated1.errors.txt b/tests/baselines/reference/unusedIdentifiersConsolidated1.errors.txt
index 7d3dcf34830..3ddd1f12b1b 100644
--- a/tests/baselines/reference/unusedIdentifiersConsolidated1.errors.txt
+++ b/tests/baselines/reference/unusedIdentifiersConsolidated1.errors.txt
@@ -10,11 +10,11 @@ tests/cases/compiler/unusedIdentifiersConsolidated1.ts(17,13): error TS6133: 'un
 tests/cases/compiler/unusedIdentifiersConsolidated1.ts(24,13): error TS6133: 'unUsedPrivateFunction' is declared but its value is never read.
 tests/cases/compiler/unusedIdentifiersConsolidated1.ts(37,11): error TS6133: 'numberRegexp' is declared but its value is never read.
 tests/cases/compiler/unusedIdentifiersConsolidated1.ts(44,17): error TS6133: 'unUsedPrivateFunction' is declared but its value is never read.
-tests/cases/compiler/unusedIdentifiersConsolidated1.ts(57,5): error TS6133: 'usedLocallyInterface2' is declared but its value is never read.
-tests/cases/compiler/unusedIdentifiersConsolidated1.ts(64,5): error TS6133: 'dummy' is declared but its value is never read.
-tests/cases/compiler/unusedIdentifiersConsolidated1.ts(67,5): error TS6133: 'unusedInterface' is declared but its value is never read.
-tests/cases/compiler/unusedIdentifiersConsolidated1.ts(79,5): error TS6133: 'class3' is declared but its value is never read.
-tests/cases/compiler/unusedIdentifiersConsolidated1.ts(99,5): error TS6133: 'interface5' is declared but its value is never read.
+tests/cases/compiler/unusedIdentifiersConsolidated1.ts(57,5): error TS6196: 'usedLocallyInterface2' is declared but never used.
+tests/cases/compiler/unusedIdentifiersConsolidated1.ts(64,5): error TS6196: 'dummy' is declared but never used.
+tests/cases/compiler/unusedIdentifiersConsolidated1.ts(67,5): error TS6196: 'unusedInterface' is declared but never used.
+tests/cases/compiler/unusedIdentifiersConsolidated1.ts(79,5): error TS6196: 'class3' is declared but never used.
+tests/cases/compiler/unusedIdentifiersConsolidated1.ts(99,5): error TS6196: 'interface5' is declared but never used.
 
 
 ==== tests/cases/compiler/unusedIdentifiersConsolidated1.ts (17 errors) ====
@@ -100,7 +100,7 @@ tests/cases/compiler/unusedIdentifiersConsolidated1.ts(99,5): error TS6133: 'int
     
         interface usedLocallyInterface2 {
         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6133: 'usedLocallyInterface2' is declared but its value is never read.
+!!! error TS6196: 'usedLocallyInterface2' is declared but never used.
             someFunction(s1: string): void;
         }
     
@@ -109,12 +109,12 @@ tests/cases/compiler/unusedIdentifiersConsolidated1.ts(99,5): error TS6133: 'int
     
         class dummy implements usedLocallyInterface {
         ~~~~~~~~~~~
-!!! error TS6133: 'dummy' is declared but its value is never read.
+!!! error TS6196: 'dummy' is declared but never used.
         }
     
         interface unusedInterface {
         ~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6133: 'unusedInterface' is declared but its value is never read.
+!!! error TS6196: 'unusedInterface' is declared but never used.
         }
     }
     
@@ -128,7 +128,7 @@ tests/cases/compiler/unusedIdentifiersConsolidated1.ts(99,5): error TS6133: 'int
     
         class class3 {
         ~~~~~~~~~~~~
-!!! error TS6133: 'class3' is declared but its value is never read.
+!!! error TS6196: 'class3' is declared but never used.
         }
     
         export class class4 {
@@ -150,6 +150,6 @@ tests/cases/compiler/unusedIdentifiersConsolidated1.ts(99,5): error TS6133: 'int
     
         interface interface5 {
         ~~~~~~~~~~~~~~~~~~~~
-!!! error TS6133: 'interface5' is declared but its value is never read.
+!!! error TS6196: 'interface5' is declared but never used.
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/unusedInterfaceinNamespace1.errors.txt b/tests/baselines/reference/unusedInterfaceinNamespace1.errors.txt
index e5e01491727..0fe77374c4d 100644
--- a/tests/baselines/reference/unusedInterfaceinNamespace1.errors.txt
+++ b/tests/baselines/reference/unusedInterfaceinNamespace1.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/compiler/unusedInterfaceinNamespace1.ts(2,5): error TS6133: 'i1' is declared but its value is never read.
+tests/cases/compiler/unusedInterfaceinNamespace1.ts(2,5): error TS6196: 'i1' is declared but never used.
 
 
 ==== tests/cases/compiler/unusedInterfaceinNamespace1.ts (1 errors) ====
     namespace Validation {
         interface i1 {
         ~~~~~~~~~~~~
-!!! error TS6133: 'i1' is declared but its value is never read.
+!!! error TS6196: 'i1' is declared but never used.
     
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/unusedInterfaceinNamespace2.errors.txt b/tests/baselines/reference/unusedInterfaceinNamespace2.errors.txt
index 3839b63f507..40e224358af 100644
--- a/tests/baselines/reference/unusedInterfaceinNamespace2.errors.txt
+++ b/tests/baselines/reference/unusedInterfaceinNamespace2.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/compiler/unusedInterfaceinNamespace2.ts(2,5): error TS6133: 'i1' is declared but its value is never read.
+tests/cases/compiler/unusedInterfaceinNamespace2.ts(2,5): error TS6196: 'i1' is declared but never used.
 
 
 ==== tests/cases/compiler/unusedInterfaceinNamespace2.ts (1 errors) ====
     namespace Validation {
         interface i1 {
         ~~~~~~~~~~~~
-!!! error TS6133: 'i1' is declared but its value is never read.
+!!! error TS6196: 'i1' is declared but never used.
     
         }
     
diff --git a/tests/baselines/reference/unusedInterfaceinNamespace3.errors.txt b/tests/baselines/reference/unusedInterfaceinNamespace3.errors.txt
index 76d32cdf583..206dd51c3e5 100644
--- a/tests/baselines/reference/unusedInterfaceinNamespace3.errors.txt
+++ b/tests/baselines/reference/unusedInterfaceinNamespace3.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/unusedInterfaceinNamespace3.ts(10,5): error TS6133: 'i3' is declared but its value is never read.
+tests/cases/compiler/unusedInterfaceinNamespace3.ts(10,5): error TS6196: 'i3' is declared but never used.
 
 
 ==== tests/cases/compiler/unusedInterfaceinNamespace3.ts (1 errors) ====
@@ -13,7 +13,7 @@ tests/cases/compiler/unusedInterfaceinNamespace3.ts(10,5): error TS6133: 'i3' is
     
         interface i3 extends i1 {
         ~~~~~~~~~~~~
-!!! error TS6133: 'i3' is declared but its value is never read.
+!!! error TS6196: 'i3' is declared but never used.
     
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/unusedLocalsAndParameters.errors.txt b/tests/baselines/reference/unusedLocalsAndParameters.errors.txt
index 7ee0e0b8cb9..e9656c6f669 100644
--- a/tests/baselines/reference/unusedLocalsAndParameters.errors.txt
+++ b/tests/baselines/reference/unusedLocalsAndParameters.errors.txt
@@ -2,7 +2,7 @@ tests/cases/compiler/unusedLocalsAndParameters.ts(4,12): error TS6133: 'a' is de
 tests/cases/compiler/unusedLocalsAndParameters.ts(9,22): error TS6133: 'a' is declared but its value is never read.
 tests/cases/compiler/unusedLocalsAndParameters.ts(15,5): error TS6133: 'farrow' is declared but its value is never read.
 tests/cases/compiler/unusedLocalsAndParameters.ts(15,15): error TS6133: 'a' is declared but its value is never read.
-tests/cases/compiler/unusedLocalsAndParameters.ts(18,1): error TS6133: 'C' is declared but its value is never read.
+tests/cases/compiler/unusedLocalsAndParameters.ts(18,1): error TS6196: 'C' is declared but never used.
 tests/cases/compiler/unusedLocalsAndParameters.ts(20,12): error TS6133: 'a' is declared but its value is never read.
 tests/cases/compiler/unusedLocalsAndParameters.ts(23,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/unusedLocalsAndParameters.ts(23,11): error TS6133: 'v' is declared but its value is never read.
@@ -52,7 +52,7 @@ tests/cases/compiler/unusedLocalsAndParameters.ts(80,9): error TS6133: 'x' is de
     
     class C {
     ~~~~~~~
-!!! error TS6133: 'C' is declared but its value is never read.
+!!! error TS6196: 'C' is declared but never used.
         // Method declaration paramter
         method(a) {
                ~
diff --git a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.errors.txt b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.errors.txt
index 31c825ce906..f86ec0d1cc7 100644
--- a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.errors.txt
+++ b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.errors.txt
@@ -1,13 +1,13 @@
-tests/cases/compiler/unusedLocalsAndParametersTypeAliases2.ts(2,1): error TS6133: 'handler1' is declared but its value is never read.
+tests/cases/compiler/unusedLocalsAndParametersTypeAliases2.ts(2,1): error TS6196: 'handler1' is declared but never used.
 tests/cases/compiler/unusedLocalsAndParametersTypeAliases2.ts(5,1): error TS6133: 'foo' is declared but its value is never read.
-tests/cases/compiler/unusedLocalsAndParametersTypeAliases2.ts(6,5): error TS6133: 'handler2' is declared but its value is never read.
+tests/cases/compiler/unusedLocalsAndParametersTypeAliases2.ts(6,5): error TS6196: 'handler2' is declared but never used.
 
 
 ==== tests/cases/compiler/unusedLocalsAndParametersTypeAliases2.ts (3 errors) ====
     // unused
     type handler1 = () => void;
     ~~~~~~~~~~~~~
-!!! error TS6133: 'handler1' is declared but its value is never read.
+!!! error TS6196: 'handler1' is declared but never used.
     
     
     function foo() {
@@ -15,7 +15,7 @@ tests/cases/compiler/unusedLocalsAndParametersTypeAliases2.ts(6,5): error TS6133
 !!! error TS6133: 'foo' is declared but its value is never read.
         type handler2 = () => void;
         ~~~~~~~~~~~~~
-!!! error TS6133: 'handler2' is declared but its value is never read.
+!!! error TS6196: 'handler2' is declared but never used.
         foo();
     }
     
diff --git a/tests/baselines/reference/useObjectValuesAndEntries3.symbols b/tests/baselines/reference/useObjectValuesAndEntries3.symbols
index 65d5175eaa6..51f2b14cc93 100644
--- a/tests/baselines/reference/useObjectValuesAndEntries3.symbols
+++ b/tests/baselines/reference/useObjectValuesAndEntries3.symbols
@@ -6,7 +6,7 @@ var o = { a: 1, b: 2 };
 
 for (var x of Object.values(o)) {
 >x : Symbol(x, Decl(useObjectValuesAndEntries3.ts, 2, 8))
->Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >o : Symbol(o, Decl(useObjectValuesAndEntries3.ts, 0, 3))
 
     let y = x;
@@ -16,6 +16,6 @@ for (var x of Object.values(o)) {
 
 var entries = Object.entries(o);
 >entries : Symbol(entries, Decl(useObjectValuesAndEntries3.ts, 6, 3))
->Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >o : Symbol(o, Decl(useObjectValuesAndEntries3.ts, 0, 3))
 
diff --git a/tests/baselines/reference/useObjectValuesAndEntries4.symbols b/tests/baselines/reference/useObjectValuesAndEntries4.symbols
index adef865c04c..8c087361e7d 100644
--- a/tests/baselines/reference/useObjectValuesAndEntries4.symbols
+++ b/tests/baselines/reference/useObjectValuesAndEntries4.symbols
@@ -7,7 +7,7 @@ var o = { a: 1, b: 2 };
 for (var x of Object.values(o)) {
 >x : Symbol(x, Decl(useObjectValuesAndEntries4.ts, 2, 8))
 >Object.values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
->Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
 >o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 0, 3))
 
@@ -19,7 +19,7 @@ for (var x of Object.values(o)) {
 var entries = Object.entries(o);
 >entries : Symbol(entries, Decl(useObjectValuesAndEntries4.ts, 6, 3))
 >Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
->Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
 >o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 0, 3))
 
diff --git a/tests/baselines/reference/user/adonis-framework.log b/tests/baselines/reference/user/adonis-framework.log
index 2e91020c166..c04db0f663c 100644
--- a/tests/baselines/reference/user/adonis-framework.log
+++ b/tests/baselines/reference/user/adonis-framework.log
@@ -1,6 +1,5 @@
 Exit Code: 1
 Standard output:
-node_modules/adonis-framework/lib/util.js(18,14): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/adonis-framework/node_modules/adonis-framework/lib/util"' because it is not a variable.
 node_modules/adonis-framework/lib/util.js(24,13): error TS2304: Cannot find name 'Mixed'.
 node_modules/adonis-framework/providers/ConfigProvider.js(9,33): error TS2307: Cannot find module 'adonis-fold'.
 node_modules/adonis-framework/providers/EncryptionProvider.js(9,33): error TS2307: Cannot find module 'adonis-fold'.
@@ -64,13 +63,10 @@ node_modules/adonis-framework/src/Exceptions/index.js(205,12): error TS2554: Exp
 node_modules/adonis-framework/src/File/index.js(175,5): error TS2322: Type 'Promise<any>' is not assignable to type 'boolean'.
 node_modules/adonis-framework/src/File/index.js(273,5): error TS2322: Type 'boolean | ""' is not assignable to type 'boolean'.
   Type '""' is not assignable to type 'boolean'.
-node_modules/adonis-framework/src/Hash/index.js(19,12): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/adonis-framework/node_modules/adonis-framework/src/Hash/index"' because it is not a variable.
-node_modules/adonis-framework/src/Helpers/index.js(49,15): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/adonis-framework/node_modules/adonis-framework/src/Helpers/index"' because it is not a variable.
 node_modules/adonis-framework/src/Helpers/index.js(105,3): error TS2322: Type 'null' is not assignable to type 'string'.
 node_modules/adonis-framework/src/Helpers/index.js(106,3): error TS2322: Type 'null' is not assignable to type 'string'.
 node_modules/adonis-framework/src/Helpers/index.js(330,23): error TS2532: Object is possibly 'undefined'.
 node_modules/adonis-framework/src/Middleware/index.js(13,21): error TS2307: Cannot find module 'adonis-fold'.
-node_modules/adonis-framework/src/Middleware/index.js(57,18): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/adonis-framework/node_modules/adonis-framework/src/Middleware/index"' because it is not a variable.
 node_modules/adonis-framework/src/Middleware/index.js(92,19): error TS2538: Type 'undefined' cannot be used as an index type.
 node_modules/adonis-framework/src/Middleware/index.js(230,20): error TS8024: JSDoc '@param' tag has name 'Middleware', but there is no parameter with that name.
 node_modules/adonis-framework/src/Request/index.js(64,15): error TS2304: Cannot find name 'Mixed'.
@@ -103,8 +99,6 @@ node_modules/adonis-framework/src/Response/index.js(95,16): error TS2304: Cannot
 node_modules/adonis-framework/src/Response/index.js(172,15): error TS2304: Cannot find name 'Mixed'.
 node_modules/adonis-framework/src/Response/index.js(299,15): error TS2304: Cannot find name 'Mixed'.
 node_modules/adonis-framework/src/Response/index.js(323,15): error TS2304: Cannot find name 'Mixed'.
-node_modules/adonis-framework/src/Route/domains.js(14,15): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/adonis-framework/node_modules/adonis-framework/src/Route/domains"' because it is not a variable.
-node_modules/adonis-framework/src/Route/helpers.js(15,20): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/adonis-framework/node_modules/adonis-framework/src/Route/helpers"' because it is not a variable.
 node_modules/adonis-framework/src/Route/helpers.js(22,13): error TS2304: Cannot find name 'Any'.
 node_modules/adonis-framework/src/Route/helpers.js(34,3): error TS2322: Type 'string | string[]' is not assignable to type 'string'.
   Type 'string[]' is not assignable to type 'string'.
@@ -112,7 +106,6 @@ node_modules/adonis-framework/src/Route/helpers.js(42,13): error TS2304: Cannot
 node_modules/adonis-framework/src/Route/helpers.js(54,21): error TS8024: JSDoc '@param' tag has name 'url', but there is no parameter with that name.
 node_modules/adonis-framework/src/Route/helpers.js(131,21): error TS8024: JSDoc '@param' tag has name 'format', but there is no parameter with that name.
 node_modules/adonis-framework/src/Route/index.js(30,5): error TS2322: Type 'null' is not assignable to type 'string'.
-node_modules/adonis-framework/src/Route/index.js(36,13): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/adonis-framework/node_modules/adonis-framework/src/Route/index"' because it is not a variable.
 node_modules/adonis-framework/src/Route/index.js(58,3): error TS2322: Type 'null' is not assignable to type 'string'.
 node_modules/adonis-framework/src/Route/index.js(321,13): error TS2304: Cannot find name 'Mixed'.
 node_modules/adonis-framework/src/Route/index.js(321,20): error TS8029: JSDoc '@param' tag has name 'keys', but there is no parameter with that name. It would match 'arguments' if it had an array type.
@@ -134,7 +127,6 @@ node_modules/adonis-framework/src/Route/resource.js(198,22): error TS8029: JSDoc
 node_modules/adonis-framework/src/Route/resource.js(233,15): error TS2304: Cannot find name 'Mixed'.
 node_modules/adonis-framework/src/Route/resource.js(261,15): error TS2304: Cannot find name 'Mixed'.
 node_modules/adonis-framework/src/Route/resource.js(296,15): error TS2304: Cannot find name 'Mixed'.
-node_modules/adonis-framework/src/Server/helpers.js(9,15): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/adonis-framework/node_modules/adonis-framework/src/Server/helpers"' because it is not a variable.
 node_modules/adonis-framework/src/Server/helpers.js(17,29): error TS8024: JSDoc '@param' tag has name 'appNamespace', but there is no parameter with that name.
 node_modules/adonis-framework/src/Server/index.js(17,21): error TS2307: Cannot find module 'adonis-fold'.
 node_modules/adonis-framework/src/Server/index.js(54,21): error TS2554: Expected 4 arguments, but got 3.
@@ -156,7 +148,6 @@ node_modules/adonis-framework/src/Session/SessionManager.js(13,21): error TS2307
 node_modules/adonis-framework/src/Session/SessionManager.js(69,22): error TS2339: Property 'drivers' does not exist on type 'Function'.
 node_modules/adonis-framework/src/Session/SessionManager.js(69,49): error TS2339: Property 'drivers' does not exist on type 'Function'.
 node_modules/adonis-framework/src/Session/SessionManager.js(71,76): error TS2339: Property 'drivers' does not exist on type 'Function'.
-node_modules/adonis-framework/src/Session/Store.js(21,15): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/adonis-framework/node_modules/adonis-framework/src/Session/Store"' because it is not a variable.
 node_modules/adonis-framework/src/Session/Store.js(28,13): error TS2304: Cannot find name 'Mixed'.
 node_modules/adonis-framework/src/Session/Store.js(80,13): error TS2304: Cannot find name 'Mixed'.
 node_modules/adonis-framework/src/Session/index.js(11,2): error TS1003: Identifier expected.
@@ -197,11 +188,9 @@ node_modules/adonis-framework/src/View/Form/index.js(601,51): error TS2345: Argu
   Type 'number' is not assignable to type 'string | any[]'.
 node_modules/adonis-framework/src/View/index.js(50,23): error TS8024: JSDoc '@param' tag has name 'template_path', but there is no parameter with that name.
 node_modules/adonis-framework/src/View/index.js(113,15): error TS2304: Cannot find name 'Mixed'.
-node_modules/adonis-framework/src/View/loader.js(18,1): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/adonis-framework/node_modules/adonis-framework/src/View/loader"' because it is not a variable.
 node_modules/adonis-framework/src/View/services.js(10,21): error TS2307: Cannot find module 'adonis-fold'.
 node_modules/adonis-framework/src/View/services.js(25,23): error TS8024: JSDoc '@param' tag has name 'lexer', but there is no parameter with that name.
 node_modules/adonis-framework/src/View/services.js(34,22): error TS2339: Property 'CallExtensionAsync' does not exist on type 'Function'.
-node_modules/adonis-framework/src/View/services.js(65,1): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/adonis-framework/node_modules/adonis-framework/src/View/services"' because it is not a variable.
 
 
 
diff --git a/tests/baselines/reference/user/antd.log b/tests/baselines/reference/user/antd.log
deleted file mode 100644
index c3ac31f6eaa..00000000000
--- a/tests/baselines/reference/user/antd.log
+++ /dev/null
@@ -1,20 +0,0 @@
-Exit Code: 1
-Standard output:
-node_modules/antd/lib/badge/ScrollNumber.d.ts(28,81): error TS2344: Type '{ className: string; style: { transition: string | boolean; msTransform: string; WebkitTransform:...' does not satisfy the constraint 'HTMLAttributes<HTMLElement>'.
-  Types of property 'style' are incompatible.
-    Type '{ transition: string | boolean; msTransform: string; WebkitTransform: string; transform: string; }' is not assignable to type 'CSSProperties | undefined'.
-      Type '{ transition: string | boolean; msTransform: string; WebkitTransform: string; transform: string; }' is not assignable to type 'CSSProperties'.
-        Types of property 'transition' are incompatible.
-          Type 'string | boolean' is not assignable to type 'string | undefined'.
-            Type 'true' is not assignable to type 'string | undefined'.
-node_modules/antd/lib/badge/ScrollNumber.d.ts(38,77): error TS2344: Type '{ className: string; style: { transition: string | boolean; msTransform: string; WebkitTransform:...' does not satisfy the constraint 'HTMLAttributes<HTMLElement>'.
-  Types of property 'style' are incompatible.
-    Type '{ transition: string | boolean; msTransform: string; WebkitTransform: string; transform: string; }' is not assignable to type 'CSSProperties | undefined'.
-      Type '{ transition: string | boolean; msTransform: string; WebkitTransform: string; transform: string; }' is not assignable to type 'CSSProperties'.
-        Types of property 'transition' are incompatible.
-          Type 'string | boolean' is not assignable to type 'string | undefined'.
-            Type 'true' is not assignable to type 'string | undefined'.
-
-
-
-Standard error:
diff --git a/tests/baselines/reference/user/axios-src.log b/tests/baselines/reference/user/axios-src.log
new file mode 100644
index 00000000000..ad8bc285bbb
--- /dev/null
+++ b/tests/baselines/reference/user/axios-src.log
@@ -0,0 +1,44 @@
+Exit Code: 1
+Standard output:
+lib/adapters/http.js(12,19): error TS2307: Cannot find module './../../package.json'.
+lib/adapters/http.js(83,22): error TS2345: Argument of type 'string | undefined' is not assignable to parameter of type 'string'.
+  Type 'undefined' is not assignable to type 'string'.
+lib/adapters/http.js(189,23): error TS2345: Argument of type 'null' is not assignable to parameter of type 'string | undefined'.
+lib/adapters/http.js(195,44): error TS2345: Argument of type 'null' is not assignable to parameter of type 'string | undefined'.
+lib/adapters/http.js(201,13): error TS2322: Type 'string' is not assignable to type 'Buffer'.
+lib/adapters/http.js(213,40): error TS2345: Argument of type 'null' is not assignable to parameter of type 'string | undefined'.
+lib/adapters/http.js(237,42): error TS2345: Argument of type 'null' is not assignable to parameter of type 'string | undefined'.
+lib/adapters/xhr.js(29,16): error TS2339: Property 'XDomainRequest' does not exist on type 'Window'.
+lib/adapters/xhr.js(31,28): error TS2339: Property 'XDomainRequest' does not exist on type 'Window'.
+lib/adapters/xhr.js(80,7): error TS2322: Type 'null' is not assignable to type 'XMLHttpRequest'.
+lib/adapters/xhr.js(92,7): error TS2322: Type 'null' is not assignable to type 'XMLHttpRequest'.
+lib/adapters/xhr.js(99,51): error TS2345: Argument of type 'null' is not assignable to parameter of type 'string | undefined'.
+lib/adapters/xhr.js(102,7): error TS2322: Type 'null' is not assignable to type 'XMLHttpRequest'.
+lib/adapters/xhr.js(111,7): error TS2322: Type 'null' is not assignable to type 'XMLHttpRequest'.
+lib/adapters/xhr.js(181,9): error TS2322: Type 'null' is not assignable to type 'XMLHttpRequest'.
+lib/axios.js(23,3): error TS2554: Expected 3 arguments, but got 2.
+lib/axios.js(25,3): error TS2322: Type '(...args: any[]) => any' is not assignable to type 'Axios'.
+  Property 'defaults' is missing in type '(...args: any[]) => any'.
+lib/axios.js(32,7): error TS2339: Property 'Axios' does not exist on type 'Axios'.
+lib/axios.js(35,7): error TS2339: Property 'create' does not exist on type 'Axios'.
+lib/axios.js(40,7): error TS2339: Property 'Cancel' does not exist on type 'Axios'.
+lib/axios.js(41,7): error TS2339: Property 'CancelToken' does not exist on type 'Axios'.
+lib/axios.js(42,7): error TS2339: Property 'isCancel' does not exist on type 'Axios'.
+lib/axios.js(45,7): error TS2339: Property 'all' does not exist on type 'Axios'.
+lib/axios.js(48,7): error TS2339: Property 'spread' does not exist on type 'Axios'.
+lib/cancel/CancelToken.js(37,12): error TS2339: Property 'reason' does not exist on type 'CancelToken'.
+lib/cancel/CancelToken.js(38,16): error TS2339: Property 'reason' does not exist on type 'CancelToken'.
+lib/core/enhanceError.js(14,9): error TS2339: Property 'config' does not exist on type 'Error'.
+lib/core/enhanceError.js(16,11): error TS2339: Property 'code' does not exist on type 'Error'.
+lib/core/enhanceError.js(18,9): error TS2339: Property 'request' does not exist on type 'Error'.
+lib/core/enhanceError.js(19,9): error TS2339: Property 'response' does not exist on type 'Error'.
+lib/core/settle.js(21,7): error TS2345: Argument of type 'null' is not assignable to parameter of type 'string | undefined'.
+lib/helpers/btoa.js(11,13): error TS2339: Property 'code' does not exist on type 'Error'.
+lib/helpers/btoa.js(31,13): error TS2532: Object is possibly 'undefined'.
+lib/helpers/cookies.js(16,56): error TS2551: Property 'toGMTString' does not exist on type 'Date'. Did you mean 'toUTCString'?
+lib/utils.js(244,20): error TS8029: JSDoc '@param' tag has name 'obj1', but there is no parameter with that name. It would match 'arguments' if it had an array type.
+lib/utils.js(268,20): error TS8029: JSDoc '@param' tag has name 'obj1', but there is no parameter with that name. It would match 'arguments' if it had an array type.
+
+
+
+Standard error:
diff --git a/tests/baselines/reference/user/bcryptjs.log b/tests/baselines/reference/user/bcryptjs.log
index 21952052b6a..1289e0a392d 100644
--- a/tests/baselines/reference/user/bcryptjs.log
+++ b/tests/baselines/reference/user/bcryptjs.log
@@ -1,62 +1,10 @@
 Exit Code: 1
 Standard output:
-../../../../node_modules/@types/node/index.d.ts(138,13): error TS2300: Duplicate identifier 'require'.
-../../../../node_modules/@types/node/index.d.ts(150,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'module' must be of type 'Module', but here has type 'NodeModule'.
-../../../../node_modules/@types/node/index.d.ts(174,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'Buffer' must be of type 'typeof Buffer', but here has type '{ new (str: string, encoding?: string | undefined): Buffer; new (size: number): Buffer; new (arra...'.
-node_modules/bcryptjs/dist/bcrypt.js(37,16): error TS2345: Argument of type 'never[]' is not assignable to parameter of type 'string'.
-node_modules/bcryptjs/dist/bcrypt.js(134,18): error TS2366: Function lacks ending return statement and return type does not include 'undefined'.
-node_modules/bcryptjs/dist/bcrypt.js(190,9): error TS2322: Type 'string | undefined' is not assignable to type 'string'.
-  Type 'undefined' is not assignable to type 'string'.
-node_modules/bcryptjs/dist/bcrypt.js(200,18): error TS2366: Function lacks ending return statement and return type does not include 'undefined'.
-node_modules/bcryptjs/dist/bcrypt.js(278,18): error TS2366: Function lacks ending return statement and return type does not include 'undefined'.
-node_modules/bcryptjs/dist/bcrypt.js(563,42): error TS2531: Object is possibly 'null'.
-node_modules/bcryptjs/dist/bcrypt.js(566,44): error TS2531: Object is possibly 'null'.
-node_modules/bcryptjs/dist/bcrypt.js(566,59): error TS2533: Object is possibly 'null' or 'undefined'.
-node_modules/bcryptjs/dist/bcrypt.js(569,44): error TS2531: Object is possibly 'null'.
-node_modules/bcryptjs/dist/bcrypt.js(569,61): error TS2533: Object is possibly 'null' or 'undefined'.
-node_modules/bcryptjs/dist/bcrypt.js(569,76): error TS2533: Object is possibly 'null' or 'undefined'.
-node_modules/bcryptjs/dist/bcrypt.js(1203,26): error TS2345: Argument of type 'Int32Array | number[]' is not assignable to parameter of type 'number[]'.
-  Type 'Int32Array' is not assignable to type 'number[]'.
-    Property 'flatMap' is missing in type 'Int32Array'.
-node_modules/bcryptjs/dist/bcrypt.js(1233,30): error TS2345: Argument of type 'null' is not assignable to parameter of type 'Error'.
-node_modules/bcryptjs/dist/bcrypt.js(1345,27): error TS2345: Argument of type 'number[] | undefined' is not assignable to parameter of type 'number[]'.
-  Type 'undefined' is not assignable to type 'number[]'.
-node_modules/bcryptjs/dist/bcrypt.js(1351,35): error TS2345: Argument of type 'null' is not assignable to parameter of type 'string | undefined'.
-node_modules/bcryptjs/dist/bcrypt.js(1353,30): error TS2345: Argument of type 'null' is not assignable to parameter of type 'Error'.
-node_modules/bcryptjs/dist/bcrypt.js(1353,43): error TS2345: Argument of type 'number[] | undefined' is not assignable to parameter of type 'number[]'.
-  Type 'undefined' is not assignable to type 'number[]'.
-node_modules/bcryptjs/externs/bcrypt.js(36,14): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/bcryptjs/externs/bcrypt.js(50,14): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/bcryptjs/externs/bcrypt.js(65,14): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/bcryptjs/externs/bcrypt.js(80,14): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/bcryptjs/externs/bcrypt.js(87,14): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/bcryptjs/externs/minimal-env.js(10,10): error TS2300: Duplicate identifier 'require'.
-node_modules/bcryptjs/externs/minimal-env.js(48,1): error TS8022: JSDoc '@extends' is not attached to a class.
-node_modules/bcryptjs/externs/minimal-env.js(63,14): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/bcryptjs/externs/minimal-env.js(65,8): error TS2339: Property 'randomBytes' does not exist on type 'Crypto'.
-node_modules/bcryptjs/externs/minimal-env.js(70,8): error TS2540: Cannot assign to 'crypto' because it is a constant or a read-only property.
-node_modules/bcryptjs/externs/minimal-env.js(75,1): error TS2322: Type '(array: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array) => void' is not assignable to type '(array: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8Clamp...'.
-  Type 'void' is not assignable to type 'Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray ...'.
-node_modules/bcryptjs/externs/minimal-env.js(90,14): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/bcryptjs/externs/minimal-env.js(96,14): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/bcryptjs/scripts/build.js(5,20): error TS2339: Property 'join' does not exist on type 'void'.
-node_modules/bcryptjs/scripts/build.js(6,19): error TS2339: Property 'join' does not exist on type 'void'.
-node_modules/bcryptjs/scripts/build.js(7,20): error TS2339: Property 'join' does not exist on type 'void'.
-node_modules/bcryptjs/scripts/build.js(8,24): error TS2339: Property 'join' does not exist on type 'void'.
-node_modules/bcryptjs/scripts/build.js(12,18): error TS2339: Property 'version' does not exist on type 'void'.
-node_modules/bcryptjs/scripts/build.js(18,4): error TS2339: Property 'writeFileSync' does not exist on type 'void'.
-node_modules/bcryptjs/scripts/build.js(19,10): error TS2339: Property 'join' does not exist on type 'void'.
-node_modules/bcryptjs/scripts/build.js(20,16): error TS2339: Property 'transform' does not exist on type 'void'.
-node_modules/bcryptjs/scripts/build.js(20,29): error TS2339: Property 'readFileSync' does not exist on type 'void'.
-node_modules/bcryptjs/scripts/build.js(20,58): error TS2339: Property 'join' does not exist on type 'void'.
+node_modules/bcryptjs/scripts/build.js(1,26): error TS2307: Cannot find module 'metascript'.
 node_modules/bcryptjs/scripts/build.js(32,1): error TS2322: Type '{ VERSION: any; }' is not assignable to type '{ [x: string]: any; VERSION: any; ISAAC: boolean; }'.
   Property 'ISAAC' is missing in type '{ VERSION: any; }'.
-node_modules/bcryptjs/scripts/build.js(32,24): error TS2339: Property 'version' does not exist on type 'void'.
-node_modules/bcryptjs/scripts/build.js(34,4): error TS2339: Property 'writeFileSync' does not exist on type 'void'.
-node_modules/bcryptjs/scripts/build.js(35,10): error TS2339: Property 'join' does not exist on type 'void'.
-node_modules/bcryptjs/scripts/build.js(36,16): error TS2339: Property 'transform' does not exist on type 'void'.
-node_modules/bcryptjs/scripts/build.js(36,29): error TS2339: Property 'readFileSync' does not exist on type 'void'.
-node_modules/bcryptjs/scripts/build.js(36,58): error TS2339: Property 'join' does not exist on type 'void'.
+node_modules/bcryptjs/src/bcrypt.js(25,13): error TS2322: Type 'Buffer' is not assignable to type 'number[]'.
+  Property 'flatMap' is missing in type 'Buffer'.
 node_modules/bcryptjs/src/bcrypt.js(94,14): error TS2366: Function lacks ending return statement and return type does not include 'undefined'.
 node_modules/bcryptjs/src/bcrypt.js(150,5): error TS2322: Type 'string | undefined' is not assignable to type 'string'.
   Type 'undefined' is not assignable to type 'string'.
@@ -64,6 +12,7 @@ node_modules/bcryptjs/src/bcrypt.js(160,14): error TS2366: Function lacks ending
 node_modules/bcryptjs/src/bcrypt.js(238,14): error TS2366: Function lacks ending return statement and return type does not include 'undefined'.
 node_modules/bcryptjs/src/bcrypt/impl.js(516,22): error TS2345: Argument of type 'Int32Array | number[]' is not assignable to parameter of type 'number[]'.
   Type 'Int32Array' is not assignable to type 'number[]'.
+    Property 'flatMap' is missing in type 'Int32Array'.
 node_modules/bcryptjs/src/bcrypt/impl.js(546,26): error TS2345: Argument of type 'null' is not assignable to parameter of type 'Error'.
 node_modules/bcryptjs/src/bcrypt/impl.js(658,23): error TS2345: Argument of type 'number[] | undefined' is not assignable to parameter of type 'number[]'.
   Type 'undefined' is not assignable to type 'number[]'.
@@ -78,63 +27,11 @@ node_modules/bcryptjs/src/bcrypt/prng/accum.js(65,74): error TS2339: Property 'd
 node_modules/bcryptjs/src/bcrypt/prng/accum.js(66,22): error TS2339: Property 'detachEvent' does not exist on type 'Document'.
 node_modules/bcryptjs/src/bcrypt/prng/accum.js(67,22): error TS2339: Property 'detachEvent' does not exist on type 'Document'.
 node_modules/bcryptjs/src/bcrypt/util.js(20,5): error TS2304: Cannot find name 'utfx'.
-node_modules/bcryptjs/src/wrap.js(38,16): error TS2345: Argument of type 'never[]' is not assignable to parameter of type 'string'.
-node_modules/bcryptjs/tests/suite.js(4,27): error TS2339: Property 'join' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(15,26): error TS2339: Property 'encodeBase64' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(21,28): error TS2339: Property 'decodeBase64' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(27,27): error TS2339: Property 'genSaltSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(35,16): error TS2339: Property 'genSalt' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(45,20): error TS2339: Property 'hashSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(47,30): error TS2339: Property 'hashSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(47,60): error TS2339: Property 'hashSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(52,16): error TS2339: Property 'hash' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(60,28): error TS2339: Property 'genSaltSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(61,28): error TS2339: Property 'hashSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(62,28): error TS2339: Property 'genSaltSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(63,28): error TS2339: Property 'hashSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(64,28): error TS2339: Property 'genSaltSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(65,28): error TS2339: Property 'hashSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(68,24): error TS2339: Property 'compareSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(69,27): error TS2339: Property 'compareSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(70,27): error TS2339: Property 'compareSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(73,24): error TS2339: Property 'compareSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(74,27): error TS2339: Property 'compareSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(75,27): error TS2339: Property 'compareSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(78,24): error TS2339: Property 'compareSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(79,27): error TS2339: Property 'compareSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(80,27): error TS2339: Property 'compareSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(86,28): error TS2339: Property 'genSaltSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(87,28): error TS2339: Property 'hashSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(88,28): error TS2339: Property 'genSaltSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(90,28): error TS2339: Property 'hashSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(91,16): error TS2339: Property 'compare' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(94,20): error TS2339: Property 'compare' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(97,24): error TS2339: Property 'compare' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(100,28): error TS2339: Property 'compare' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(111,28): error TS2339: Property 'hashSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(111,53): error TS2339: Property 'genSaltSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(112,27): error TS2339: Property 'getSalt' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(113,28): error TS2339: Property 'hashSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(119,28): error TS2339: Property 'hashSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(119,53): error TS2339: Property 'genSaltSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(120,27): error TS2339: Property 'getRounds' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(125,16): error TS2339: Property 'genSalt' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(128,20): error TS2339: Property 'hash' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(142,16): error TS2339: Property 'genSalt' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(144,20): error TS2339: Property 'hash' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(147,24): error TS2339: Property 'compare' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(150,28): error TS2339: Property 'genSalt' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(170,27): error TS2339: Property 'readFileSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(170,45): error TS2339: Property 'join' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(171,31): error TS2339: Property 'genSaltSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(172,33): error TS2339: Property 'hashSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(173,32): error TS2339: Property 'hashSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(179,32): error TS2339: Property 'genSaltSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(180,33): error TS2339: Property 'genSaltSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(184,28): error TS2339: Property 'genSaltSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(185,28): error TS2339: Property 'genSaltSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(189,28): error TS2339: Property 'genSaltSync' does not exist on type 'void'.
-node_modules/bcryptjs/tests/suite.js(190,28): error TS2339: Property 'genSaltSync' does not exist on type 'void'.
+node_modules/bcryptjs/src/wrap.js(37,26): error TS2304: Cannot find name 'define'.
+node_modules/bcryptjs/src/wrap.js(37,51): error TS2304: Cannot find name 'define'.
+node_modules/bcryptjs/src/wrap.js(38,9): error TS2304: Cannot find name 'define'.
+node_modules/bcryptjs/src/wrap.js(49,12): error TS2552: Cannot find name 'bcrypt'. Did you mean 'Crypto'?
+node_modules/bcryptjs/tests/suite.js(3,23): error TS2307: Cannot find module 'bcrypt'.
 
 
 
diff --git a/tests/baselines/reference/user/bluebird.log b/tests/baselines/reference/user/bluebird.log
index 63e05764281..139cf781883 100644
--- a/tests/baselines/reference/user/bluebird.log
+++ b/tests/baselines/reference/user/bluebird.log
@@ -1,216 +1,5 @@
 Exit Code: 1
 Standard output:
-node_modules/bluebird/js/browser/bluebird.core.js(30,116): error TS2304: Cannot find name 'define'.
-node_modules/bluebird/js/browser/bluebird.core.js(30,124): error TS2304: Cannot find name 'define'.
-node_modules/bluebird/js/browser/bluebird.core.js(30,135): error TS2304: Cannot find name 'define'.
-node_modules/bluebird/js/browser/bluebird.core.js(30,266): error TS2532: Object is possibly 'undefined'.
-node_modules/bluebird/js/browser/bluebird.core.js(30,268): error TS2339: Property 'Promise' does not exist on type 'Window | Global'.
-  Property 'Promise' does not exist on type 'Window'.
-node_modules/bluebird/js/browser/bluebird.core.js(30,394): error TS2304: Cannot find name '_dereq_'.
-node_modules/bluebird/js/browser/bluebird.core.js(30,415): error TS2304: Cannot find name '_dereq_'.
-node_modules/bluebird/js/browser/bluebird.core.js(30,521): error TS2339: Property 'code' does not exist on type 'Error'.
-node_modules/bluebird/js/browser/bluebird.core.js(30,694): error TS2304: Cannot find name '_dereq_'.
-node_modules/bluebird/js/browser/bluebird.core.js(30,715): error TS2304: Cannot find name '_dereq_'.
-node_modules/bluebird/js/browser/bluebird.core.js(122,21): error TS2300: Duplicate identifier 'invokeLater'.
-node_modules/bluebird/js/browser/bluebird.core.js(123,21): error TS2300: Duplicate identifier 'invoke'.
-node_modules/bluebird/js/browser/bluebird.core.js(124,21): error TS2300: Duplicate identifier 'settlePromises'.
-node_modules/bluebird/js/browser/bluebird.core.js(126,21): error TS2300: Duplicate identifier 'invokeLater'.
-node_modules/bluebird/js/browser/bluebird.core.js(138,21): error TS2300: Duplicate identifier 'invoke'.
-node_modules/bluebird/js/browser/bluebird.core.js(148,21): error TS2300: Duplicate identifier 'settlePromises'.
-node_modules/bluebird/js/browser/bluebird.core.js(681,17): error TS2403: Subsequent variable declarations must have the same type.  Variable 'event' must be of type 'CustomEvent<any>', but here has type 'Event'.
-node_modules/bluebird/js/browser/bluebird.core.js(687,26): error TS2339: Property 'detail' does not exist on type 'Event'.
-node_modules/bluebird/js/browser/bluebird.core.js(1068,46): error TS2554: Expected 0 arguments, but got 1.
-node_modules/bluebird/js/browser/bluebird.core.js(1242,5): error TS2721: Cannot invoke an object which is possibly 'null'.
-node_modules/bluebird/js/browser/bluebird.core.js(1260,30): error TS2339: Property 'stack' does not exist on type 'CapturedTrace'.
-node_modules/bluebird/js/browser/bluebird.core.js(1266,37): error TS2339: Property 'stack' does not exist on type 'CapturedTrace'.
-node_modules/bluebird/js/browser/bluebird.core.js(1305,38): error TS2339: Property 'stack' does not exist on type 'CapturedTrace'.
-node_modules/bluebird/js/browser/bluebird.core.js(1314,25): error TS2554: Expected 0 arguments, but got 1.
-node_modules/bluebird/js/browser/bluebird.core.js(1500,49): error TS2350: Only a void function can be called with the 'new' keyword.
-node_modules/bluebird/js/browser/bluebird.core.js(2125,24): error TS2339: Property 'PromiseInspection' does not exist on type 'typeof Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2138,32): error TS2322: Type 'null' is not assignable to type 'Domain'.
-node_modules/bluebird/js/browser/bluebird.core.js(2241,14): error TS2339: Property '_warn' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2266,14): error TS2551: Property 'isFulfilled' does not exist on type 'Promise'. Did you mean '_setFulfilled'?
-node_modules/bluebird/js/browser/bluebird.core.js(2267,37): error TS2339: Property 'value' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2269,21): error TS2551: Property 'isRejected' does not exist on type 'Promise'. Did you mean '_setRejected'?
-node_modules/bluebird/js/browser/bluebird.core.js(2270,36): error TS2339: Property 'reason' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2278,14): error TS2339: Property '_warn' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2295,9): error TS2339: Property '_captureStackTrace' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2325,9): error TS2339: Property '_captureStackTrace' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2356,63): error TS2339: Property '_boundTo' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2359,14): error TS2339: Property '_fireEvent' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2371,20): error TS2339: Property '_unsetRejectionIsUnhandled' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2375,20): error TS2339: Property '_attachExtraTrace' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2413,10): error TS2339: Property '_fireEvent' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2418,10): error TS2339: Property '_fireEvent' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2423,10): error TS2339: Property '_fireEvent' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2440,10): error TS2339: Property '_fireEvent' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2457,42): error TS2339: Property '_isBound' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2552,26): error TS2339: Property '_propagateFrom' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2589,14): error TS2339: Property '_warn' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2591,10): error TS2339: Property '_attachExtraTrace' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2598,10): error TS2339: Property '_captureStackTrace' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2599,10): error TS2339: Property '_pushContext' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2601,18): error TS2339: Property '_execute' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2607,10): error TS2339: Property '_popContext' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2748,14): error TS2339: Property '_attachExtraTrace' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2776,14): error TS2339: Property '_ensurePossibleRejectionHandled' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2816,10): error TS2339: Property '_clearCancellationData' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.core.js(2951,18): error TS2339: Property '_resolveEmptyArray' does not exist on type 'PromiseArray'.
-node_modules/bluebird/js/browser/bluebird.core.js(2989,30): error TS2554: Expected 0-1 arguments, but got 2.
-node_modules/bluebird/js/browser/bluebird.core.js(2991,30): error TS2554: Expected 0 arguments, but got 1.
-node_modules/bluebird/js/browser/bluebird.core.js(3165,31): error TS2339: Property 'standalone' does not exist on type 'Navigator'.
-node_modules/bluebird/js/browser/bluebird.core.js(3165,52): error TS2339: Property 'cordova' does not exist on type 'Window'.
-node_modules/bluebird/js/browser/bluebird.core.js(3599,5): error TS7027: Unreachable code detected.
-node_modules/bluebird/js/browser/bluebird.core.js(3761,25): error TS2304: Cannot find name 'chrome'.
-node_modules/bluebird/js/browser/bluebird.core.js(3761,51): error TS2304: Cannot find name 'chrome'.
-node_modules/bluebird/js/browser/bluebird.core.js(3762,25): error TS2304: Cannot find name 'chrome'.
-node_modules/bluebird/js/browser/bluebird.core.js(3781,118): error TS2339: Property 'P' does not exist on type 'Window'.
-node_modules/bluebird/js/browser/bluebird.core.js(3781,129): error TS2339: Property 'Promise' does not exist on type 'Window'.
-node_modules/bluebird/js/browser/bluebird.core.js(3781,282): error TS2339: Property 'P' does not exist on type 'Window'.
-node_modules/bluebird/js/browser/bluebird.core.js(3781,291): error TS2339: Property 'Promise' does not exist on type 'Window'.
-node_modules/bluebird/js/browser/bluebird.js(29,116): error TS2304: Cannot find name 'define'.
-node_modules/bluebird/js/browser/bluebird.js(29,124): error TS2304: Cannot find name 'define'.
-node_modules/bluebird/js/browser/bluebird.js(29,135): error TS2304: Cannot find name 'define'.
-node_modules/bluebird/js/browser/bluebird.js(29,266): error TS2532: Object is possibly 'undefined'.
-node_modules/bluebird/js/browser/bluebird.js(29,268): error TS2339: Property 'Promise' does not exist on type 'Window | Global'.
-  Property 'Promise' does not exist on type 'Window'.
-node_modules/bluebird/js/browser/bluebird.js(29,394): error TS2304: Cannot find name '_dereq_'.
-node_modules/bluebird/js/browser/bluebird.js(29,415): error TS2304: Cannot find name '_dereq_'.
-node_modules/bluebird/js/browser/bluebird.js(29,521): error TS2339: Property 'code' does not exist on type 'Error'.
-node_modules/bluebird/js/browser/bluebird.js(29,694): error TS2304: Cannot find name '_dereq_'.
-node_modules/bluebird/js/browser/bluebird.js(29,715): error TS2304: Cannot find name '_dereq_'.
-node_modules/bluebird/js/browser/bluebird.js(144,21): error TS2300: Duplicate identifier 'invokeLater'.
-node_modules/bluebird/js/browser/bluebird.js(145,21): error TS2300: Duplicate identifier 'invoke'.
-node_modules/bluebird/js/browser/bluebird.js(146,21): error TS2300: Duplicate identifier 'settlePromises'.
-node_modules/bluebird/js/browser/bluebird.js(148,21): error TS2300: Duplicate identifier 'invokeLater'.
-node_modules/bluebird/js/browser/bluebird.js(160,21): error TS2300: Duplicate identifier 'invoke'.
-node_modules/bluebird/js/browser/bluebird.js(170,21): error TS2300: Duplicate identifier 'settlePromises'.
-node_modules/bluebird/js/browser/bluebird.js(828,17): error TS2403: Subsequent variable declarations must have the same type.  Variable 'event' must be of type 'CustomEvent<any>', but here has type 'Event'.
-node_modules/bluebird/js/browser/bluebird.js(834,26): error TS2339: Property 'detail' does not exist on type 'Event'.
-node_modules/bluebird/js/browser/bluebird.js(1215,46): error TS2554: Expected 0 arguments, but got 1.
-node_modules/bluebird/js/browser/bluebird.js(1389,5): error TS2721: Cannot invoke an object which is possibly 'null'.
-node_modules/bluebird/js/browser/bluebird.js(1407,30): error TS2339: Property 'stack' does not exist on type 'CapturedTrace'.
-node_modules/bluebird/js/browser/bluebird.js(1413,37): error TS2339: Property 'stack' does not exist on type 'CapturedTrace'.
-node_modules/bluebird/js/browser/bluebird.js(1452,38): error TS2339: Property 'stack' does not exist on type 'CapturedTrace'.
-node_modules/bluebird/js/browser/bluebird.js(1461,25): error TS2554: Expected 0 arguments, but got 1.
-node_modules/bluebird/js/browser/bluebird.js(1679,49): error TS2350: Only a void function can be called with the 'new' keyword.
-node_modules/bluebird/js/browser/bluebird.js(2251,5): error TS2554: Expected 0 arguments, but got 1.
-node_modules/bluebird/js/browser/bluebird.js(2456,10): error TS2551: Property '_init$' does not exist on type 'MappingPromiseArray'. Did you mean '_init'?
-node_modules/bluebird/js/browser/bluebird.js(2462,23): error TS2339: Property '_values' does not exist on type 'MappingPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(2463,23): error TS2339: Property 'length' does not exist on type 'MappingPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(2473,22): error TS2339: Property '_isResolved' does not exist on type 'MappingPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(2483,28): error TS2339: Property '_promise' does not exist on type 'MappingPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(2496,18): error TS2339: Property '_reject' does not exist on type 'MappingPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(2500,58): error TS2339: Property '_promise' does not exist on type 'MappingPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(2513,22): error TS2339: Property '_reject' does not exist on type 'MappingPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(2516,22): error TS2339: Property '_cancel' does not exist on type 'MappingPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(2522,32): error TS2339: Property '_totalResolved' does not exist on type 'MappingPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(2527,18): error TS2339: Property '_resolve' does not exist on type 'MappingPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(2537,23): error TS2339: Property '_values' does not exist on type 'MappingPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(2539,18): error TS2339: Property '_isResolved' does not exist on type 'MappingPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(2553,10): error TS2339: Property '_resolve' does not exist on type 'MappingPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(2582,66): error TS2339: Property 'promise' does not exist on type 'MappingPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(2738,19): error TS2339: Property 'cause' does not exist on type 'Error'.
-node_modules/bluebird/js/browser/bluebird.js(2773,24): error TS2339: Property 'PromiseInspection' does not exist on type 'typeof Promise'.
-node_modules/bluebird/js/browser/bluebird.js(2786,32): error TS2322: Type 'null' is not assignable to type 'Domain'.
-node_modules/bluebird/js/browser/bluebird.js(2889,14): error TS2339: Property '_warn' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(2914,14): error TS2551: Property 'isFulfilled' does not exist on type 'Promise'. Did you mean '_setFulfilled'?
-node_modules/bluebird/js/browser/bluebird.js(2915,37): error TS2339: Property 'value' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(2917,21): error TS2551: Property 'isRejected' does not exist on type 'Promise'. Did you mean '_setRejected'?
-node_modules/bluebird/js/browser/bluebird.js(2918,36): error TS2339: Property 'reason' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(2926,14): error TS2339: Property '_warn' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(2943,9): error TS2339: Property '_captureStackTrace' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(2973,9): error TS2339: Property '_captureStackTrace' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(3004,63): error TS2339: Property '_boundTo' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(3007,14): error TS2339: Property '_fireEvent' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(3019,20): error TS2339: Property '_unsetRejectionIsUnhandled' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(3023,20): error TS2339: Property '_attachExtraTrace' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(3061,10): error TS2339: Property '_fireEvent' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(3066,10): error TS2339: Property '_fireEvent' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(3071,10): error TS2339: Property '_fireEvent' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(3088,10): error TS2339: Property '_fireEvent' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(3105,42): error TS2339: Property '_isBound' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(3200,26): error TS2339: Property '_propagateFrom' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(3237,14): error TS2339: Property '_warn' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(3239,10): error TS2339: Property '_attachExtraTrace' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(3246,10): error TS2339: Property '_captureStackTrace' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(3247,10): error TS2339: Property '_pushContext' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(3249,18): error TS2339: Property '_execute' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(3255,10): error TS2339: Property '_popContext' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(3396,14): error TS2339: Property '_attachExtraTrace' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(3424,14): error TS2339: Property '_ensurePossibleRejectionHandled' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(3464,10): error TS2339: Property '_clearCancellationData' does not exist on type 'Promise'.
-node_modules/bluebird/js/browser/bluebird.js(3614,18): error TS2339: Property '_resolveEmptyArray' does not exist on type 'PromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(3652,30): error TS2554: Expected 0-1 arguments, but got 2.
-node_modules/bluebird/js/browser/bluebird.js(3654,30): error TS2554: Expected 0 arguments, but got 1.
-node_modules/bluebird/js/browser/bluebird.js(3799,22): error TS2554: Expected 0-1 arguments, but got 3.
-node_modules/bluebird/js/browser/bluebird.js(3823,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'i' must be of type 'number', but here has type 'any'.
-node_modules/bluebird/js/browser/bluebird.js(3979,17): error TS2722: Cannot invoke an object which is possibly 'undefined'.
-node_modules/bluebird/js/browser/bluebird.js(3982,24): error TS2722: Cannot invoke an object which is possibly 'undefined'.
-node_modules/bluebird/js/browser/bluebird.js(3994,12): error TS2722: Cannot invoke an object which is possibly 'undefined'.
-node_modules/bluebird/js/browser/bluebird.js(4111,10): error TS2339: Property '_values' does not exist on type 'PropertiesPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4112,32): error TS2339: Property '_totalResolved' does not exist on type 'PropertiesPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4113,31): error TS2339: Property '_length' does not exist on type 'PropertiesPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4116,37): error TS2339: Property '_values' does not exist on type 'PropertiesPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4119,34): error TS2339: Property 'length' does not exist on type 'PropertiesPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4120,40): error TS2339: Property 'length' does not exist on type 'PropertiesPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4121,26): error TS2339: Property '_values' does not exist on type 'PropertiesPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4121,57): error TS2339: Property '_values' does not exist on type 'PropertiesPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4124,14): error TS2339: Property '_resolve' does not exist on type 'PropertiesPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4148,53): error TS2339: Property 'promise' does not exist on type 'PropertiesPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4336,9): error TS2532: Object is possibly 'undefined'.
-node_modules/bluebird/js/browser/bluebird.js(4353,10): error TS2339: Property '_promise' does not exist on type 'ReductionPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4358,52): error TS2339: Property '_cancel' does not exist on type 'ReductionPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4359,14): error TS2339: Property '_isResolved' does not exist on type 'ReductionPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4360,10): error TS2551: Property '_resultCancelled$' does not exist on type 'ReductionPromiseArray'. Did you mean '_resultCancelled'?
-node_modules/bluebird/js/browser/bluebird.js(4425,18): error TS2339: Property 'promise' does not exist on type 'ReductionPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4489,31): error TS2339: Property 'standalone' does not exist on type 'Navigator'.
-node_modules/bluebird/js/browser/bluebird.js(4489,52): error TS2339: Property 'cordova' does not exist on type 'Window'.
-node_modules/bluebird/js/browser/bluebird.js(4542,10): error TS2339: Property '_values' does not exist on type 'SettledPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4543,32): error TS2339: Property '_totalResolved' does not exist on type 'SettledPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4544,31): error TS2339: Property '_length' does not exist on type 'SettledPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4545,14): error TS2339: Property '_resolve' does not exist on type 'SettledPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4545,28): error TS2339: Property '_values' does not exist on type 'SettledPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4566,46): error TS2339: Property 'promise' does not exist on type 'SettledPromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4598,14): error TS2339: Property '_resolve' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4601,10): error TS2551: Property '_init$' does not exist on type 'SomePromiseArray'. Did you mean '_init'?
-node_modules/bluebird/js/browser/bluebird.js(4602,40): error TS2339: Property '_values' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4603,15): error TS2339: Property '_isResolved' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4606,14): error TS2551: Property '_reject' does not exist on type 'SomePromiseArray'. Did you mean '_rejected'?
-node_modules/bluebird/js/browser/bluebird.js(4606,47): error TS2339: Property 'length' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4630,14): error TS2339: Property '_values' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4632,18): error TS2339: Property '_resolve' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4632,32): error TS2339: Property '_values' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4634,18): error TS2339: Property '_resolve' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4634,32): error TS2339: Property '_values' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4647,14): error TS2339: Property '_values' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4647,49): error TS2339: Property '_values' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4648,21): error TS2339: Property '_cancel' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4657,27): error TS2339: Property 'length' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4657,46): error TS2339: Property '_values' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4658,22): error TS2339: Property '_values' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4659,29): error TS2339: Property '_values' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4663,18): error TS2551: Property '_reject' does not exist on type 'SomePromiseArray'. Did you mean '_rejected'?
-node_modules/bluebird/js/browser/bluebird.js(4665,18): error TS2339: Property '_cancel' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4673,17): error TS2339: Property '_totalResolved' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4677,17): error TS2339: Property '_values' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4677,39): error TS2339: Property 'length' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4681,10): error TS2339: Property '_values' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4685,10): error TS2339: Property '_values' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4685,23): error TS2339: Property '_totalResolved' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4689,17): error TS2339: Property 'length' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(4699,10): error TS2551: Property '_reject' does not exist on type 'SomePromiseArray'. Did you mean '_rejected'?
-node_modules/bluebird/js/browser/bluebird.js(4707,23): error TS2339: Property 'promise' does not exist on type 'SomePromiseArray'.
-node_modules/bluebird/js/browser/bluebird.js(5090,20): error TS2339: Property 'doDispose' does not exist on type 'Disposer'.
-node_modules/bluebird/js/browser/bluebird.js(5109,23): error TS2339: Property 'data' does not exist on type 'FunctionDisposer'.
-node_modules/bluebird/js/browser/bluebird.js(5441,5): error TS7027: Unreachable code detected.
-node_modules/bluebird/js/browser/bluebird.js(5603,25): error TS2304: Cannot find name 'chrome'.
-node_modules/bluebird/js/browser/bluebird.js(5603,51): error TS2304: Cannot find name 'chrome'.
-node_modules/bluebird/js/browser/bluebird.js(5604,25): error TS2304: Cannot find name 'chrome'.
-node_modules/bluebird/js/browser/bluebird.js(5623,118): error TS2339: Property 'P' does not exist on type 'Window'.
-node_modules/bluebird/js/browser/bluebird.js(5623,129): error TS2339: Property 'Promise' does not exist on type 'Window'.
-node_modules/bluebird/js/browser/bluebird.js(5623,282): error TS2339: Property 'P' does not exist on type 'Window'.
-node_modules/bluebird/js/browser/bluebird.js(5623,291): error TS2339: Property 'Promise' does not exist on type 'Window'.
 node_modules/bluebird/js/release/assert.js(11,30): error TS2339: Property 'constructor$' does not exist on type 'Error'.
 node_modules/bluebird/js/release/async.js(92,21): error TS2300: Duplicate identifier 'invokeLater'.
 node_modules/bluebird/js/release/async.js(93,21): error TS2300: Duplicate identifier 'invoke'.
diff --git a/tests/baselines/reference/user/chrome-devtools-frontend.log b/tests/baselines/reference/user/chrome-devtools-frontend.log
index e3157063e94..21c7841f0e9 100644
--- a/tests/baselines/reference/user/chrome-devtools-frontend.log
+++ b/tests/baselines/reference/user/chrome-devtools-frontend.log
@@ -194,14 +194,11 @@ node_modules/chrome-devtools-frontend/front_end/accessibility/AccessibilityModel
 node_modules/chrome-devtools-frontend/front_end/accessibility/AccessibilityModel.js(213,14): error TS2551: Property '_domNode' does not exist on type 'AccessibilityNode'. Did you mean 'isDOMNode'?
 node_modules/chrome-devtools-frontend/front_end/accessibility/AccessibilityModel.js(214,29): error TS2551: Property '_domNode' does not exist on type 'AccessibilityNode'. Did you mean 'isDOMNode'?
 node_modules/chrome-devtools-frontend/front_end/accessibility/AccessibilityModel.js(232,26): error TS2339: Property 'accessibilityAgent' does not exist on type 'Target'.
-node_modules/chrome-devtools-frontend/front_end/accessibility/AccessibilityModel.js(245,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
-node_modules/chrome-devtools-frontend/front_end/accessibility/AccessibilityModel.js(255,24): error TS2569: Type 'IterableIterator<AccessibilityNode>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/accessibility/AccessibilityModel.js(303,26): error TS2339: Property 'printSelfAndChildren' does not exist on type 'DOMNode'.
 node_modules/chrome-devtools-frontend/front_end/accessibility/AccessibilityNodeView.js(9,11): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/accessibility/AccessibilityNodeView.js(13,40): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/accessibility/AccessibilityNodeView.js(14,41): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/accessibility/AccessibilityNodeView.js(56,28): error TS2694: Namespace 'Protocol' has no exported member 'Accessibility'.
-node_modules/chrome-devtools-frontend/front_end/accessibility/AccessibilityNodeView.js(58,16): error TS1251: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Class definitions are automatically in strict mode.
 node_modules/chrome-devtools-frontend/front_end/accessibility/AccessibilityNodeView.js(62,61): error TS2694: Namespace 'Protocol' has no exported member 'Accessibility'.
 node_modules/chrome-devtools-frontend/front_end/accessibility/AccessibilityNodeView.js(78,26): error TS2694: Namespace 'Protocol' has no exported member 'Accessibility'.
 node_modules/chrome-devtools-frontend/front_end/accessibility/AccessibilityNodeView.js(88,45): error TS2694: Namespace 'Protocol' has no exported member 'Accessibility'.
@@ -287,7 +284,6 @@ node_modules/chrome-devtools-frontend/front_end/animation/AnimationModel.js(49,2
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationModel.js(54,24): error TS2694: Namespace 'Protocol' has no exported member 'Animation'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationModel.js(61,31): error TS2339: Property 'AnimationModel' does not exist on type '{ new (effect?: AnimationEffectReadOnly, timeline?: AnimationTimeline): Animation; prototype: Ani...'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationModel.js(65,31): error TS2339: Property 'remove' does not exist on type 'string[]'.
-node_modules/chrome-devtools-frontend/front_end/animation/AnimationModel.js(91,23): error TS2569: Type 'IterableIterator<AnimationGroup>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationModel.js(104,45): error TS2339: Property 'AnimationModel' does not exist on type '{ new (effect?: AnimationEffectReadOnly, timeline?: AnimationTimeline): Animation; prototype: Ani...'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationModel.js(123,26): error TS2339: Property 'AnimationModel' does not exist on type '{ new (effect?: AnimationEffectReadOnly, timeline?: AnimationTimeline): Animation; prototype: Ani...'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationModel.js(168,33): error TS2339: Property 'AnimationModel' does not exist on type '{ new (effect?: AnimationEffectReadOnly, timeline?: AnimationTimeline): Animation; prototype: Ani...'.
@@ -359,7 +355,6 @@ node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(8
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(81,47): error TS2339: Property 'AnimationModel' does not exist on type '{ new (effect?: AnimationEffectReadOnly, timeline?: AnimationTimeline): Animation; prototype: Ani...'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(89,19): error TS2339: Property 'AnimationModel' does not exist on type '{ new (effect?: AnimationEffectReadOnly, timeline?: AnimationTimeline): Animation; prototype: Ani...'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(90,50): error TS2339: Property 'AnimationModel' does not exist on type '{ new (effect?: AnimationEffectReadOnly, timeline?: AnimationTimeline): Animation; prototype: Ani...'.
-node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(94,24): error TS2569: Type 'IterableIterator<NodeUI>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(103,57): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(105,28): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(110,48): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -540,7 +535,6 @@ node_modules/chrome-devtools-frontend/front_end/application_test_runner/Resource
 node_modules/chrome-devtools-frontend/front_end/application_test_runner/ResourcesTestRunner.js(18,20): error TS2339: Property 'mainTarget' does not exist on type 'typeof TestRunner'.
 node_modules/chrome-devtools-frontend/front_end/application_test_runner/ResourcesTestRunner.js(30,19): error TS2339: Property 'resourceTreeModel' does not exist on type 'typeof TestRunner'.
 node_modules/chrome-devtools-frontend/front_end/application_test_runner/ResourcesTestRunner.js(31,16): error TS2339: Property 'resourceTreeModel' does not exist on type 'typeof TestRunner'.
-node_modules/chrome-devtools-frontend/front_end/application_test_runner/ResourcesTestRunner.js(40,21): error TS2569: Type 'Set<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/application_test_runner/ResourcesTestRunner.js(48,18): error TS2339: Property 'resourceTreeModel' does not exist on type 'typeof TestRunner'.
 node_modules/chrome-devtools-frontend/front_end/application_test_runner/ResourcesTestRunner.js(56,16): error TS2339: Property 'resourceTreeModel' does not exist on type 'typeof TestRunner'.
 node_modules/chrome-devtools-frontend/front_end/application_test_runner/ResourcesTestRunner.js(76,8): error TS2551: Property 'panels' does not exist on type 'typeof UI'. Did you mean 'Panel'?
@@ -576,7 +570,6 @@ node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(45,63):
         Types of parameters 'serviceWorkerManager' and 'model' are incompatible.
           Type 'T' is not assignable to type 'ServiceWorkerManager'.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(94,50): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
-node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(96,30): error TS2569: Type 'IterableIterator<ServiceWorkerRegistration>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(126,14): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(135,14): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(147,42): error TS2555: Expected at least 2 arguments, but got 1.
@@ -605,7 +598,7 @@ node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(363,24):
   Type 'TemplateStringsArray' is not assignable to type 'string[]'.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(363,55): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(365,46): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(379,15): error TS1055: Type 'Promise<undefined>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
+node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(379,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(384,31): error TS2339: Property 'singleton' does not exist on type 'Window'.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(390,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ [x: string]: any; WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; T...'.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(399,15): error TS2503: Cannot find namespace 'ReportRenderer'.
@@ -789,7 +782,7 @@ node_modules/chrome-devtools-frontend/front_end/audits2_test_runner/Audits2TestR
 node_modules/chrome-devtools-frontend/front_end/audits2_test_runner/Audits2TestRunner.js(76,33): error TS2339: Property 'textElement' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/audits2_test_runner/Audits2TestRunner.js(77,40): error TS2339: Property 'checkboxElement' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/audits2_test_runner/Audits2TestRunner.js(89,29): error TS2339: Property 'disabled' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/audits2_test_runner/Audits2TestRunner.js(102,24): error TS2461: Type 'NodeListOf<Element>' is not an array type.
+node_modules/chrome-devtools-frontend/front_end/audits2_test_runner/Audits2TestRunner.js(102,24): error TS2488: Type 'NodeListOf<Element>' must have a '[Symbol.iterator]()' method that returns an iterator.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker.js(5,11): error TS2339: Property 'Runtime' does not exist on type 'Window'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker.js(6,8): error TS2339: Property 'importScripts' does not exist on type 'Window'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/Audits2Service.js(33,31): error TS1003: Identifier expected.
@@ -808,181 +801,24 @@ node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighth
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(2,121): error TS2554: Expected 1 arguments, but got 2.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(2,141): error TS2554: Expected 1 arguments, but got 2.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(2,203): error TS2339: Property 'code' does not exist on type 'Error'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(21,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(55,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(89,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(123,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(159,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(193,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(227,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(261,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(295,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(331,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(366,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(401,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(435,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(471,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(505,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(539,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(573,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(606,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(642,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(677,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(711,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(745,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(780,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(817,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(852,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(887,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(923,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(953,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(983,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(1013,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(1043,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(1073,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(1103,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(1134,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(1164,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(1194,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(1224,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(1259,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(1295,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(1329,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(1364,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(1401,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(1438,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(1472,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(1507,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(1541,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(1663,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(1801,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(1903,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(2066,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(2153,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(2335,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(2371,16): error TS2569: Type 'Uint8Array' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(2420,26): error TS2569: Type 'IterableIterator<[any, any]>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(2468,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(2712,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(2810,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(2902,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(3017,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(3096,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(3181,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(3380,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(3434,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(3576,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(3650,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(3706,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(3713,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(3807,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(3897,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(3962,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(4072,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(4128,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(4145,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(4228,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(4244,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(4251,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(4401,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(4450,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(4501,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(4561,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(4610,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(4694,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(4750,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(4832,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(4914,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(4976,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(5096,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(5200,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(5290,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(5432,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(5494,9): error TS2339: Property 'stableSort' does not exist on type '{ category: any; group: any; duration: any; }[]'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(5526,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(5588,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(5618,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(5648,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(5704,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(5878,16): error TS2554: Expected 0-1 arguments, but got 2.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(5879,17): error TS2554: Expected 0-1 arguments, but got 2.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(5950,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(5991,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(6082,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(6254,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(6400,21): error TS2339: Property 'valuesArray' does not exist on type 'Map<any, any>'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(6538,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(6711,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(6784,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(6885,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(6964,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(7034,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(7063,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(7088,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(7193,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(7290,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(7344,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(7457,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(7533,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(7599,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(7669,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(7746,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(7825,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(7907,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(7993,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(8042,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(8097,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(8112,74): error TS2339: Property 'name' does not exist on type 'ComputedArtifact'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(8232,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(8382,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(8450,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(8623,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(8675,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(8679,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(8683,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(8787,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(8813,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(8898,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(8902,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(9093,1): error TS2554: Expected 0-2 arguments, but got 3.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(9117,1): error TS2554: Expected 0-2 arguments, but got 3.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(9196,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(9227,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(9272,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(9329,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(9467,15): error TS2339: Property 'axe' does not exist on type 'Window'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(9708,34): error TS2345: Argument of type 'any[][]' is not assignable to parameter of type 'Iterable<[any, any]>'.
-  Types of property '[Symbol.iterator]' are incompatible.
-    Type '() => IterableIterator<any[]>' is not assignable to type '() => Iterator<[any, any]>'.
-      Type 'IterableIterator<any[]>' is not assignable to type 'Iterator<[any, any]>'.
-        Types of property 'next' are incompatible.
-          Type '{ (value?: any): IteratorResult<any[]>; (value?: any): IteratorResult<any[]>; }' is not assignable to type '{ (value?: any): IteratorResult<[any, any]>; (value?: any): IteratorResult<[any, any]>; }'.
-            Type 'IteratorResult<any[]>' is not assignable to type 'IteratorResult<[any, any]>'.
-              Type 'any[]' is not assignable to type '[any, any]'.
-                Property '0' is missing in type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(9948,10): error TS2693: 'ShadowRoot' only refers to a type, but is being used as a value here.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(9969,4): error TS2693: 'ShadowRoot' only refers to a type, but is being used as a value here.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(10092,16): error TS2304: Cannot find name 'd41d8cd98f00b204e9800998ecf8427e_LibraryDetectorTests'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(10513,19): error TS2461: Type 'NodeListOf<Element>' is not an array type.
+node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(10513,19): error TS2488: Type 'NodeListOf<Element>' must have a '[Symbol.iterator]()' method that returns an iterator.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(10811,19): error TS2304: Cannot find name 'getElementsInDocument'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(11931,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(11938,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(11948,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(12197,22): error TS2554: Expected 0 arguments, but got 2.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(12286,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(12327,24): error TS2554: Expected 0 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(12810,22): error TS2569: Type 'Set<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(12980,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(12985,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(12990,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(12995,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(13000,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(13005,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(13607,7): error TS2339: Property 'protocolMethod' does not exist on type 'Error'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(13608,7): error TS2339: Property 'protocolError' does not exist on type 'Error'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(13744,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(13802,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(13841,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(14352,1): error TS2722: Cannot invoke an object which is possibly 'undefined'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(14860,28): error TS2339: Property '__nativeError' does not exist on type 'Window'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(14940,8): error TS2339: Property '____lastLongTask' does not exist on type 'Window'.
@@ -992,7 +828,6 @@ node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighth
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(14957,8): error TS2339: Property '____lhPerformanceObserver' does not exist on type 'Window'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(14975,21): error TS2339: Property '____lastLongTask' does not exist on type 'Window'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(15145,7): error TS2339: Property 'code' does not exist on type 'Error'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(15516,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(15626,5): error TS2304: Cannot find name 'fs'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(15629,17): error TS2304: Cannot find name 'fs'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(15630,28): error TS2304: Cannot find name 'fs'.
@@ -1008,7 +843,6 @@ node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighth
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(15810,1): error TS2304: Cannot find name 'fs'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(15814,1): error TS2304: Cannot find name 'fs'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(15818,1): error TS2304: Cannot find name 'fs'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(15842,20): error TS2569: Type 'IterableIterator<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(15873,16): error TS2339: Property '_logs' does not exist on type 'typeof ConsoleQuieter'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(15873,37): error TS2339: Property '_logs' does not exist on type 'typeof ConsoleQuieter'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(15876,16): error TS2339: Property '_logs' does not exist on type 'typeof ConsoleQuieter'.
@@ -1016,32 +850,13 @@ node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighth
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(15882,16): error TS2339: Property '_logs' does not exist on type 'typeof ConsoleQuieter'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(15891,16): error TS2339: Property '_logs' does not exist on type 'typeof ConsoleQuieter'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(15894,16): error TS2339: Property '_logs' does not exist on type 'typeof ConsoleQuieter'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(15930,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(15937,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(15944,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(15951,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(15958,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(16016,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(16023,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(16030,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(16037,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(16044,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(16100,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(16107,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(16114,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(16121,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(16213,5): error TS2554: Expected 0 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(16219,5): error TS2554: Expected 0 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(16432,35): error TS2569: Type 'IterableIterator<[any, any]>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(16581,25): error TS2569: Type 'Set<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(16733,11): error TS2339: Property 'NodeTimingData' does not exist on type 'typeof Simulator'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(17089,26): error TS2339: Property '__proto__' does not exist on type 'Window'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(17089,45): error TS2339: Property '__proto__' does not exist on type 'Document'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(17501,1): error TS2322: Type 'any[]' is not assignable to type 'string'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(17725,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(18010,1): error TS2554: Expected 0 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(18341,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(19246,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(19499,6): error TS2339: Property 'Util' does not exist on type 'Window'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(19585,1): error TS2322: Type 'Promise<{ [x: string]: any; artifacts: any; auditResults: any[]; }>' is not assignable to type 'Promise<void>'.
   Type '{ [x: string]: any; artifacts: any; auditResults: any[]; }' is not assignable to type 'void'.
@@ -1260,22 +1075,6 @@ node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighth
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(30800,1): error TS2323: Cannot redeclare exported variable 'isPrimitive'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(30802,1): error TS2323: Cannot redeclare exported variable 'isBuffer'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(30828,1): error TS2323: Cannot redeclare exported variable 'log'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(31010,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(31014,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(31018,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(31022,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(31026,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(31030,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(31034,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(31038,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(31042,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(31046,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(31050,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(31054,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(31058,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(31062,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(31066,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(31070,12): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(31089,1): error TS2323: Cannot redeclare exported variable 'log'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(31094,37): error TS2304: Cannot find name 'chrome'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(31095,21): error TS2304: Cannot find name 'chrome'.
@@ -1456,7 +1255,6 @@ node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighth
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(41572,1): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(41583,1): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(41644,1): error TS2304: Cannot find name 'WebInspector'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(41645,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(41735,1): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(41760,1): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(41768,18): error TS2339: Property 'asParsedURL' does not exist on type 'String'.
@@ -1526,7 +1324,6 @@ node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighth
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(42262,12): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(42270,1): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(42275,1): error TS2304: Cannot find name 'WebInspector'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(42319,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(42329,12): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(42337,12): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(42346,12): error TS2304: Cannot find name 'WebInspector'.
@@ -1655,9 +1452,7 @@ node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighth
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(44340,15): error TS2339: Property 'valuesArray' does not exist on type 'Map<any, any>'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(44348,15): error TS2339: Property 'keysArray' does not exist on type 'Map<any, any>'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(44356,15): error TS2339: Property 'inverse' does not exist on type 'Map<any, any>'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(44359,16): error TS2569: Type 'IterableIterator<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(44361,8): error TS2339: Property 'set' does not exist on type 'Multimap'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(44428,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(44469,8): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(44495,27): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(44595,19): error TS2339: Property 'spread' does not exist on type 'Promise<any>'.
@@ -1753,7 +1548,6 @@ node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighth
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(46776,24): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(46785,25): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(46786,26): error TS2304: Cannot find name 'WebInspector'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(46846,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(46882,1): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(46882,38): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(46891,90): error TS2304: Cannot find name 'WebInspector'.
@@ -1804,7 +1598,6 @@ node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighth
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(47454,27): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(47481,16): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(47531,19): error TS2304: Cannot find name 'WebInspector'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(47544,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(47575,15): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(47623,18): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(47696,1): error TS2304: Cannot find name 'WebInspector'.
@@ -1908,68 +1701,18 @@ node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighth
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48725,1): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48728,1): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48730,1): error TS2304: Cannot find name 'WebInspector'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48747,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48752,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48760,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48765,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48771,21): error TS2304: Cannot find name 'WebInspector'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48781,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48786,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48794,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48802,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48814,31): error TS2304: Cannot find name 'WebInspector'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48860,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48896,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48901,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48909,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48914,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48925,31): error TS2304: Cannot find name 'WebInspector'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48931,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48941,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48951,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48956,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48964,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48988,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(48993,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49001,31): error TS2304: Cannot find name 'WebInspector'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49010,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49015,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49023,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49028,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49087,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49092,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49100,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49105,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49114,31): error TS2304: Cannot find name 'WebInspector'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49121,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49126,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49134,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49189,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49218,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49226,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49234,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49241,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49263,31): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49281,31): error TS2304: Cannot find name 'WebInspector'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49296,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49299,22): error TS2304: Cannot find name 'WebInspector'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49306,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49311,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49333,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49338,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49346,31): error TS2304: Cannot find name 'WebInspector'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49352,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49357,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49361,31): error TS2304: Cannot find name 'WebInspector'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49367,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49394,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49397,23): error TS2304: Cannot find name 'WebInspector'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49404,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49407,21): error TS2304: Cannot find name 'WebInspector'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49435,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49449,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49517,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49533,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49565,25): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49656,14): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49676,8): error TS2304: Cannot find name 'WebInspector'.
@@ -1988,11 +1731,6 @@ node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighth
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49860,11): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49872,1): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49890,1): error TS2304: Cannot find name 'WebInspector'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49894,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49902,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49910,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49918,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49926,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49936,1): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(49943,1): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(50006,1): error TS2304: Cannot find name 'WebInspector'.
@@ -2846,8 +2584,6 @@ node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighth
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(54594,1): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(54605,1): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(54609,1): error TS2304: Cannot find name 'WebInspector'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(54613,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(54618,5): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(54621,31): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(54624,11): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(54637,1): error TS2304: Cannot find name 'WebInspector'.
@@ -3176,18 +2912,15 @@ node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighth
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59352,12): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59353,1): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59354,1): error TS2304: Cannot find name 'WebInspector'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59355,25): error TS2569: Type 'IterableIterator<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59367,17): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59405,92): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59423,22): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59424,19): error TS2304: Cannot find name 'WebInspector'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59442,25): error TS2569: Type 'IterableIterator<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59442,53): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59469,12): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59470,1): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59471,1): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59472,1): error TS2304: Cannot find name 'WebInspector'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59473,25): error TS2569: Type 'IterableIterator<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59538,1): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59540,1): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59543,22): error TS2304: Cannot find name 'WebInspector'.
@@ -3196,7 +2929,6 @@ node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighth
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59552,10): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59560,1): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59562,1): error TS2304: Cannot find name 'WebInspector'.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59563,18): error TS2569: Type 'Map<any, any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59566,1): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59570,1): error TS2304: Cannot find name 'WebInspector'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/lighthouse/lighthouse-background.js(59576,19): error TS2304: Cannot find name 'WebInspector'.
@@ -3524,7 +3256,6 @@ node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(60
         Types of parameters 'debuggerModel' and 'model' are incompatible.
           Type 'T' is not assignable to type 'DebuggerModel'.
 node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(97,52): error TS2339: Property 'get' does not exist on type 'Multimap'.
-node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(114,30): error TS2569: Type 'IterableIterator<Breakpoint>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(120,52): error TS2339: Property 'valuesArray' does not exist on type 'Multimap'.
 node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(123,34): error TS2339: Property 'clear' does not exist on type 'Multimap'.
 node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(153,34): error TS2339: Property 'deleteAll' does not exist on type 'Multimap'.
@@ -3558,8 +3289,6 @@ node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(67
     Types of property 'modelAdded' are incompatible.
       Type '(debuggerModel: DebuggerModel) => void' is not assignable to type '(model: T) => void'.
 node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(713,51): error TS2339: Property 'valuesArray' does not exist on type 'Map<DebuggerModel, ModelBreakpoint>'.
-node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(750,28): error TS2569: Type 'IterableIterator<UILocation>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(788,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(863,24): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
 node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(905,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(1012,37): error TS2339: Property 'length' does not exist on type 'V'.
@@ -3572,7 +3301,6 @@ node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(
           Type 'T' is not assignable to type 'CSSModel'.
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(64,19): error TS2365: Operator '!==' cannot be applied to types '{ [x: string]: any; Regular: string; Inline: string; Attributes: string; }' and 'string'.
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(104,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'rawLocations' must be of type 'CSSLocation[]', but here has type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(105,27): error TS2569: Type 'IterableIterator<ModelInfo>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(106,20): error TS2339: Property 'pushAll' does not exist on type 'CSSLocation[]'.
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(126,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(132,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
@@ -3599,7 +3327,6 @@ node_modules/chrome-devtools-frontend/front_end/bindings/CompilerScriptMapping.j
 node_modules/chrome-devtools-frontend/front_end/bindings/CompilerScriptMapping.js(218,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ContentProviderBasedProject.js(39,25): error TS2694: Namespace 'Workspace' has no exported member 'projectTypes'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ContentProviderBasedProject.js(180,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/bindings/ContentProviderBasedProject.js(233,15): error TS1055: Type 'Promise<string[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBinding.js(26,52): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ [x: string]: any; modelAdded(model: T): void; modelRemoved(model: T): void; }'.
   Type 'DebuggerWorkspaceBinding' is not assignable to type '{ [x: string]: any; modelAdded(model: T): void; modelRemoved(model: T): void; }'.
     Types of property 'modelAdded' are incompatible.
@@ -3610,8 +3337,6 @@ node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBindin
 node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBinding.js(85,5): error TS2322: Type 'StackTraceTopFrameLocation' is not assignable to type '{ [x: string]: any; update(): void; uiLocation(): UILocation; dispose(): void; isBlackboxed(): bo...'.
 node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBinding.js(85,5): error TS2322: Type 'StackTraceTopFrameLocation' is not assignable to type '{ [x: string]: any; update(): void; uiLocation(): UILocation; dispose(): void; isBlackboxed(): bo...'.
   Property '_updateScheduled' does not exist on type '{ [x: string]: any; update(): void; uiLocation(): UILocation; dispose(): void; isBlackboxed(): bo...'.
-node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBinding.js(143,27): error TS2569: Type 'IterableIterator<ModelData>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBinding.js(144,11): error TS2403: Subsequent variable declarations must have the same type.  Variable 'rawLocation' must be of type 'Location', but here has type 'any'.
 node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBinding.js(195,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBinding.js(207,34): error TS2339: Property 'valuesArray' does not exist on type 'Set<Location>'.
 node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBinding.js(230,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
@@ -3635,20 +3360,16 @@ node_modules/chrome-devtools-frontend/front_end/bindings/FileUtils.js(130,16): e
 node_modules/chrome-devtools-frontend/front_end/bindings/FileUtils.js(143,22): error TS2339: Property 'readyState' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/bindings/FileUtils.js(146,31): error TS2339: Property 'result' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/bindings/FileUtils.js(178,32): error TS2339: Property 'error' does not exist on type 'EventTarget'.
-node_modules/chrome-devtools-frontend/front_end/bindings/FileUtils.js(190,15): error TS1055: Type 'Promise<boolean>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/bindings/FileUtils.js(194,23): error TS1005: '>' expected.
 node_modules/chrome-devtools-frontend/front_end/bindings/FileUtils.js(227,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/LiveLocation.js(11,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/bindings/LiveLocation.js(18,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/bindings/LiveLocation.js(93,26): error TS2569: Type 'Set<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/bindings/NetworkProject.js(158,14): error TS2551: Property 'networkProjectManager' does not exist on type 'typeof Bindings'. Did you mean 'NetworkProjectManager'?
 node_modules/chrome-devtools-frontend/front_end/bindings/NetworkProject.js(175,14): error TS2551: Property 'networkProjectManager' does not exist on type 'typeof Bindings'. Did you mean 'NetworkProjectManager'?
 node_modules/chrome-devtools-frontend/front_end/bindings/NetworkProject.js(223,37): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ [x: string]: any; Debugger: string; Formatter: string; Network: string; Snippets: string; FileS...'.
 node_modules/chrome-devtools-frontend/front_end/bindings/NetworkProject.js(270,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/NetworkProject.js(286,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/NetworkProject.js(308,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/NetworkProject.js(330,25): error TS2569: Type 'IterableIterator<ContentProviderBasedProject>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/bindings/NetworkProject.js(338,25): error TS2569: Type 'IterableIterator<ContentProviderBasedProject>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/bindings/PresentationConsoleMessageHelper.js(66,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/PresentationConsoleMessageHelper.js(130,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/PresentationConsoleMessageHelper.js(181,19): error TS2365: Operator '===' cannot be applied to types '{ [x: string]: any; Verbose: string; Info: string; Warning: string; Error: string; }' and 'string'.
@@ -3692,7 +3413,6 @@ node_modules/chrome-devtools-frontend/front_end/bindings/SASSSourceMapping.js(43
 node_modules/chrome-devtools-frontend/front_end/bindings/SASSSourceMapping.js(63,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/SASSSourceMapping.js(90,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/SASSSourceMapping.js(108,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/SASSSourceMapping.js(114,27): error TS2569: Type 'IterableIterator<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/bindings/SASSSourceMapping.js(124,52): error TS2345: Argument of type 'T' is not assignable to parameter of type 'CSSStyleSheetHeader'.
 node_modules/chrome-devtools-frontend/front_end/bindings/SASSSourceMapping.js(136,63): error TS2345: Argument of type 'CSSStyleSheetHeader' is not assignable to parameter of type 'T'.
 node_modules/chrome-devtools-frontend/front_end/bindings/SASSSourceMapping.js(161,17): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
@@ -3701,19 +3421,15 @@ node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(
 node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(111,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(129,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(146,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(157,27): error TS2569: Type 'IterableIterator<StyleFile>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(192,26): error TS2339: Property 'addEventListener' does not exist on type 'UISourceCode'.
 node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(194,26): error TS2339: Property 'addEventListener' does not exist on type 'UISourceCode'.
 node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(229,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(239,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(251,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
-node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(280,24): error TS2569: Type 'Set<CSSStyleSheetHeader>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(307,26): error TS2339: Property 'firstValue' does not exist on type 'Set<CSSStyleSheetHeader>'.
 node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(315,26): error TS2339: Property 'firstValue' does not exist on type 'Set<CSSStyleSheetHeader>'.
 node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(323,26): error TS2339: Property 'firstValue' does not exist on type 'Set<CSSStyleSheetHeader>'.
 node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(331,26): error TS2339: Property 'firstValue' does not exist on type 'Set<CSSStyleSheetHeader>'.
 node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(342,26): error TS2339: Property 'firstValue' does not exist on type 'Set<CSSStyleSheetHeader>'.
-node_modules/chrome-devtools-frontend/front_end/bindings/TempFile.js(63,15): error TS1055: Type 'Promise<string>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/bindings/TempFile.js(91,25): error TS2304: Cannot find name 'FileError'.
 node_modules/chrome-devtools-frontend/front_end/bindings/TempFile.js(96,42): error TS2304: Cannot find name 'FileError'.
 node_modules/chrome-devtools-frontend/front_end/bindings/TempFile.js(176,25): error TS2304: Cannot find name 'FileError'.
@@ -3741,7 +3457,6 @@ node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/BindingsTes
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/BindingsTestRunner.js(108,11): error TS2339: Property 'src' does not exist on type 'HTMLElement'.
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/BindingsTestRunner.js(150,14): error TS2339: Property 'cssModel' does not exist on type 'typeof TestRunner'.
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/BindingsTestRunner.js(159,16): error TS2339: Property 'cssModel' does not exist on type 'typeof TestRunner'.
-node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/BindingsTestRunner.js(169,25): error TS2569: Type 'IterableIterator<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/BindingsTestRunner.js(190,27): error TS2339: Property 'debuggerModel' does not exist on type 'typeof TestRunner'.
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/BindingsTestRunner.js(191,32): error TS2339: Property 'debuggerModel' does not exist on type 'typeof TestRunner'.
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/BindingsTestRunner.js(197,27): error TS2339: Property 'cssModel' does not exist on type 'typeof TestRunner'.
@@ -3754,16 +3469,13 @@ node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/IsolatedFil
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/IsolatedFilesystemTestRunner.js(107,8): error TS2339: Property 'isDirectory' does not exist on type 'typeof TestFileSystem'.
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/IsolatedFilesystemTestRunner.js(108,8): error TS2339: Property '_timestamp' does not exist on type 'typeof TestFileSystem'.
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/IsolatedFilesystemTestRunner.js(109,8): error TS2339: Property '_parent' does not exist on type 'typeof TestFileSystem'.
-node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/IsolatedFilesystemTestRunner.js(113,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/IsolatedFilesystemTestRunner.js(263,8): error TS2339: Property '_children' does not exist on type 'typeof TestFileSystem'.
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/IsolatedFilesystemTestRunner.js(275,8): error TS2551: Property '_entry' does not exist on type 'typeof TestFileSystem'. Did you mean 'Entry'?
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/IsolatedFilesystemTestRunner.js(276,8): error TS2339: Property '_modificationTimesDelta' does not exist on type 'typeof TestFileSystem'.
-node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/OverridesTestRunner.js(7,13): error TS1055: Type '{ isolatedFileSystem: IsolatedFileSystem; project: { [x: string]: any; workspace(): Workspace; id...' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
+node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/OverridesTestRunner.js(7,13): error TS1064: The return type of an async function or method must be the global Promise<T> type.
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/OverridesTestRunner.js(23,75): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'V'.
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/PersistenceTestRunner.js(76,79): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ [x: string]: any; Debugger: string; Formatter: string; Network: string; Snippets: string; FileS...'.
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/PersistenceTestRunner.js(77,82): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ [x: string]: any; Debugger: string; Formatter: string; Network: string; Snippets: string; FileS...'.
-node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/PersistenceTestRunner.js(84,25): error TS2569: Type 'Set<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/PersistenceTestRunner.js(106,25): error TS2569: Type 'Set<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(7,51): error TS2694: Namespace 'ChangesView' has no exported member 'Row'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(9,2): error TS1131: Property or signature expected.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(22,42): error TS2694: Namespace 'ChangesHighlighter' has no exported member 'DiffState'.
@@ -4108,7 +3820,6 @@ node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(200,45)
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(217,25): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(221,31): error TS2345: Argument of type 'ToolbarButton' is not assignable to parameter of type '{ [x: string]: any; item(): any & ToolbarItem; } & ToolbarItem'.
   Type 'ToolbarButton' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; }'.
-node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(222,25): error TS2569: Type 'IterableIterator<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(241,27): error TS2339: Property 'focus' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(251,13): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(251,39): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
@@ -4179,7 +3890,6 @@ node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(870,45)
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(881,37): error TS2339: Property 'catchException' does not exist on type 'Promise<any[]>'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(918,37): error TS2339: Property 'keysArray' does not exist on type 'Map<string, number>'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(933,29): error TS2339: Property 'keysArray' does not exist on type 'Map<string, Color>'.
-node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(940,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(1009,39): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(1016,34): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(1038,27): error TS2339: Property 'copyText' does not exist on type 'typeof InspectorFrontendHost'.
@@ -4283,7 +3993,6 @@ node_modules/chrome-devtools-frontend/front_end/common/Object.js(159,15): error
 node_modules/chrome-devtools-frontend/front_end/common/Object.js(165,31): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/common/Object.js(172,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/common/OutputStream.js(13,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/common/OutputStream.js(31,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/common/ParsedURL.js(122,26): error TS2339: Property '_urlRegexInstance' does not exist on type 'typeof ParsedURL'.
 node_modules/chrome-devtools-frontend/front_end/common/ParsedURL.js(123,31): error TS2339: Property '_urlRegexInstance' does not exist on type 'typeof ParsedURL'.
 node_modules/chrome-devtools-frontend/front_end/common/ParsedURL.js(141,22): error TS2339: Property '_urlRegexInstance' does not exist on type 'typeof ParsedURL'.
@@ -4292,7 +4001,6 @@ node_modules/chrome-devtools-frontend/front_end/common/ParsedURL.js(152,25): err
 node_modules/chrome-devtools-frontend/front_end/common/ParsedURL.js(161,25): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/common/ParsedURL.js(211,34): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/common/ParsedURL.js(215,29): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
-node_modules/chrome-devtools-frontend/front_end/common/ParsedURL.js(293,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/common/ParsedURL.js(375,18): error TS2339: Property 'asParsedURL' does not exist on type 'String'.
 node_modules/chrome-devtools-frontend/front_end/common/SegmentedRange.js(48,37): error TS2339: Property 'lowerBound' does not exist on type 'Segment[]'.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(49,10): error TS2339: Property 'runtime' does not exist on type 'Window'.
@@ -4316,7 +4024,6 @@ node_modules/chrome-devtools-frontend/front_end/common/Settings.js(273,31): erro
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(277,41): error TS2345: Argument of type 'string' is not assignable to parameter of type 'symbol'.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(281,31): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(285,44): error TS2345: Argument of type 'string' is not assignable to parameter of type 'symbol'.
-node_modules/chrome-devtools-frontend/front_end/common/Settings.js(288,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(350,49): error TS2345: Argument of type 'string' is not assignable to parameter of type 'symbol'.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(393,27): error TS2345: Argument of type '{ [x: string]: any; pattern: string; }[]' is not assignable to parameter of type 'V'.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(401,3): error TS2416: Property 'get' in type 'RegExpSetting' is not assignable to the same property in base type 'Setting'.
@@ -4364,18 +4071,17 @@ node_modules/chrome-devtools-frontend/front_end/common/Settings.js(615,9): error
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(616,33): error TS2339: Property 'length' does not exist on type 'V'.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(663,61): error TS2345: Argument of type '{ [x: string]: any; }[]' is not assignable to parameter of type 'V'.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(678,74): error TS2345: Argument of type '{ [x: string]: any; 'throughput': number; 'latency': number; }' is not assignable to parameter of type 'V'.
-node_modules/chrome-devtools-frontend/front_end/common/Settings.js(687,25): error TS2495: Type 'V[keyof V]' is not an array type or a string type.
+node_modules/chrome-devtools-frontend/front_end/common/Settings.js(687,25): error TS2488: Type 'V[keyof V]' must have a '[Symbol.iterator]()' method that returns an iterator.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(690,17): error TS2345: Argument of type '{ [x: string]: any; }' is not assignable to parameter of type 'V'.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(717,17): error TS2345: Argument of type '{ title: any; value: { [x: string]: any; download: any; upload: any; latency: any; }; }[]' is not assignable to parameter of type 'V'.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(734,17): error TS2345: Argument of type '{ [x: string]: any; }' is not assignable to parameter of type 'V'.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(741,20): error TS2339: Property 'name' does not exist on type 'V'.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(742,20): error TS2339: Property 'timeline' does not exist on type 'V'.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(751,20): error TS2345: Argument of type '{ [x: string]: any; }' is not assignable to parameter of type 'V'.
-node_modules/chrome-devtools-frontend/front_end/common/Settings.js(773,28): error TS2495: Type 'V' is not an array type or a string type.
+node_modules/chrome-devtools-frontend/front_end/common/Settings.js(773,28): error TS2488: Type 'V' must have a '[Symbol.iterator]()' method that returns an iterator.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(795,20): error TS2339: Property 'product' does not exist on type 'V'.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(825,34): error TS2339: Property 'length' does not exist on type 'V'.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(826,30): error TS2345: Argument of type 'undefined[]' is not assignable to parameter of type 'V'.
-node_modules/chrome-devtools-frontend/front_end/common/StaticContentProvider.js(68,15): error TS1055: Type 'Promise<SearchMatch[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/common/Throttler.js(102,5): error TS2322: Type 'Timer' is not assignable to type 'number'.
 node_modules/chrome-devtools-frontend/front_end/common/Throttler.js(113,34): error TS1003: Identifier expected.
 node_modules/chrome-devtools-frontend/front_end/common/Throttler.js(114,18): error TS2339: Property 'FinishCallback' does not exist on type 'typeof Throttler'.
@@ -4387,8 +4093,6 @@ node_modules/chrome-devtools-frontend/front_end/common/UIString.js(81,54): error
 node_modules/chrome-devtools-frontend/front_end/common/UIString.js(93,6): error TS2339: Property 'ls' does not exist on type 'Window'.
 node_modules/chrome-devtools-frontend/front_end/common/Worker.js(52,30): error TS2339: Property 'data' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/common/Worker.js(82,25): error TS2315: Type 'MessageEvent' is not generic.
-node_modules/chrome-devtools-frontend/front_end/common/Worker.js(84,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/common/Worker.js(91,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(39,45): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(40,46): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(41,38): error TS2555: Expected at least 2 arguments, but got 1.
@@ -4404,7 +4108,6 @@ node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebar
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(157,13): error TS2339: Property '_item' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(177,45): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(180,45): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(221,22): error TS2569: Type 'IterableIterator<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(233,106): error TS1003: Identifier expected.
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(234,38): error TS2300: Duplicate identifier 'Item'.
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(234,38): error TS2339: Property 'Item' does not exist on type 'typeof DOMBreakpointsSidebarPane'.
@@ -4468,9 +4171,7 @@ node_modules/chrome-devtools-frontend/front_end/components/DockController.js(193
 node_modules/chrome-devtools-frontend/front_end/components/DockController.js(193,5): error TS2322: Type 'ToolbarButton' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; } & ToolbarItem'.
   Type 'ToolbarButton' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; }'.
     Property 'item' is missing in type 'ToolbarButton'.
-node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(58,27): error TS2569: Type 'Set<Linkifier>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(62,24): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(73,25): error TS2569: Type 'IterableIterator<Element[]>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(125,94): error TS2339: Property 'remove' does not exist on type 'Map<Target, LiveLocationPool>'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(127,41): error TS2339: Property 'remove' does not exist on type 'Map<Target, Element[]>'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(214,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
@@ -4506,7 +4207,7 @@ node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(565,16):
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(572,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(580,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(587,16): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(594,25): error TS2569: Type 'IterableIterator<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
+node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(601,13): error TS2365: Operator '===' cannot be applied to types 'string' and 'V'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(611,46): error TS2339: Property 'openInNewTab' does not exist on type 'typeof InspectorFrontendHost'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(614,105): error TS2339: Property 'copyText' does not exist on type 'typeof InspectorFrontendHost'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(616,5): error TS2322: Type '({ [x: string]: any; section: string; title: string; handler: any; } | { section: string; title: ...' is not assignable to type '{ title: string; handler: () => any; }[]'.
@@ -4529,7 +4230,6 @@ node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(732,19):
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(739,30): error TS2339: Property 'value' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(748,46): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(769,67): error TS2339: Property 'openInNewTab' does not exist on type 'typeof InspectorFrontendHost'.
-node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(770,23): error TS2569: Type 'IterableIterator<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(779,64): error TS2339: Property 'copyText' does not exist on type 'typeof InspectorFrontendHost'.
 node_modules/chrome-devtools-frontend/front_end/components/Reload.js(7,27): error TS2339: Property 'setIsDocked' does not exist on type 'typeof InspectorFrontendHost'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleContextSelector.js(8,9): error TS2339: Property 'ConsoleContextSelector' does not exist on type '{ new (): Console; prototype: Console; }'.
@@ -4668,7 +4368,6 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(104,31):
   Type 'ToolbarToggle' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(111,31): error TS2345: Argument of type 'ToolbarSettingCheckbox' is not assignable to parameter of type '{ [x: string]: any; item(): any & ToolbarItem; } & ToolbarItem'.
   Type 'ToolbarSettingCheckbox' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; }'.
-    Property 'item' is missing in type 'ToolbarSettingCheckbox'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(112,31): error TS2345: Argument of type 'ToolbarItem' is not assignable to parameter of type '{ [x: string]: any; item(): any & ToolbarItem; } & ToolbarItem'.
   Type 'ToolbarItem' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; }'.
     Property 'item' is missing in type 'ToolbarItem'.
@@ -4676,7 +4375,6 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(114,31):
   Type 'ToolbarText' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(116,31): error TS2345: Argument of type 'ToolbarSettingToggle' is not assignable to parameter of type '{ [x: string]: any; item(): any & ToolbarItem; } & ToolbarItem'.
   Type 'ToolbarSettingToggle' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; }'.
-    Property 'item' is missing in type 'ToolbarSettingToggle'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(119,53): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(120,9): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(123,9): error TS2555: Expected at least 2 arguments, but got 1.
@@ -4881,7 +4579,7 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(80
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(848,32): error TS2339: Property 'ConsoleViewMessage' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(851,19): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(852,19): error TS2339: Property 'style' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(855,29): error TS2495: Type 'HTMLCollection' is not an array type or a string type.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(855,29): error TS2488: Type 'HTMLCollection' must have a '[Symbol.iterator]()' method that returns an iterator.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(873,17): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(877,19): error TS2339: Property 'format' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(884,13): error TS2339: Property 'style' does not exist on type 'Element'.
@@ -4916,7 +4614,6 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(11
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1172,36): error TS2339: Property 'type' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1175,34): error TS2339: Property 'type' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1180,5): error TS2322: Type 'number' is not assignable to type 'string'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1183,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1192,39): error TS2339: Property 'childTextNodes' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1211,38): error TS2339: Property 'deepTextContent' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1314,19): error TS2339: Property 'ConsoleViewMessage' does not exist on type '{ new (): Console; prototype: Console; }'.
@@ -5021,7 +4718,6 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewport.js(294,3
   Property 'item' does not exist on type 'number'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewport.js(325,34): error TS2339: Property 'getComponentSelection' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewport.js(349,32): error TS2339: Property 'lowerBound' does not exist on type 'Int32Array'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewport.js(397,33): error TS2569: Type 'Set<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewport.js(417,45): error TS2339: Property 'getComponentSelection' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewport.js(432,33): error TS2339: Property 'item' does not exist on type 'number | { item: number; node: Node; offset: number; }'.
   Property 'item' does not exist on type 'number'.
@@ -5136,7 +4832,6 @@ node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestR
 node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(510,29): error TS2339: Property 'ConsoleView' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(524,51): error TS2339: Property 'traverseNextTextNode' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(528,25): error TS2339: Property 'traverseNextTextNode' does not exist on type 'Node'.
-node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(557,22): error TS2522: The 'arguments' object cannot be referenced in an async function or method in ES3 and ES5. Consider using a standard function or method.
 node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(563,30): error TS2339: Property 'ConsoleView' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(39,36): error TS1138: Parameter declaration expected.
 node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(39,36): error TS8024: JSDoc '@param' tag has name 'function', but there is no parameter with that name.
@@ -5181,9 +4876,7 @@ node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(489
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(7,2): error TS1131: Property or signature expected.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(13,10): error TS2339: Property 'RawLocation' does not exist on type 'typeof Coverage'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(50,68): error TS2339: Property 'get' does not exist on type 'Multimap'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(59,15): error TS1055: Type 'Promise<boolean[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(115,45): error TS2339: Property 'set' does not exist on type 'Multimap'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(124,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(135,32): error TS2694: Namespace 'Coverage' has no exported member 'RawLocation'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(169,16): error TS2403: Subsequent variable declarations must have the same type.  Variable 'location' must be of type 'Location', but here has type 'CSSLocation'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(170,31): error TS2339: Property 'header' does not exist on type 'Location'.
@@ -5214,7 +4907,8 @@ node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(43,
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(45,41): error TS2339: Property 'asWidget' does not exist on type 'SortableDataGrid'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(55,35): error TS2339: Property 'rootNode' does not exist on type 'SortableDataGrid'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(76,20): error TS2339: Property 'rootNode' does not exist on type 'SortableDataGrid'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(85,22): error TS2569: Type 'IterableIterator<GridNode>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(87,30): error TS2339: Property 'parent' does not exist on type 'GridNode'.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(94,14): error TS2339: Property 'remove' does not exist on type 'GridNode'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(96,24): error TS2339: Property 'rootNode' does not exist on type 'SortableDataGrid'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(112,11): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(117,31): error TS2339: Property 'selectedNode' does not exist on type 'SortableDataGrid'.
@@ -5248,22 +4942,21 @@ node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(8,57):
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(9,10): error TS2339: Property 'CoverageSegment' does not exist on type 'typeof Coverage'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(14,10): error TS2339: Property 'CoverageType' does not exist on type 'typeof Coverage'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(34,42): error TS2694: Namespace 'Protocol' has no exported member 'Profiler'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(73,15): error TS1055: Type 'Promise<CoverageInfo[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(99,23): error TS2569: Type 'IterableIterator<CoverageInfo>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(100,37): error TS2339: Property 'CoverageType' does not exist on type 'typeof Coverage'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(103,46): error TS2345: Argument of type 'CSSStyleSheetHeader' is not assignable to parameter of type '{ [x: string]: any; contentURL(): string; contentType(): ResourceType; contentEncoded(): Promise<...'.
   Property '_cssModel' does not exist on type '{ [x: string]: any; contentURL(): string; contentType(): ResourceType; contentEncoded(): Promise<...'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(116,15): error TS1055: Type 'Promise<CoverageInfo[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(131,31): error TS2694: Namespace 'Protocol' has no exported member 'Profiler'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(141,27): error TS2339: Property 'CoverageType' does not exist on type 'typeof Coverage'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(148,28): error TS2339: Property 'CoverageType' does not exist on type 'typeof Coverage'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(160,15): error TS1055: Type 'Promise<CoverageInfo[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(170,31): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(175,64): error TS2694: Namespace 'Coverage' has no exported member 'RangeUseCount'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(188,23): error TS2569: Type 'Map<CSSStyleSheetHeader, any[]>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(190,48): error TS2694: Namespace 'Coverage' has no exported member 'RangeUseCount'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(191,11): error TS2403: Subsequent variable declarations must have the same type.  Variable 'entry' must be of type 'any', but here has type 'CoverageInfo'.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(191,11): error TS2403: Subsequent variable declarations must have the same type.  Variable 'entry' must be of type '[CSSStyleSheetHeader, any[]]', but here has type 'CoverageInfo'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(193,28): error TS2339: Property 'CoverageType' does not exist on type 'typeof Coverage'.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(197,5): error TS2322: Type '[CSSStyleSheetHeader, any[]][]' is not assignable to type 'CoverageInfo[]'.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(197,5): error TS2322: Type '[CSSStyleSheetHeader, any[]][]' is not assignable to type 'CoverageInfo[]'.
+  Type '[CSSStyleSheetHeader, any[]]' is not assignable to type 'CoverageInfo'.
+    Property '_contentProvider' is missing in type '[CSSStyleSheetHeader, any[]]'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(201,31): error TS2694: Namespace 'Coverage' has no exported member 'RangeUseCount'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(202,32): error TS2694: Namespace 'Coverage' has no exported member 'CoverageSegment'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(210,23): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
@@ -5294,7 +4987,6 @@ node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(34,31):
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(40,45): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(43,31): error TS2345: Argument of type 'ToolbarInput' is not assignable to parameter of type '{ [x: string]: any; item(): any & ToolbarItem; } & ToolbarItem'.
   Type 'ToolbarInput' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; }'.
-    Property 'item' is missing in type 'ToolbarInput'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(49,42): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(50,9): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(51,31): error TS2345: Argument of type 'ToolbarSettingCheckbox' is not assignable to parameter of type '{ [x: string]: any; item(): any & ToolbarItem; } & ToolbarItem'.
@@ -5309,7 +5001,6 @@ node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(231,59)
 node_modules/chrome-devtools-frontend/front_end/coverage_test_runner/CoverageTestRunner.js(12,27): error TS2339: Property 'runtime' does not exist on type 'Window'.
 node_modules/chrome-devtools-frontend/front_end/coverage_test_runner/CoverageTestRunner.js(20,27): error TS2339: Property 'runtime' does not exist on type 'Window'.
 node_modules/chrome-devtools-frontend/front_end/coverage_test_runner/CoverageTestRunner.js(28,27): error TS2339: Property 'runtime' does not exist on type 'Window'.
-node_modules/chrome-devtools-frontend/front_end/coverage_test_runner/CoverageTestRunner.js(33,13): error TS1055: Type 'Promise<SourceFrame>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/coverage_test_runner/CoverageTestRunner.js(37,76): error TS2339: Property 'LineDecorator' does not exist on type 'typeof CoverageView'.
 node_modules/chrome-devtools-frontend/front_end/coverage_test_runner/CoverageTestRunner.js(52,31): error TS2339: Property 'runtime' does not exist on type 'Window'.
 node_modules/chrome-devtools-frontend/front_end/coverage_test_runner/CoverageTestRunner.js(87,31): error TS2339: Property 'runtime' does not exist on type 'Window'.
@@ -5400,7 +5091,6 @@ node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(701,35): e
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(711,35): error TS2339: Property 'rows' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(750,41): error TS2345: Argument of type 'NODE_TYPE' is not assignable to parameter of type 'DataGridNode'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(752,16): error TS2339: Property 'refresh' does not exist on type 'NODE_TYPE'.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(755,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(766,22): error TS2339: Property 'remove' does not exist on type 'Element | { __index: number; __position: number; }'.
   Property 'remove' does not exist on type '{ __index: number; __position: number; }'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(772,60): error TS2339: Property 'rows' does not exist on type 'Element'.
@@ -5501,24 +5191,12 @@ node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1324,19):
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1334,14): error TS2551: Property 'dirty' does not exist on type 'DataGridNode'. Did you mean '_dirty'?
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1336,14): error TS2551: Property 'inactive' does not exist on type 'DataGridNode'. Did you mean '_inactive'?
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1360,13): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1370,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1377,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1385,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1390,48): error TS2339: Property '_isRoot' does not exist on type 'NODE_TYPE'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1391,28): error TS2339: Property 'expanded' does not exist on type 'NODE_TYPE'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1396,41): error TS2339: Property 'parent' does not exist on type 'NODE_TYPE'.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1406,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1416,24): error TS2339: Property 'revealed' does not exist on type 'NODE_TYPE'.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1490,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1493,37): error TS2339: Property '_isRoot' does not exist on type 'NODE_TYPE'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1494,33): error TS2339: Property 'depth' does not exist on type 'NODE_TYPE'.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1503,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1510,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1517,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1526,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1533,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1543,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1550,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1592,14): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1638,28): error TS2339: Property 'nextSibling' does not exist on type 'NODE_TYPE'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1640,24): error TS2339: Property 'previousSibling' does not exist on type 'NODE_TYPE'.
@@ -5711,7 +5389,6 @@ node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(64,32): e
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(87,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(91,33): error TS2694: Namespace 'Adb' has no exported member 'Device'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(96,27): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(104,26): error TS2569: Type 'IterableIterator<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(107,28): error TS2339: Property 'remove' does not exist on type 'Map<string, Element>'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(108,24): error TS2339: Property 'remove' does not exist on type 'Map<string, DeviceView>'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(127,16): error TS2339: Property '_title' does not exist on type 'Element'.
@@ -5726,8 +5403,6 @@ node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(153,22):
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(156,34): error TS2694: Namespace 'Adb' has no exported member 'Config'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(161,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(164,34): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingStatus'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(170,14): error TS2403: Subsequent variable declarations must have the same type.  Variable 'deviceId' must be of type 'string', but here has type 'any'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(170,26): error TS2569: Type 'IterableIterator<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(179,9): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(180,38): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(191,29): error TS2339: Property 'setDevicesUpdatesEnabled' does not exist on type 'typeof InspectorFrontendHost'.
@@ -5808,7 +5483,6 @@ node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(625,42):
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(627,50): error TS2694: Namespace 'DevicesView' has no exported member 'BrowserSection'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(632,21): error TS2694: Namespace 'Adb' has no exported member 'Device'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(637,19): error TS2694: Namespace 'Adb' has no exported member 'Device'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(654,27): error TS2569: Type 'IterableIterator<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(657,27): error TS2339: Property 'remove' does not exist on type 'Map<string, any>'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(675,36): error TS2694: Namespace 'DevicesView' has no exported member 'BrowserSection'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(679,26): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -6086,9 +5760,7 @@ node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(10
 node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(133,24): error TS2339: Property 'keysArray' does not exist on type 'Map<string, boolean>'.
 node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(134,22): error TS2339: Property 'caseInsensetiveComparator' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(152,32): error TS2339: Property 'checked' does not exist on type 'EventTarget'.
-node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(194,27): error TS2569: Type 'IterableIterator<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(203,36): error TS2339: Property 'valuesArray' does not exist on type 'Set<any>'.
-node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(215,22): error TS2569: Type 'IterableIterator<DOMNode>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(241,41): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(257,5): error TS2322: Type 'ToolbarToggle' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; } & ToolbarItem'.
   Type 'ToolbarToggle' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; }'.
@@ -6255,8 +5927,6 @@ node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(912,15
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsSidebarPane.js(66,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(44,50): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(111,66): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(197,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(201,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(239,29): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(246,48): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(247,33): error TS2555: Expected at least 2 arguments, but got 1.
@@ -6337,7 +6007,6 @@ node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(1169,30): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(1170,31): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(1172,28): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(1191,27): error TS2569: Type 'Set<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(1246,15): error TS2339: Property 'setTextContentTruncatedIfNeeded' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(1251,41): error TS2339: Property 'createChild' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(1313,20): error TS2339: Property 'createTextChild' does not exist on type 'DocumentFragment'.
@@ -6385,16 +6054,11 @@ node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(254,11): error TS2339: Property 'handled' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(270,26): error TS2694: Namespace 'Protocol' has no exported member 'Error'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(271,26): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(301,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(305,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(316,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(460,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(495,29): error TS2339: Property 'totalOffsetLeft' does not exist on type 'HTMLElement'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(515,19): error TS2694: Namespace 'UI' has no exported member 'PopoverRequest'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(520,19): error TS2339: Property 'parentElementOrShadowHost' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(525,17): error TS2339: Property 'boxInWindow' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(527,29): error TS2339: Property 'enclosingNodeOrSelfWithNodeName' does not exist on type 'EventTarget'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(541,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(594,19): error TS2339: Property 'hovered' does not exist on type 'TreeElement'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(608,30): error TS2345: Argument of type '{ mode: string; showInfo: boolean; }' is not assignable to parameter of type '{ mode: string; showInfo: boolean; selectors: string; }'.
   Property 'selectors' is missing in type '{ mode: string; showInfo: boolean; }'.
@@ -6414,7 +6078,6 @@ node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1084,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1106,44): error TS2339: Property 'keysArray' does not exist on type 'Map<DOMNode, UpdateRecord>'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1110,89): error TS2339: Property 'scrollTop' does not exist on type 'Node'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1119,24): error TS2569: Type 'IterableIterator<DOMNode>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1130,37): error TS2339: Property 'scrollTop' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1258,12): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1261,28): error TS2339: Property 'expandAllButton' does not exist on type 'TreeElement'.
@@ -6438,8 +6101,6 @@ node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1621,26): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1622,10): error TS2339: Property 'classList' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1623,24): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1631,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1638,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/elements/EventListenersWidget.js(46,50): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/elements/EventListenersWidget.js(51,46): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/elements/EventListenersWidget.js(55,40): error TS2555: Expected at least 2 arguments, but got 1.
@@ -6682,14 +6343,11 @@ node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(18
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1809,20): error TS2339: Property 'focus' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1833,57): error TS2339: Property 'media' does not exist on type 'CSSRule'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1843,75): error TS2339: Property 'peekLast' does not exist on type 'string[]'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1857,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1866,49): error TS2694: Namespace 'StylePropertyTreeElement' has no exported member 'Context'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1963,35): error TS2339: Property 'key' does not exist on type 'CSSRule'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1984,25): error TS2339: Property 'key' does not exist on type 'CSSRule'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1987,17): error TS2339: Property 'setKeyText' does not exist on type 'CSSRule'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2018,64): error TS2339: Property 'key' does not exist on type 'CSSRule'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2090,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2094,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2109,7): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2109,46): error TS2339: Property '_updateFilter' does not exist on type 'TreeElement'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2148,30): error TS2694: Namespace 'CSSModel' has no exported member 'ContrastInfo'.
@@ -6902,7 +6560,6 @@ node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(535
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(554,24): error TS2694: Namespace 'Protocol' has no exported member 'Emulation'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(576,40): error TS2339: Property 'Emulation' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(633,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(634,15): error TS1055: Type 'Promise<string>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(661,22): error TS2339: Property 'Emulation' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(662,22): error TS2339: Property 'Emulation' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(664,44): error TS2339: Property 'Emulation' does not exist on type 'typeof Protocol'.
@@ -7049,13 +6706,10 @@ node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(191,
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(192,15): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(280,30): error TS2339: Property 'positionAt' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(283,31): error TS2339: Property 'positionAt' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(376,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(396,14): error TS2339: Property 'width' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(397,14): error TS2339: Property 'height' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(398,24): error TS2339: Property 'getContext' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(411,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(423,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(424,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(443,14): error TS2339: Property 'width' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(444,14): error TS2339: Property 'height' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(445,24): error TS2339: Property 'getContext' does not exist on type 'Element'.
@@ -7072,7 +6726,6 @@ node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeWrapper.js(5
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeWrapper.js(84,26): error TS2339: Property '_wrapperInstance' does not exist on type 'typeof DeviceModeView'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeWrapper.js(98,34): error TS2339: Property '_wrapperInstance' does not exist on type 'typeof DeviceModeView'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeWrapper.js(101,43): error TS2339: Property '_wrapperInstance' does not exist on type 'typeof DeviceModeView'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeWrapper.js(107,26): error TS1251: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Class definitions are automatically in strict mode.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeWrapper.js(120,45): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeWrapper.js(121,38): error TS2339: Property '_wrapperInstance' does not exist on type 'typeof DeviceModeView'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeWrapper.js(128,43): error TS2339: Property '_wrapperInstance' does not exist on type 'typeof DeviceModeView'.
@@ -7098,11 +6751,7 @@ node_modules/chrome-devtools-frontend/front_end/emulation/DevicesSettingsTab.js(
 node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(13,42): error TS2694: Namespace 'EmulatedDevice' has no exported member 'Orientation'.
 node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(15,42): error TS2694: Namespace 'EmulatedDevice' has no exported member 'Orientation'.
 node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(23,50): error TS2694: Namespace 'EmulatedDevice' has no exported member 'Mode'.
-node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(48,16): error TS1251: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Class definitions are automatically in strict mode.
-node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(65,16): error TS1251: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Class definitions are automatically in strict mode.
-node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(76,16): error TS1251: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Class definitions are automatically in strict mode.
 node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(84,45): error TS2694: Namespace 'EmulatedDevice' has no exported member 'Orientation'.
-node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(86,16): error TS1251: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Class definitions are automatically in strict mode.
 node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(106,53): error TS2694: Namespace 'EmulatedDevice' has no exported member 'Orientation'.
 node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(195,49): error TS2694: Namespace 'EmulatedDevice' has no exported member 'Mode'.
 node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(243,40): error TS2694: Namespace 'EmulatedDevice' has no exported member 'Orientation'.
@@ -7261,11 +6910,10 @@ node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUt
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersView.js(6,2): error TS1003: Identifier expected.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersView.js(7,16): error TS2551: Property 'EventListenersResult' does not exist on type 'typeof EventListeners'. Did you mean 'EventListenersView'?
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersView.js(27,37): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersView.js(35,15): error TS1055: Type 'Promise<undefined>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
+node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersView.js(35,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersView.js(51,32): error TS2694: Namespace 'EventListeners' has no exported member 'FrameworkEventListenersObject'.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersView.js(70,32): error TS2694: Namespace 'EventListeners' has no exported member 'FrameworkEventListenersObject'.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersView.js(88,29): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersView.js(102,29): error TS2569: Type 'IArguments' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersView.js(150,46): error TS2339: Property 'eventListener' does not exist on type 'TreeElement'.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersView.js(156,45): error TS2339: Property 'eventListener' does not exist on type 'TreeElement'.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersView.js(158,47): error TS2339: Property 'eventListener' does not exist on type 'TreeElement'.
@@ -7292,7 +6940,6 @@ node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionAPI.js(268,2
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionAPI.js(270,25): error TS2339: Property 'registerHandler' does not exist on type 'ExtensionServerClient'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionAPI.js(274,25): error TS2339: Property 'sendRequest' does not exist on type 'ExtensionServerClient'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionAPI.js(278,23): error TS2339: Property 'sendRequest' does not exist on type 'ExtensionServerClient'.
-node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionAPI.js(281,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionAPI.js(314,12): error TS8022: JSDoc '@extends' is not attached to a class.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionAPI.js(322,55): error TS2339: Property 'nextObjectId' does not exist on type 'ExtensionServerClient'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionAPI.js(327,23): error TS2339: Property 'sendRequest' does not exist on type 'ExtensionServerClient'.
@@ -7314,8 +6961,6 @@ node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionAPI.js(515,2
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionAPI.js(569,23): error TS2339: Property 'sendRequest' does not exist on type 'ExtensionServerClient'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionAPI.js(586,23): error TS2339: Property 'sendRequest' does not exist on type 'ExtensionServerClient'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionAPI.js(597,23): error TS2339: Property 'sendRequest' does not exist on type 'ExtensionServerClient'.
-node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionAPI.js(610,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionAPI.js(614,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionAPI.js(623,23): error TS2339: Property 'sendRequest' does not exist on type 'ExtensionServerClient'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionAPI.js(627,23): error TS2339: Property 'sendRequest' does not exist on type 'ExtensionServerClient'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionAPI.js(662,21): error TS2339: Property 'sendRequest' does not exist on type 'ExtensionServerClient'.
@@ -7836,7 +7481,6 @@ node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapsho
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(187,16): error TS2339: Property 'nodeIndex' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(188,5): error TS2322: Type 'void' is not assignable to type 'HeapSnapshotNode'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(314,5): error TS2322: Type 'void' is not assignable to type 'HeapSnapshotNode'.
-node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(347,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(759,27): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(778,52): error TS2339: Property 'HeapSnapshotProgressEvent' does not exist on type 'typeof HeapSnapshotModel'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(787,52): error TS2339: Property 'HeapSnapshotProgressEvent' does not exist on type 'typeof HeapSnapshotModel'.
@@ -7844,8 +7488,6 @@ node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapsho
   Property 'flatMap' is missing in type 'Uint32Array'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(920,34): error TS2345: Argument of type 'Uint32Array' is not assignable to parameter of type 'number[]'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1045,5): error TS2322: Type 'void' is not assignable to type 'HeapSnapshotNode'.
-node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1051,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1058,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1083,14): error TS2339: Property 'key' does not exist on type '(arg0: HeapSnapshotNode) => boolean'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1086,14): error TS2339: Property 'key' does not exist on type '(arg0: HeapSnapshotNode) => boolean'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1143,31): error TS2339: Property 'key' does not exist on type '(arg0: HeapSnapshotNode) => boolean'.
@@ -8309,11 +7951,17 @@ node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(858
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(861,81): error TS2339: Property 'image' does not exist on type 'WebGLTexture'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(928,26): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(932,39): error TS2345: Argument of type 'any[][]' is not assignable to parameter of type 'Iterable<[any, any]>'.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(1013,23): error TS2569: Type 'IterableIterator<Tile[]>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
+  Types of property '[Symbol.iterator]' are incompatible.
+    Type '() => IterableIterator<any[]>' is not assignable to type '() => Iterator<[any, any]>'.
+      Type 'IterableIterator<any[]>' is not assignable to type 'Iterator<[any, any]>'.
+        Types of property 'next' are incompatible.
+          Type '{ (value?: any): IteratorResult<any[]>; (value?: any): IteratorResult<any[]>; }' is not assignable to type '{ (value?: any): IteratorResult<[any, any]>; (value?: any): IteratorResult<[any, any]>; }'.
+            Type 'IteratorResult<any[]>' is not assignable to type 'IteratorResult<[any, any]>'.
+              Type 'any[]' is not assignable to type '[any, any]'.
+                Property '0' is missing in type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(1080,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(1098,15): error TS2304: Cannot find name 'CSSMatrix'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(1143,19): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(1175,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/PaintProfilerView.js(42,49): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/PaintProfilerView.js(43,48): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/PaintProfilerView.js(44,40): error TS2555: Expected at least 2 arguments, but got 1.
@@ -8375,12 +8023,10 @@ node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(88,32):
 node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(107,24): error TS2694: Namespace 'Protocol' has no exported member 'LayerTree'.
 node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(108,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(151,31): error TS2694: Namespace 'Protocol' has no exported member 'LayerTree'.
-node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(152,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(171,32): error TS2694: Namespace 'Protocol' has no exported member 'LayerTree'.
 node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(221,24): error TS2694: Namespace 'Protocol' has no exported member 'LayerTree'.
 node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(384,25): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(392,33): error TS2694: Namespace 'Protocol' has no exported member 'LayerTree'.
-node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(408,15): error TS1055: Type 'Promise<string[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(437,36): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
 node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(449,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(458,24): error TS2694: Namespace 'Protocol' has no exported member 'LayerTree'.
@@ -8586,7 +8232,6 @@ node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingMana
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(185,54): error TS2339: Property 'CPUThrottlingRates' does not exist on type 'typeof MobileThrottling'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(186,36): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ [x: string]: any; WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; T...'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(188,20): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(191,25): error TS2569: Type 'Set<ToolbarComboBox>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(202,54): error TS2339: Property 'CPUThrottlingRates' does not exist on type 'typeof MobileThrottling'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(218,82): error TS2339: Property 'selectedIndex' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(224,32): error TS2555: Expected at least 2 arguments, but got 1.
@@ -8669,7 +8314,6 @@ node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingSett
 node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(18,32): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(19,37): error TS2345: Argument of type 'ToolbarCheckbox' is not assignable to parameter of type '{ [x: string]: any; item(): any & ToolbarItem; } & ToolbarItem'.
   Type 'ToolbarCheckbox' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; }'.
-    Property 'item' is missing in type 'ToolbarCheckbox'.
 node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(21,42): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(23,37): error TS2345: Argument of type 'ToolbarButton' is not assignable to parameter of type '{ [x: string]: any; item(): any & ToolbarItem; } & ToolbarItem'.
   Type 'ToolbarButton' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; }'.
@@ -8697,7 +8341,6 @@ node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(147,5
 node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(155,26): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(157,9): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(158,26): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(193,28): error TS2569: Type 'IterableIterator<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(226,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(17,56): error TS2694: Namespace 'DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(18,25): error TS2555: Expected at least 2 arguments, but got 1.
@@ -8722,11 +8365,8 @@ node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.
 node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(86,14): error TS2339: Property 'title' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(104,13): error TS2315: Type 'Object' is not generic.
 node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(104,29): error TS1005: '>' expected.
-node_modules/chrome-devtools-frontend/front_end/network/HARWriter.js(36,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
-node_modules/chrome-devtools-frontend/front_end/network/HARWriter.js(50,15): error TS1055: Type 'Promise<string>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/network/HARWriter.js(54,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/HARWriter.js(74,36): error TS2694: Namespace 'NetworkRequest' has no exported member 'ContentData'.
-node_modules/chrome-devtools-frontend/front_end/network/HARWriter.js(89,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/network/HARWriter.js(93,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkConfigView.js(12,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkConfigView.js(14,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -8914,9 +8554,7 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(853,22
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(867,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(916,20): error TS2339: Property 'window' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(938,41): error TS2339: Property 'firstValue' does not exist on type 'Set<NetworkRequest>'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(946,22): error TS2569: Type 'Set<NetworkRequestNode>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(974,22): error TS2339: Property 'dataGrid' does not exist on type 'NetworkNode'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(981,22): error TS2569: Type 'IterableIterator<NetworkNode>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1074,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1099,47): error TS2339: Property 'Security' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1104,47): error TS2339: Property 'Security' does not exist on type 'typeof Protocol'.
@@ -8943,8 +8581,6 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1194,9
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1204,13): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1214,13): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1223,13): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1229,16): error TS1251: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Class definitions are automatically in strict mode.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1239,16): error TS1251: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Class definitions are automatically in strict mode.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1254,27): error TS2339: Property 'copyText' does not exist on type 'typeof InspectorFrontendHost'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1262,27): error TS2339: Property 'copyText' does not exist on type 'typeof InspectorFrontendHost'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1274,29): error TS2339: Property 'copyText' does not exist on type 'typeof InspectorFrontendHost'.
@@ -9167,9 +8803,7 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.j
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(384,39): error TS2339: Property 'expanded' does not exist on type 'NetworkNode'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(385,71): error TS2339: Property 'flatChildren' does not exist on type 'NetworkNode'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(397,64): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ [x: string]: any; Unknown: number; Foreground: number; Background: number; Selection: number; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(420,23): error TS2569: Type 'Map<any, Path2D>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(421,62): error TS2694: Namespace 'NetworkWaterfallColumn' has no exported member '_LayerStyle'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(444,23): error TS2569: Type 'IterableIterator<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(458,23): error TS2694: Namespace 'Network' has no exported member 'RequestTimeRangeNames'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(464,12): error TS2678: Type 'string' is not comparable to type '{ [x: string]: any; Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: st...'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(465,12): error TS2678: Type 'string' is not comparable to type '{ [x: string]: any; Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: st...'.
@@ -9183,7 +8817,6 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.j
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(615,54): error TS1003: Identifier expected.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(616,32): error TS2339: Property '_TextLayer' does not exist on type 'typeof NetworkWaterfallColumn'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestCookiesView.js(55,48): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/RequestCookiesView.js(73,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/network/RequestCookiesView.js(81,26): error TS2554: Expected 4 arguments, but got 0.
 node_modules/chrome-devtools-frontend/front_end/network/RequestCookiesView.js(83,20): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/RequestCookiesView.js(84,20): error TS2555: Expected at least 2 arguments, but got 1.
@@ -9259,18 +8892,11 @@ node_modules/chrome-devtools-frontend/front_end/network/RequestHeadersView.js(53
   Type 'Category' is not assignable to type 'TreeElement'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestHeadersView.js(554,31): error TS2345: Argument of type 'true' is not assignable to parameter of type 'V'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestHeadersView.js(561,31): error TS2345: Argument of type 'false' is not assignable to parameter of type 'V'.
-node_modules/chrome-devtools-frontend/front_end/network/RequestPreviewView.js(42,15): error TS1055: Type 'Promise<Widget>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
-node_modules/chrome-devtools-frontend/front_end/network/RequestPreviewView.js(55,15): error TS1055: Type 'Promise<Widget>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/network/RequestPreviewView.js(60,33): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/RequestPreviewView.js(78,15): error TS1055: Type 'Promise<Widget>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/network/RequestPreviewView.js(93,31): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/RequestResponseView.js(46,34): error TS2694: Namespace 'NetworkRequest' has no exported member 'ContentData'.
-node_modules/chrome-devtools-frontend/front_end/network/RequestResponseView.js(68,15): error TS1055: Type 'Promise<SearchableView>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
-node_modules/chrome-devtools-frontend/front_end/network/RequestResponseView.js(98,15): error TS1055: Type 'Promise<Widget>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
-node_modules/chrome-devtools-frontend/front_end/network/RequestResponseView.js(112,15): error TS1055: Type 'Promise<Widget>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/network/RequestResponseView.js(118,33): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/RequestResponseView.js(121,31): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/RequestResponseView.js(164,15): error TS1055: Type 'Promise<string>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(48,23): error TS2694: Namespace 'Network' has no exported member 'RequestTimeRangeNames'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(53,12): error TS2678: Type 'string' is not comparable to type '{ [x: string]: any; Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: st...'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(54,16): error TS2555: Expected at least 2 arguments, but got 1.
@@ -9402,9 +9028,6 @@ node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameVi
   Property '_contentURL' does not exist on type '{ [x: string]: any; contentURL(): string; contentType(): ResourceType; contentEncoded(): Promise<...'.
 node_modules/chrome-devtools-frontend/front_end/network_log/HAREntry.js(130,29): error TS2339: Property 'localizedFailDescription' does not exist on type 'NetworkRequest'.
 node_modules/chrome-devtools-frontend/front_end/network_log/HAREntry.js(150,36): error TS2694: Namespace 'HAREntry' has no exported member 'Timing'.
-node_modules/chrome-devtools-frontend/front_end/network_log/HAREntry.js(281,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/network_log/HAREntry.js(288,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/network_log/HAREntry.js(299,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/network_log/HAREntry.js(318,4): error TS1003: Identifier expected.
 node_modules/chrome-devtools-frontend/front_end/network_log/HAREntry.js(319,21): error TS2339: Property 'Timing' does not exist on type 'typeof HAREntry'.
 node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(44,57): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ [x: string]: any; modelAdded(model: T): void; modelRemoved(model: T): void; }'.
@@ -9427,14 +9050,11 @@ node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(208,46
 node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(226,38): error TS2694: Namespace 'NetworkLog' has no exported member 'InitiatorGraph'.
 node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(256,29): error TS2339: Property 'addAll' does not exist on type 'Set<NetworkRequest>'.
 node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(289,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(329,16): error TS2403: Subsequent variable declarations must have the same type.  Variable 'request' must be of type 'NetworkRequest', but here has type 'any'.
-node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(329,27): error TS2569: Type 'Set<NetworkRequest>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(355,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(369,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(379,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(388,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(398,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(411,25): error TS2569: Type 'IterableIterator<NetworkManager>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(446,75): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(476,95): error TS1003: Identifier expected.
 node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(477,23): error TS2339: Property 'InitiatorGraph' does not exist on type 'typeof NetworkLog'.
@@ -9484,21 +9104,17 @@ node_modules/chrome-devtools-frontend/front_end/object_ui/CustomPreviewComponent
 node_modules/chrome-devtools-frontend/front_end/object_ui/CustomPreviewComponent.js(125,18): error TS2339: Property 'classList' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/CustomPreviewComponent.js(230,11): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(25,39): error TS2694: Namespace 'SuggestBox' has no exported member 'Suggestions'.
-node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(73,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(73,39): error TS2694: Namespace 'SuggestBox' has no exported member 'Suggestions'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(118,32): error TS2694: Namespace 'SuggestBox' has no exported member 'Suggestions'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(132,51): error TS2339: Property 'naturalOrderComparator' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(156,24): error TS2339: Property 'subtitle' does not exist on type '{ text: string; title: string; priority: number; }'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(156,35): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(165,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(165,39): error TS2694: Namespace 'SuggestBox' has no exported member 'Suggestions'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(183,37): error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(183,97): error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(218,34): error TS2694: Namespace 'RuntimeModel' has no exported member 'EvaluationResult'.
-node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(219,17): error TS1055: Type 'Promise<any[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(219,66): error TS2694: Namespace 'JavaScriptAutocomplete' has no exported member 'CompletionGroup'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(262,63): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(322,17): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(335,16): error TS2403: Subsequent variable declarations must have the same type.  Variable 'scope' must be of type 'Scope', but here has type '{ properties: RemoteObjectProperty[]; name: string; }'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(336,54): error TS2339: Property 'properties' does not exist on type 'Scope'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(342,54): error TS2694: Namespace 'JavaScriptAutocomplete' has no exported member 'CompletionGroup'.
@@ -9593,17 +9209,12 @@ node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSectio
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(923,51): error TS2339: Property 'parentObject' does not exist on type 'RemoteObjectProperty'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(924,51): error TS2339: Property 'parentObject' does not exist on type 'RemoteObjectProperty'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(980,18): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
-node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1057,23): error TS2569: Type 'IterableIterator<number>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1069,18): error TS2403: Subsequent variable declarations must have the same type.  Variable 'i' must be of type 'any', but here has type 'number'.
-node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1078,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'groupStart' must be of type 'any', but here has type 'number'.
-node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1080,23): error TS2569: Type 'IterableIterator<number>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1153,23): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1182,26): error TS2339: Property '_readOnly' does not exist on type 'ObjectPropertyTreeElement'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1211,20): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1211,44): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1241,23): error TS2339: Property 'parentObject' does not exist on type 'RemoteObjectProperty'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1243,26): error TS2339: Property '_readOnly' does not exist on type 'ObjectPropertyTreeElement'.
-node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1312,26): error TS2569: Type 'Set<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1319,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1328,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1336,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
@@ -9766,10 +9377,8 @@ node_modules/chrome-devtools-frontend/front_end/perf_ui/LineLevelProfile.js(32,2
 node_modules/chrome-devtools-frontend/front_end/perf_ui/LineLevelProfile.js(33,32): error TS2339: Property 'positionTicks' does not exist on type 'ProfileNode'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/LineLevelProfile.js(40,34): error TS2339: Property 'positionTicks' does not exist on type 'ProfileNode'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/LineLevelProfile.js(41,31): error TS2339: Property 'positionTicks' does not exist on type 'ProfileNode'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/LineLevelProfile.js(71,26): error TS2569: Type 'Map<string, Map<number, number>>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/LineLevelProfile.js(135,16): error TS2339: Property 'uninstallGutter' does not exist on type 'CodeMirrorTextEditor'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/LineLevelProfile.js(138,16): error TS2339: Property 'installGutter' does not exist on type 'CodeMirrorTextEditor'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/LineLevelProfile.js(139,28): error TS2569: Type 'Set<LineMarker>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/LineLevelProfile.js(142,30): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/LineLevelProfile.js(145,15): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/LineLevelProfile.js(146,18): error TS2339: Property 'setGutterDecoration' does not exist on type 'CodeMirrorTextEditor'.
@@ -9822,8 +9431,6 @@ node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(104,80):
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(119,35): error TS2694: Namespace 'TimelineGrid' has no exported member 'DividersData'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(132,68): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ [x: string]: any; Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(135,64): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ [x: string]: any; Unknown: number; Foreground: number; Background: number; Selection: number; }'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(150,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(154,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(189,25): error TS2339: Property '_labelElement' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(196,23): error TS2339: Property '_labelElement' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(199,15): error TS2339: Property 'style' does not exist on type 'Element'.
@@ -9842,12 +9449,10 @@ node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(46,54): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(70,34): error TS2339: Property 'offsetX' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(70,57): error TS2339: Property 'offsetLeft' does not exist on type 'EventTarget'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(77,15): error TS1055: Type 'Promise<DocumentFragment>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(84,14): error TS2339: Property 'remove' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(85,14): error TS2339: Property 'appendChildren' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(112,30): error TS2339: Property 'offsetWidth' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(152,7): error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<undefined>'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(176,22): error TS2569: Type 'IterableIterator<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(186,57): error TS2339: Property 'valuesArray' does not exist on type 'Map<any, any>'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(213,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(319,19): error TS2339: Property 'preciseMillisToString' does not exist on type 'NumberConstructor'.
@@ -9880,7 +9485,6 @@ node_modules/chrome-devtools-frontend/front_end/performance_test_runner/Timeline
 node_modules/chrome-devtools-frontend/front_end/performance_test_runner/TimelineTestRunner.js(254,19): error TS2554: Expected 2 arguments, but got 3.
 node_modules/chrome-devtools-frontend/front_end/performance_test_runner/TimelineTestRunner.js(310,93): error TS2339: Property 'InvalidationFormatters' does not exist on type 'typeof PerformanceTestRunner'.
 node_modules/chrome-devtools-frontend/front_end/performance_test_runner/TimelineTestRunner.js(321,53): error TS2345: Argument of type 'number' is not assignable to parameter of type 'V'.
-node_modules/chrome-devtools-frontend/front_end/performance_test_runner/TimelineTestRunner.js(337,27): error TS2569: Type 'Set<V>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/performance_test_runner/TimelineTestRunner.js(347,23): error TS2551: Property 'panels' does not exist on type 'typeof UI'. Did you mean 'Panel'?
 node_modules/chrome-devtools-frontend/front_end/performance_test_runner/TimelineTestRunner.js(355,6): error TS2551: Property 'panels' does not exist on type 'typeof UI'. Did you mean 'Panel'?
 node_modules/chrome-devtools-frontend/front_end/persistence/Automapping.js(67,40): error TS2339: Property 'valuesArray' does not exist on type 'Set<PersistenceBinding>'.
@@ -9907,7 +9511,7 @@ node_modules/chrome-devtools-frontend/front_end/persistence/EditFileSystemView.j
 node_modules/chrome-devtools-frontend/front_end/persistence/EditFileSystemView.js(73,29): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/persistence/EditFileSystemView.js(78,46): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/persistence/EditFileSystemView.js(82,25): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/persistence/EditFileSystemView.js(98,24): error TS2569: Type 'IterableIterator<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
+node_modules/chrome-devtools-frontend/front_end/persistence/EditFileSystemView.js(102,44): error TS2345: Argument of type 'string' is not assignable to parameter of type 'T'.
 node_modules/chrome-devtools-frontend/front_end/persistence/EditFileSystemView.js(111,37): error TS2345: Argument of type 'Entry' is not assignable to parameter of type 'T'.
 node_modules/chrome-devtools-frontend/front_end/persistence/EditFileSystemView.js(118,38): error TS2345: Argument of type 'Entry' is not assignable to parameter of type 'T'.
 node_modules/chrome-devtools-frontend/front_end/persistence/EditFileSystemView.js(122,45): error TS2345: Argument of type '""' is not assignable to parameter of type 'T'.
@@ -9934,13 +9538,10 @@ node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceB
 node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(156,28): error TS2339: Property 'remove' does not exist on type 'Map<string, FileSystem>'.
 node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(160,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(163,67): error TS2694: Namespace 'IsolatedFileSystemManager' has no exported member 'FilesChangedData'.
-node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(188,28): error TS2569: Type 'IterableIterator<FileSystem>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(190,30): error TS2339: Property 'remove' does not exist on type 'Map<string, FileSystem>'.
 node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(222,26): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ [x: string]: any; Debugger: string; Formatter: string; Network: string; Snippets: string; FileS...'.
-node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(421,15): error TS1055: Type 'Promise<string[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(432,23): error TS2339: Property 'intersectOrdered' does not exist on type 'string[]'.
 node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(432,61): error TS2339: Property 'naturalOrderComparator' does not exist on type 'StringConstructor'.
-node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(517,15): error TS1055: Type 'Promise<UISourceCode>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(68,25): error TS2554: Expected 0-1 arguments, but got 2.
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(75,10): error TS2339: Property 'catchException' does not exist on type 'Promise<IsolatedFileSystem>'.
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(83,59): error TS2339: Property 'message' does not exist on type 'DOMError'.
@@ -9949,10 +9550,8 @@ node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.j
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(117,35): error TS2339: Property 'valuesArray' does not exist on type 'Set<string>'.
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(124,36): error TS2339: Property 'valuesArray' does not exist on type 'Set<string>'.
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(160,25): error TS2304: Cannot find name 'FileEntry'.
-node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(189,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(189,25): error TS2304: Cannot find name 'DirectoryEntry'.
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(210,25): error TS2304: Cannot find name 'DirectoryEntry'.
-node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(225,15): error TS1055: Type 'Promise<string>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(239,27): error TS2304: Cannot find name 'FileEntry'.
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(267,17): error TS2304: Cannot find name 'FileEntry'.
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(278,17): error TS2304: Cannot find name 'FileError'.
@@ -9999,7 +9598,6 @@ node_modules/chrome-devtools-frontend/front_end/persistence/NetworkPersistenceMa
 node_modules/chrome-devtools-frontend/front_end/persistence/NetworkPersistenceManager.js(74,5): error TS2322: Type 'V' is not assignable to type 'boolean'.
 node_modules/chrome-devtools-frontend/front_end/persistence/NetworkPersistenceManager.js(140,55): error TS2339: Property 'hashCode' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/persistence/NetworkPersistenceManager.js(341,70): error TS2339: Property 'Network' does not exist on type 'typeof Protocol'.
-node_modules/chrome-devtools-frontend/front_end/persistence/NetworkPersistenceManager.js(418,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/persistence/Persistence.js(21,51): error TS1005: '>' expected.
 node_modules/chrome-devtools-frontend/front_end/persistence/Persistence.js(58,23): error TS1138: Parameter declaration expected.
 node_modules/chrome-devtools-frontend/front_end/persistence/Persistence.js(58,23): error TS8024: JSDoc '@param' tag has name 'function', but there is no parameter with that name.
@@ -10128,9 +9726,7 @@ node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1057,39):
 node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1108,15): error TS2339: Property 'valuesArray' does not exist on type 'Set<any>'.
 node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1116,15): error TS2339: Property 'firstValue' does not exist on type 'Set<any>'.
 node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1126,15): error TS2339: Property 'addAll' does not exist on type 'Set<any>'.
-node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1127,17): error TS2569: Type 'Iterable<T> | T[]' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1136,15): error TS2339: Property 'containsAll' does not exist on type 'Set<any>'.
-node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1137,17): error TS2569: Type 'Iterable<T> | T[]' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1148,15): error TS2339: Property 'remove' does not exist on type 'Map<any, any>'.
 node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1155,21): error TS2304: Cannot find name 'VALUE'.
 node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1157,15): error TS2339: Property 'valuesArray' does not exist on type 'Map<any, any>'.
@@ -10139,12 +9735,9 @@ node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1164,15):
 node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1169,24): error TS2304: Cannot find name 'KEY'.
 node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1169,30): error TS2304: Cannot find name 'VALUE'.
 node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1171,15): error TS2339: Property 'inverse' does not exist on type 'Map<any, any>'.
-node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1173,19): error TS2569: Type 'IterableIterator<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1237,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1277,14): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1277,40): error TS2339: Property 'valuesArray' does not exist on type 'Set<V>'.
 node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1299,35): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'.
-node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1325,20): error TS2568: Type 'IArguments' is not an array type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1326,32): error TS2556: Expected 0 arguments, but got 1 or more.
 node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1335,19): error TS2339: Property 'spread' does not exist on type 'Promise<any>'.
 node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1348,19): error TS2339: Property 'catchException' does not exist on type 'Promise<any>'.
@@ -10159,10 +9752,8 @@ node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1430,18):
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(11,31): error TS1005: '>' expected.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(17,38): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ [x: string]: any; WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; T...'.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(55,29): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
-node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(69,15): error TS1055: Type 'Promise<ParsedURL>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(108,36): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(113,18): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(118,30): error TS2569: Type 'IterableIterator<Element>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(127,5): error TS2322: Type 'true | V' is not assignable to type 'boolean'.
   Type 'V' is not assignable to type 'boolean'.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(134,18): error TS2339: Property 'parentNodeOrShadowHost' does not exist on type 'Element'.
@@ -10230,12 +9821,9 @@ node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(73,5)
   Property '_cpuProfile' does not exist on type '{ [x: string]: any; minimumBoundary(): number; totalTime(): number; formatValue(value: number, pr...'.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(82,43): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(85,29): error TS2339: Property 'instance' does not exist on type 'typeof CPUProfileType'.
-node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(114,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(115,30): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(115,70): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(132,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(133,12): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(136,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(137,12): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(141,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(144,49): error TS2694: Namespace 'CPUProfilerModel' has no exported member 'EventData'.
@@ -10264,12 +9852,9 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapProfileView.js(43,5
   Property '_profile' does not exist on type '{ [x: string]: any; minimumBoundary(): number; totalTime(): number; formatValue(value: number, pr...'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapProfileView.js(52,52): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapProfileView.js(54,38): error TS2339: Property 'instance' does not exist on type 'typeof SamplingHeapProfileType'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapProfileView.js(81,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapProfileView.js(82,30): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapProfileView.js(82,71): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapProfileView.js(98,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapProfileView.js(99,12): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapProfileView.js(102,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapProfileView.js(103,12): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapProfileView.js(114,26): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapProfileView.js(167,65): error TS2345: Argument of type 'SamplingHeapProfileType' is not assignable to parameter of type '{ [x: string]: any; showProfile(profile: ProfileHeader): Widget; showObject(snapshotObjectId: any...'.
@@ -10365,7 +9950,6 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.j
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(673,34): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(675,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(700,24): error TS2694: Namespace 'Protocol' has no exported member 'HeapProfiler'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(701,15): error TS1055: Type 'Promise<{ [x: string]: any; dispose(): void; nodePosition(snapshotObjectId: number): Promise<numb...' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(775,11): error TS2345: Argument of type 'NODE_TYPE' is not assignable to parameter of type 'DataGridNode'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(822,56): error TS2694: Namespace 'DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(823,29): error TS2555: Expected at least 2 arguments, but got 1.
@@ -10449,7 +10033,6 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.j
   Type '() => HeapSnapshotProviderProxy' is not assignable to type '() => { [x: string]: any; dispose(): void; nodePosition(snapshotObjectId: number): Promise<number...'.
     Type 'HeapSnapshotProviderProxy' is not assignable to type '{ [x: string]: any; dispose(): void; nodePosition(snapshotObjectId: number): Promise<number>; isE...'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(981,27): error TS2339: Property 'snapshot' does not exist on type 'HeapSnapshotSortableDataGrid'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(986,15): error TS1055: Type 'Promise<({ [x: string]: any; dispose(): void; nodePosition(snapshotObjectId: number): Promise<num...' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(1001,5): error TS2322: Type '(this | ({ [x: string]: any; dispose(): void; nodePosition(snapshotObjectId: number): Promise<num...' is not assignable to type '({ [x: string]: any; dispose(): void; nodePosition(snapshotObjectId: number): Promise<number>; is...'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(1001,5): error TS2322: Type '(this | ({ [x: string]: any; dispose(): void; nodePosition(snapshotObjectId: number): Promise<num...' is not assignable to type '({ [x: string]: any; dispose(): void; nodePosition(snapshotObjectId: number): Promise<number>; is...'.
   Type 'this | ({ [x: string]: any; dispose(): void; nodePosition(snapshotObjectId: number): Promise<numb...' is not assignable to type '{ [x: string]: any; dispose(): void; nodePosition(snapshotObjectId: number): Promise<number>; isE...'.
@@ -10461,9 +10044,7 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.j
               Property 'nodePosition' is missing in type 'HeapSnapshotConstructorNode'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(1019,14): error TS2339: Property '_searchMatched' does not exist on type 'HeapSnapshotConstructorNode'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(1029,81): error TS2339: Property 'snapshot' does not exist on type 'HeapSnapshotSortableDataGrid'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(1112,15): error TS1055: Type 'Promise<ItemsRange>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(1140,22): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(1149,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(1178,28): error TS2339: Property 'withThousandsSeparator' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(1179,30): error TS2339: Property 'withThousandsSeparator' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(1180,67): error TS2339: Property 'withThousandsSeparator' does not exist on type 'NumberConstructor'.
@@ -10498,20 +10079,14 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.j
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(1347,44): error TS2339: Property 'heapProfilerModel' does not exist on type 'HeapSnapshotSortableDataGrid'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(1349,38): error TS2339: Property '_linkifier' does not exist on type 'HeapSnapshotSortableDataGrid'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(43,29): error TS1005: '>' expected.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(155,24): error TS2569: Type 'Set<number>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(161,40): error TS2339: Property 'keysArray' does not exist on type 'Map<number, any>'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(284,11): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(286,38): error TS2555: Expected at least 4 arguments, but got 3.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(329,12): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(405,12): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(431,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(435,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(440,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(443,30): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(450,12): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(457,12): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(460,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(464,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotProxy.js(507,12): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(42,11): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(48,9): error TS2345: Argument of type 'string' is not assignable to parameter of type 'symbol'.
@@ -10521,7 +10096,6 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(113
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(115,41): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(132,9): error TS2365: Operator '!==' cannot be applied to types '{ [x: string]: any; showProfile(profile: ProfileHeader): Widget; showObject(snapshotObjectId: any...' and 'TrackingHeapSnapshotProfileType'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(192,24): error TS2694: Namespace 'Protocol' has no exported member 'HeapProfiler'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(223,15): error TS1055: Type 'Promise<Statistics>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(228,53): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(229,56): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(230,57): error TS2555: Expected at least 2 arguments, but got 1.
@@ -10540,9 +10114,7 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(257
     Type 'ToolbarComboBox' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; } & ToolbarItem'.
       Type 'ToolbarComboBox' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; }'.
         Property 'item' is missing in type 'ToolbarComboBox'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(316,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(344,50): error TS2551: Property 'jumpBackwards' does not exist on type 'SearchConfig'. Did you mean 'jumpBackward'?
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(371,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(397,25): error TS2339: Property '_loadPromise' does not exist on type 'ProfileHeader'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(405,24): error TS2345: Argument of type 'SearchConfig' is not assignable to parameter of type 'SearchConfig'.
   Property 'toSearchRegex' is missing in type 'SearchConfig'.
@@ -10577,12 +10149,9 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(947
       Type '(heapProfilerModel: HeapProfilerModel) => void' is not assignable to type '(model: T) => void'.
         Types of parameters 'heapProfilerModel' and 'model' are incompatible.
           Type 'T' is not assignable to type 'HeapProfilerModel'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(988,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(989,12): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1006,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ [x: string]: any; WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; T...'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1010,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1011,12): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1014,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1015,12): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1038,26): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1042,5): error TS2322: Type 'ProfileHeader' is not assignable to type 'HeapProfileHeader'.
@@ -10598,7 +10167,6 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(109
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1122,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1139,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1155,35): error TS2345: Argument of type 'string' is not assignable to parameter of type 'symbol'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1167,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1168,30): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1169,30): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1195,48): error TS2345: Argument of type 'V' is not assignable to parameter of type 'boolean'.
@@ -10609,9 +10177,7 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(121
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1217,51): error TS2339: Property '_heapProfilerModel' does not exist on type 'ProfileHeader'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1219,35): error TS2345: Argument of type 'string' is not assignable to parameter of type 'symbol'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1225,13): error TS2339: Property '_finishLoad' does not exist on type 'ProfileHeader'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1247,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1248,12): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1251,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1252,12): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1258,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1313,11): error TS2345: Argument of type 'HeapSnapshotProfileType' is not assignable to parameter of type '{ [x: string]: any; showProfile(profile: ProfileHeader): Widget; showObject(snapshotObjectId: any...'.
@@ -10622,7 +10188,6 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(140
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1411,27): error TS2339: Property 'HeapSnapshotProgressEvent' does not exist on type 'typeof HeapSnapshotModel'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1430,30): error TS2339: Property 'bytesToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1476,61): error TS2339: Property 'toISO8601Compact' does not exist on type 'Date'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1522,15): error TS1055: Type 'Promise<Error>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1525,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1547,44): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1557,77): error TS2339: Property '_profileSamples' does not exist on type 'HeapProfileHeader'.
@@ -10711,8 +10276,6 @@ node_modules/chrome-devtools-frontend/front_end/profiler/ProfileDataGrid.js(226,
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileDataGrid.js(228,40): error TS2352: Type 'DataGridNode' cannot be converted to type '{ [x: string]: any; formatValue(value: number, node: any & ProfileDataGridNode): string; formatPe...'.
   Type 'DataGridNode' is not comparable to type '{ [x: string]: any; formatValue(value: number, node: any & ProfileDataGridNode): string; formatPe...'.
     Property 'formatValue' is missing in type 'DataGridNode'.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfileDataGrid.js(250,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfileDataGrid.js(254,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileDataGrid.js(262,43): error TS2345: Argument of type 'this' is not assignable to parameter of type 'ProfileDataGridTree | ({ [x: string]: any; formatValue(value: number, node: any & ProfileDataGrid...'.
   Type 'ProfileDataGridNode' is not assignable to type 'ProfileDataGridTree | ({ [x: string]: any; formatValue(value: number, node: any & ProfileDataGrid...'.
     Type 'ProfileDataGridNode' is not assignable to type '{ [x: string]: any; formatValue(value: number, node: any & ProfileDataGridNode): string; formatPe...'.
@@ -10734,7 +10297,6 @@ node_modules/chrome-devtools-frontend/front_end/profiler/ProfileDataGrid.js(312,
               Type 'this' is not assignable to type '{ [x: string]: any; formatValue(value: number, node: any & ProfileDataGridNode): string; formatPe...'.
                 Type 'ProfileDataGridNode' is not assignable to type '{ [x: string]: any; formatValue(value: number, node: any & ProfileDataGridNode): string; formatPe...'.
                   Property 'formatValue' is missing in type 'ProfileDataGridNode'.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfileDataGrid.js(375,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileDataGrid.js(412,46): error TS2345: Argument of type 'this[][]' is not assignable to parameter of type '({ [x: string]: any; formatValue(value: number, node: any & ProfileDataGridNode): string; formatP...'.
   Type 'this[]' is not assignable to type '({ [x: string]: any; formatValue(value: number, node: any & ProfileDataGridNode): string; formatP...'.
     Type 'this' is not assignable to type '{ [x: string]: any; formatValue(value: number, node: any & ProfileDataGridNode): string; formatPe...'.
@@ -10756,7 +10318,6 @@ node_modules/chrome-devtools-frontend/front_end/profiler/ProfileLauncherView.js(
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileLauncherView.js(79,41): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileLauncherView.js(83,41): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileLauncherView.js(87,41): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfileLauncherView.js(89,22): error TS2569: Type 'IterableIterator<HTMLOptionElement>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileLauncherView.js(120,38): error TS2339: Property 'radioElement' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileLauncherView.js(131,34): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileLauncherView.js(138,42): error TS2345: Argument of type 'V' is not assignable to parameter of type 'string'.
@@ -10764,11 +10325,6 @@ node_modules/chrome-devtools-frontend/front_end/profiler/ProfileLauncherView.js(
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileLauncherView.js(140,37): error TS2345: Argument of type 'V' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileLauncherView.js(141,48): error TS2345: Argument of type 'V' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileLauncherView.js(157,42): error TS2345: Argument of type 'string' is not assignable to parameter of type 'V'.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfileType.js(63,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfileType.js(67,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfileType.js(71,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfileType.js(75,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfileType.js(86,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileType.js(239,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileType.js(244,24): error TS2694: Namespace 'Protocol' has no exported member 'HeapProfiler'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(10,11): error TS2555: Expected at least 2 arguments, but got 1.
@@ -10823,9 +10379,7 @@ node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(350,34):
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(354,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(368,5): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(404,68): error TS2339: Property 'bytesToString' does not exist on type 'NumberConstructor'.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(417,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(459,56): error TS2339: Property 'toISO8601Compact' does not exist on type 'Date'.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(472,15): error TS1055: Type 'Promise<Error>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(475,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(482,24): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(485,23): error TS2555: Expected at least 2 arguments, but got 1.
@@ -11032,7 +10586,6 @@ node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheModel.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheModel.js(40,26): error TS2339: Property 'applicationCacheAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheModel.js(55,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheModel.js(71,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheModel.js(151,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheModel.js(166,34): error TS2694: Namespace 'Protocol' has no exported member 'ApplicationCache'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(51,60): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(59,54): error TS2555: Expected at least 2 arguments, but got 1.
@@ -11050,26 +10603,18 @@ node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSideba
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(295,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(317,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(336,34): error TS2339: Property 'remove' does not exist on type 'Map<DOMStorage, DOMStorageTreeElement>'.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(353,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(594,20): error TS2339: Property 'itemURL' does not exist on type 'BaseStorageTreeElement'.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(627,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(654,31): error TS2345: Argument of type 'true' is not assignable to parameter of type 'V'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(661,31): error TS2345: Argument of type 'false' is not assignable to parameter of type 'V'.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(682,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(728,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(751,25): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(785,45): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(795,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(814,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(825,31): error TS2339: Property 'remove' does not exist on type 'SWCacheTreeElement[]'.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(864,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(879,45): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(918,25): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(926,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(951,25): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(959,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(984,25): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(992,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1017,25): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1052,45): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1062,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
@@ -11077,28 +10622,18 @@ node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSideba
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1094,35): error TS2339: Property 'remove' does not exist on type 'IDBDatabaseTreeElement[]'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1099,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1113,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1165,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1179,45): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1225,20): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1276,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1298,45): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1356,51): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1358,31): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1416,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1449,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1451,25): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1453,25): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1487,81): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1493,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1518,45): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1530,55): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1537,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1555,9): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1581,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1585,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1621,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1625,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1629,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(11,26): error TS2339: Property 'Storage' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(22,42): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(37,48): error TS2555: Expected at least 2 arguments, but got 1.
@@ -11116,7 +10651,6 @@ node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(58
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(63,9): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(63,69): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(104,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(124,22): error TS2569: Type 'IterableIterator<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(129,18): error TS2339: Property 'storageAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(132,35): error TS2339: Property 'Storage' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(133,26): error TS2339: Property 'Storage' does not exist on type 'typeof Protocol'.
@@ -11128,7 +10662,6 @@ node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(16
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(174,23): error TS2339: Property 'disabled' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(176,37): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(178,25): error TS2339: Property 'disabled' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(185,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(192,39): error TS2339: Property 'storageAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(193,27): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(199,51): error TS2339: Property 'bytesToString' does not exist on type 'NumberConstructor'.
@@ -11176,9 +10709,6 @@ node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageItemsView.js
 node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageItemsView.js(275,38): error TS2339: Property 'key' does not exist on type 'DataGridNode'.
 node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageModel.js(49,25): error TS2694: Namespace 'Protocol' has no exported member 'DOMStorage'.
 node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageModel.js(55,26): error TS2694: Namespace 'Protocol' has no exported member 'DOMStorage'.
-node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageModel.js(56,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageModel.js(61,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageModel.js(66,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageModel.js(71,41): error TS2694: Namespace 'Protocol' has no exported member 'DOMStorage'.
 node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageModel.js(119,26): error TS2339: Property 'domstorageAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageModel.js(126,19): error TS2339: Property 'registerDOMStorageDispatcher' does not exist on type 'Target'.
@@ -11193,14 +10723,6 @@ node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageModel.js(298
 node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageModel.js(306,24): error TS2694: Namespace 'Protocol' has no exported member 'DOMStorage'.
 node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageModel.js(315,24): error TS2694: Namespace 'Protocol' has no exported member 'DOMStorage'.
 node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageModel.js(325,24): error TS2694: Namespace 'Protocol' has no exported member 'DOMStorage'.
-node_modules/chrome-devtools-frontend/front_end/resources/DatabaseModel.js(49,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/resources/DatabaseModel.js(54,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/resources/DatabaseModel.js(59,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/resources/DatabaseModel.js(64,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/resources/DatabaseModel.js(69,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/resources/DatabaseModel.js(74,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/resources/DatabaseModel.js(79,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/resources/DatabaseModel.js(84,15): error TS1055: Type 'Promise<string[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/resources/DatabaseModel.js(98,35): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/resources/DatabaseModel.js(112,17): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/DatabaseModel.js(130,26): error TS2339: Property 'databaseAgent' does not exist on type 'Target'.
@@ -11208,7 +10730,6 @@ node_modules/chrome-devtools-frontend/front_end/resources/DatabaseModel.js(131,1
 node_modules/chrome-devtools-frontend/front_end/resources/DatabaseModel.js(191,24): error TS2694: Namespace 'Protocol' has no exported member 'Database'.
 node_modules/chrome-devtools-frontend/front_end/resources/DatabaseQueryView.js(38,42): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/resources/DatabaseQueryView.js(52,62): error TS2339: Property 'hasSelection' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/resources/DatabaseQueryView.js(60,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/resources/DatabaseQueryView.js(60,39): error TS2694: Namespace 'SuggestBox' has no exported member 'Suggestions'.
 node_modules/chrome-devtools-frontend/front_end/resources/DatabaseQueryView.js(151,19): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/resources/DatabaseTableView.js(31,11): error TS2555: Expected at least 2 arguments, but got 1.
@@ -11222,7 +10743,6 @@ node_modules/chrome-devtools-frontend/front_end/resources/DatabaseTableView.js(5
         Property 'item' is missing in type 'ToolbarButton'.
 node_modules/chrome-devtools-frontend/front_end/resources/DatabaseTableView.js(77,18): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/resources/DatabaseTableView.js(114,37): error TS2339: Property 'valuesArray' does not exist on type 'Set<any>'.
-node_modules/chrome-devtools-frontend/front_end/resources/DatabaseTableView.js(116,21): error TS2569: Type 'IterableIterator<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/resources/DatabaseTableView.js(130,18): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/resources/DatabaseTableView.js(139,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(41,12): error TS2339: Property 'registerStorageDispatcher' does not exist on type 'Target'.
@@ -11235,13 +10755,8 @@ node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(112,
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(215,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(223,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(258,36): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
-node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(272,30): error TS2569: Type 'Set<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(276,30): error TS2569: Type 'Set<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(316,15): error TS1055: Type 'Promise<string[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(411,27): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(412,66): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
-node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(579,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(605,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(43,62): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(49,59): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(50,52): error TS2555: Expected at least 2 arguments, but got 1.
@@ -11307,13 +10822,8 @@ node_modules/chrome-devtools-frontend/front_end/resources/ResourcesPanel.js(22,4
 node_modules/chrome-devtools-frontend/front_end/resources/ResourcesPanel.js(43,59): error TS2339: Property 'runtime' does not exist on type 'Window'.
 node_modules/chrome-devtools-frontend/front_end/resources/ResourcesPanel.js(69,5): error TS2322: Type 'V' is not assignable to type 'string[]'.
 node_modules/chrome-devtools-frontend/front_end/resources/ResourcesPanel.js(76,48): error TS2345: Argument of type 'string[]' is not assignable to parameter of type 'V'.
-node_modules/chrome-devtools-frontend/front_end/resources/ResourcesPanel.js(108,15): error TS1055: Type 'Promise<Widget>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
-node_modules/chrome-devtools-frontend/front_end/resources/ResourcesPanel.js(191,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/resources/ResourcesSection.js(58,5): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '((child: TreeElement) => void) | ((treeElement: any) => void)' has no compatible call signatures.
 node_modules/chrome-devtools-frontend/front_end/resources/ResourcesSection.js(69,33): error TS2339: Property 'remove' does not exist on type 'Map<string, FrameTreeElement>'.
-node_modules/chrome-devtools-frontend/front_end/resources/ResourcesSection.js(145,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/resources/ResourcesSection.js(162,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/resources/ResourcesSection.js(268,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/resources/ResourcesSection.js(302,27): error TS2339: Property 'openInNewTab' does not exist on type 'typeof InspectorFrontendHost'.
 node_modules/chrome-devtools-frontend/front_end/resources/ResourcesSection.js(311,26): error TS2339: Property 'draggable' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/resources/ResourcesSection.js(321,11): error TS2339: Property 'dataTransfer' does not exist on type 'MouseEvent'.
@@ -11353,7 +10863,6 @@ node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheView
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(260,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(280,49): error TS2339: Property 'data' does not exist on type 'NODE_TYPE'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(285,24): error TS2694: Namespace 'Protocol' has no exported member 'CacheStorage'.
-node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(316,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(316,44): error TS2694: Namespace 'NetworkRequest' has no exported member 'ContentData'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(381,43): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(382,43): error TS2555: Expected at least 2 arguments, but got 1.
@@ -11380,14 +10889,9 @@ node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(
       Type '(serviceWorkerManager: ServiceWorkerManager) => void' is not assignable to type '(model: T) => void'.
         Types of parameters 'serviceWorkerManager' and 'model' are incompatible.
           Type 'T' is not assignable to type 'ServiceWorkerManager'.
-node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(85,30): error TS2569: Type 'IterableIterator<ServiceWorkerRegistration>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(118,25): error TS2569: Type 'IterableIterator<Section>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(120,7): error TS2447: The '|=' operator is not allowed for boolean types. Consider using '||' instead.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(121,7): error TS2447: The '|=' operator is not allowed for boolean types. Consider using '||' instead.
-node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(137,25): error TS2569: Type 'IterableIterator<Section>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(150,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(161,30): error TS2569: Type 'IterableIterator<ServiceWorkerRegistration>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(173,30): error TS2569: Type 'IterableIterator<ServiceWorkerRegistration>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(211,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(238,24): error TS2339: Property 'filterRegex' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(262,30): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
@@ -11626,37 +11130,26 @@ node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(50,12): error TS
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(67,16): error TS2315: Type 'SourceMapManager' is not generic.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(102,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(203,31): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(207,15): error TS1055: Type 'Promise<boolean>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(238,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(241,15): error TS1055: Type 'Promise<boolean>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(244,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ [x: string]: any; WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; T...'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(262,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(265,15): error TS1055: Type 'Promise<boolean>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(268,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ [x: string]: any; WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; T...'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(290,41): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(304,15): error TS1055: Type 'Promise<CSSMedia[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(319,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(328,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(329,15): error TS1055: Type 'Promise<CSSMatchedStyles>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(334,27): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(348,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(356,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(365,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(365,38): error TS2694: Namespace 'CSSModel' has no exported member 'ContrastInfo'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(369,27): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(377,41): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(387,45): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, CSSStyleSheetHeader>'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(406,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(407,15): error TS1055: Type 'Promise<InlineStyleResult>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(412,27): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(415,71): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ [x: string]: any; Regular: string; Inline: string; Attributes: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(417,75): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ [x: string]: any; Regular: string; Inline: string; Attributes: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(460,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(463,15): error TS1055: Type 'Promise<boolean>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(466,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ [x: string]: any; WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; T...'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(484,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(487,15): error TS1055: Type 'Promise<CSSStyleRule>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(507,15): error TS1055: Type 'Promise<CSSStyleSheetHeader>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(511,46): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, CSSStyleSheetHeader>'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(533,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(544,39): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, CSSStyleSheetHeader>'.
@@ -11671,11 +11164,8 @@ node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(624,35): error T
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(626,34): error TS2339: Property 'remove' does not exist on type 'Map<CSSStyleSheetHeader, Promise<string>>'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(633,33): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(647,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(650,15): error TS1055: Type 'Promise<string>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(674,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(675,15): error TS1055: Type 'Promise<string>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(687,46): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, CSSStyleSheetHeader>'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(707,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(751,112): error TS1003: Identifier expected.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(752,14): error TS2339: Property 'RuleUsage' does not exist on type 'typeof CSSModel'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(754,136): error TS1003: Identifier expected.
@@ -11689,7 +11179,6 @@ node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(885,24): error T
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(897,33): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSProperty.js(18,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSProperty.js(39,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSProperty.js(123,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSProperty.js(156,36): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ [x: string]: any; WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; T...'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSProperty.js(166,64): error TS2339: Property 'substring' does not exist on type 'string | V'.
   Property 'substring' does not exist on type 'V'.
@@ -11723,7 +11212,6 @@ node_modules/chrome-devtools-frontend/front_end/sdk/CSSStyleSheetHeader.js(11,24
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSStyleSheetHeader.js(40,5): error TS2322: Type 'StaticContentProvider' is not assignable to type '{ [x: string]: any; contentURL(): string; contentType(): ResourceType; contentEncoded(): Promise<...'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSStyleSheetHeader.js(40,5): error TS2322: Type 'StaticContentProvider' is not assignable to type '{ [x: string]: any; contentURL(): string; contentType(): ResourceType; contentEncoded(): Promise<...'.
   Property '_contentURL' does not exist on type '{ [x: string]: any; contentURL(): string; contentType(): ResourceType; contentEncoded(): Promise<...'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSStyleSheetHeader.js(139,15): error TS1055: Type 'Promise<SearchMatch[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/Connections.js(10,52): error TS2694: Namespace 'Connection' has no exported member 'Params'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Connections.js(30,29): error TS2339: Property 'sendMessageToBackend' does not exist on type 'typeof InspectorFrontendHost'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Connections.js(34,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
@@ -11731,7 +11219,6 @@ node_modules/chrome-devtools-frontend/front_end/sdk/Connections.js(41,22): error
 node_modules/chrome-devtools-frontend/front_end/sdk/Connections.js(71,27): error TS2339: Property 'reattach' does not exist on type 'typeof InspectorFrontendHost'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Connections.js(87,52): error TS2694: Namespace 'Connection' has no exported member 'Params'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Connections.js(168,52): error TS2694: Namespace 'Connection' has no exported member 'Params'.
-node_modules/chrome-devtools-frontend/front_end/sdk/ContentProviders.js(102,15): error TS1055: Type 'Promise<SearchMatch[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/CookieModel.js(14,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CookieModel.js(40,27): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CookieModel.js(65,26): error TS2339: Property 'networkAgent' does not exist on type 'Target'.
@@ -11748,12 +11235,11 @@ node_modules/chrome-devtools-frontend/front_end/sdk/CookieParser.js(246,25): err
 node_modules/chrome-devtools-frontend/front_end/sdk/CookieParser.js(250,33): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CookieParser.js(325,53): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(11,26): error TS2339: Property 'domdebuggerAgent' does not exist on type 'Target'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(33,15): error TS1055: Type 'Promise<EventListener[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(69,50): error TS2694: Namespace 'DOMBreakpoint' has no exported member 'Type'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(78,50): error TS2694: Namespace 'DOMBreakpoint' has no exported member 'Type'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(98,50): error TS2694: Namespace 'DOMBreakpoint' has no exported member 'Type'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(154,59): error TS2694: Namespace 'DOMBreakpoint' has no exported member 'Type'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(184,28): error TS2495: Type 'V' is not an array type or a string type.
+node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(184,28): error TS2488: Type 'V' must have a '[Symbol.iterator]()' method that returns an iterator.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(190,60): error TS2694: Namespace 'DOMBreakpoint' has no exported member 'Type'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(232,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(242,57): error TS2339: Property 'filter' does not exist on type 'V'.
@@ -11762,11 +11248,10 @@ node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(275,55):
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(276,52): error TS2339: Property 'DOMDebugger' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(292,33): error TS2694: Namespace 'EventListener' has no exported member 'Origin'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(387,7): error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<undefined>'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(397,16): error TS1251: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Class definitions are automatically in strict mode.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(466,34): error TS2694: Namespace 'EventListener' has no exported member 'Origin'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(469,5): error TS2322: Type 'string | { [x: string]: any; Raw: string; Framework: string; FrameworkUser: string; }' is not assignable to type '{ [x: string]: any; Raw: string; Framework: string; FrameworkUser: string; }'.
   Type 'string' is not assignable to type '{ [x: string]: any; Raw: string; Framework: string; FrameworkUser: string; }'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(572,28): error TS2495: Type 'V' is not an array type or a string type.
+node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(572,28): error TS2488: Type 'V' must have a '[Symbol.iterator]()' method that returns an iterator.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(578,9): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(581,9): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(583,9): error TS2555: Expected at least 2 arguments, but got 1.
@@ -11805,9 +11290,7 @@ node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(673,59):
       Type '(domDebuggerModel: DOMDebuggerModel) => void' is not assignable to type '(model: T) => void'.
         Types of parameters 'domDebuggerModel' and 'model' are incompatible.
           Type 'T' is not assignable to type 'DOMDebuggerModel'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(777,21): error TS2569: Type 'IterableIterator<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(779,37): error TS2345: Argument of type '{ url: any; enabled: boolean; }[]' is not assignable to parameter of type 'V'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(828,21): error TS2569: Type 'IterableIterator<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
+node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(779,37): error TS2345: Argument of type '{ url: string; enabled: boolean; }[]' is not assignable to parameter of type 'V'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(47,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(59,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(136,53): error TS2339: Property 'documentElement' does not exist on type 'DOMDocument'.
@@ -11828,10 +11311,8 @@ node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(437,30): error T
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(440,36): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(447,33): error TS2694: Namespace 'Protocol' has no exported member 'Error'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(454,35): error TS2694: Namespace 'DOMNode' has no exported member 'Attribute'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(462,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(466,27): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(484,34): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(491,15): error TS1055: Type 'Promise<DOMNode[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(495,30): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(507,33): error TS2694: Namespace 'Protocol' has no exported member 'Error'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(511,30): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
@@ -11839,7 +11320,6 @@ node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(514,36): error T
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(519,33): error TS2694: Namespace 'Protocol' has no exported member 'Error'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(523,30): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(526,36): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(531,15): error TS1055: Type 'Promise<string>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(536,29): error TS2339: Property 'copyText' does not exist on type 'typeof InspectorFrontendHost'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(554,31): error TS2339: Property 'index' does not exist on type 'DOMNode'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(555,16): error TS2339: Property 'index' does not exist on type 'DOMNode'.
@@ -11856,24 +11336,19 @@ node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(761,40): error T
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(768,33): error TS2694: Namespace 'Protocol' has no exported member 'Error'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(775,34): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(778,40): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(834,26): error TS2569: Type 'IterableIterator<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(852,31): error TS2339: Property 'baseURL' does not exist on type 'DOMNode'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(853,65): error TS2339: Property 'baseURL' does not exist on type 'DOMNode'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(860,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(872,15): error TS1055: Type 'Promise<RemoteObject>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(880,34): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(896,7): error TS2322: Type 'DOMNode' is not assignable to type 'this'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(940,29): error TS2339: Property 'pageAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(969,66): error TS1003: Identifier expected.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(970,13): error TS2339: Property 'Attribute' does not exist on type 'typeof DOMNode'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(993,15): error TS1055: Type 'Promise<DOMNode>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1042,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1062,26): error TS2339: Property 'domAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1070,12): error TS2339: Property 'registerDOMDispatcher' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1165,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1166,15): error TS1055: Type 'Promise<DOMNode>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1176,34): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1184,15): error TS1055: Type 'Promise<Map<number, DOMNode>>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1188,46): error TS2339: Property 'valuesArray' does not exist on type 'Set<number>'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1203,34): error TS2694: Namespace 'Protocol' has no exported member 'Error'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1208,26): error TS2694: Namespace 'Protocol' has no exported member 'Error'.
@@ -11882,7 +11357,6 @@ node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1220,24): error
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1235,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1248,31): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1251,32): error TS2339: Property 'addAll' does not exist on type 'Set<number>'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1258,24): error TS2569: Type 'Set<number>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1277,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1288,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1300,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
@@ -11905,11 +11379,8 @@ node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1425,24): error
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1426,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1442,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1443,32): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1464,23): error TS2569: Type 'IterableIterator<DOMNode>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1473,15): error TS1055: Type 'Promise<number>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1477,28): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1479,30): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1484,15): error TS1055: Type 'Promise<DOMNode>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1501,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1509,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1511,34): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
@@ -11943,30 +11414,22 @@ node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(42,26): err
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(45,17): error TS2315: Type 'SourceMapManager' is not generic.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(90,16): error TS2315: Type 'SourceMapManager' is not generic.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(231,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(250,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(250,43): error TS2694: Namespace 'DebuggerModel' has no exported member 'SetBreakpointResult'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(267,27): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(281,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(281,43): error TS2694: Namespace 'DebuggerModel' has no exported member 'SetBreakpointResult'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(286,35): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(304,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(304,43): error TS2694: Namespace 'DebuggerModel' has no exported member 'SetBreakpointResult'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(310,27): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(319,24): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(320,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(324,27): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(325,73): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(332,15): error TS1055: Type 'Promise<any[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(340,27): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(346,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(347,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(347,34): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(351,30): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(355,24): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(356,24): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(371,37): error TS2569: Type 'IterableIterator<Script>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(389,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(411,24): error TS2569: Type 'IterableIterator<Script>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(419,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(421,33): error TS2694: Namespace 'Protocol' has no exported member 'Error'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(429,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
@@ -11977,12 +11440,10 @@ node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(433,24): er
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(434,32): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(435,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(436,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(458,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(498,32): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(502,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(503,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(504,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(511,25): error TS2569: Type 'IterableIterator<DebuggerModel>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(521,31): error TS2339: Property '_continueToLocationCallback' does not exist on type 'DebuggerModel'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(522,27): error TS2339: Property '_continueToLocationCallback' does not exist on type 'DebuggerModel'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(523,19): error TS2339: Property '_continueToLocationCallback' does not exist on type 'DebuggerModel'.
@@ -11995,16 +11456,12 @@ node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(764,42): er
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(772,43): error TS2694: Namespace 'DebuggerModel' has no exported member 'FunctionDetails'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(780,36): error TS2694: Namespace 'DebuggerModel' has no exported member 'FunctionDetails'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(816,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(818,15): error TS1055: Type 'Promise<string>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(822,35): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(829,24): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(830,31): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(838,24): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(839,31): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(848,15): error TS1055: Type 'Promise<boolean>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(852,35): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(871,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(879,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(899,22): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(907,78): error TS1003: Identifier expected.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(908,19): error TS2339: Property 'FunctionDetails' does not exist on type 'typeof DebuggerModel'.
@@ -12028,14 +11485,9 @@ node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1158,24): e
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1174,24): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1186,37): error TS2339: Property 'Debugger' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1197,32): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1214,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1221,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1255,15): error TS1055: Type 'Promise<RemoteObject>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1263,35): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1266,27): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1275,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1294,32): error TS2694: Namespace 'RuntimeModel' has no exported member 'EvaluationOptions'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1295,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1295,42): error TS2694: Namespace 'RuntimeModel' has no exported member 'EvaluationResult'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1308,35): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1321,28): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
@@ -12115,15 +11567,12 @@ node_modules/chrome-devtools-frontend/front_end/sdk/LayerTreeBase.js(152,26): er
 node_modules/chrome-devtools-frontend/front_end/sdk/LayerTreeBase.js(154,26): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/LayerTreeBase.js(168,25): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/LayerTreeBase.js(175,25): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
-node_modules/chrome-devtools-frontend/front_end/sdk/LayerTreeBase.js(274,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/LayerTreeBase.js(284,33): error TS2339: Property 'keysArray' does not exist on type 'Map<number, DOMNode>'.
 node_modules/chrome-devtools-frontend/front_end/sdk/LogModel.js(14,12): error TS2339: Property 'registerLogDispatcher' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/LogModel.js(15,29): error TS2339: Property 'logAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/LogModel.js(28,24): error TS2694: Namespace 'Protocol' has no exported member 'Log'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(41,33): error TS2339: Property 'networkAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(42,12): error TS2339: Property 'registerNetworkDispatcher' does not exist on type 'Target'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(92,15): error TS1055: Type 'Promise<SearchMatch[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(105,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(105,44): error TS2694: Namespace 'NetworkRequest' has no exported member 'ContentData'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(116,35): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(121,34): error TS2694: Namespace 'NetworkManager' has no exported member 'Conditions'.
@@ -12235,12 +11684,9 @@ node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(836,31): e
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(844,75): error TS2339: Property 'valuesArray' does not exist on type 'Multimap'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(855,32): error TS2339: Property 'networkAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(874,34): error TS2694: Namespace 'NetworkManager' has no exported member 'Conditions'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(878,23): error TS2569: Type 'Set<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(884,35): error TS2694: Namespace 'NetworkManager' has no exported member 'Conditions'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(891,24): error TS2694: Namespace 'Protocol' has no exported member 'NetworkAgent'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(905,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(909,23): error TS2569: Type 'Set<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(922,23): error TS2569: Type 'Set<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(955,42): error TS2694: Namespace 'NetworkManager' has no exported member 'BlockedPattern'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(958,47): error TS2339: Property 'slice' does not exist on type 'V'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(965,5): error TS2322: Type 'V' is not assignable to type 'boolean'.
@@ -12248,19 +11694,15 @@ node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(976,41): e
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(979,38): error TS2345: Argument of type 'any[]' is not assignable to parameter of type 'V'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(988,9): error TS2365: Operator '===' cannot be applied to types 'V' and 'boolean'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(990,38): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'V'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(998,27): error TS2495: Type 'V' is not an array type or a string type.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1007,23): error TS2569: Type 'Set<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
+node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(998,27): error TS2488: Type 'V' must have a '[Symbol.iterator]()' method that returns an iterator.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1015,46): error TS2339: Property 'size' does not exist on type 'Multimap'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1019,52): error TS2694: Namespace 'MultitargetNetworkManager' has no exported member 'InterceptionPattern'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1020,45): error TS2694: Namespace 'MultitargetNetworkManager' has no exported member 'RequestInterceptor'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1025,37): error TS2339: Property 'deleteAll' does not exist on type 'Multimap'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1027,39): error TS2339: Property 'set' does not exist on type 'Multimap'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1046,49): error TS2345: Argument of type 'true' is not assignable to parameter of type 'V'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1049,23): error TS2569: Type 'Set<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1050,82): error TS2339: Property 'valuesArray' does not exist on type 'Multimap'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1059,68): error TS2339: Property 'keysArray' does not exist on type 'Multimap'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1069,23): error TS2569: Type 'Set<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1074,23): error TS2569: Type 'Set<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1084,19): error TS2339: Property 'networkAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1115,24): error TS2694: Namespace 'Protocol' has no exported member 'NetworkAgent'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1116,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
@@ -12270,9 +11712,7 @@ node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1119,24):
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1122,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1123,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1125,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1169,17): error TS1055: Type 'Promise<string>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1196,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1205,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1205,44): error TS2694: Namespace 'NetworkRequest' has no exported member 'ContentData'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1210,35): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1215,94): error TS1003: Identifier expected.
@@ -12299,74 +11739,30 @@ node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(98,36): er
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(99,26): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(119,25): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(126,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(157,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(161,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(166,25): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(168,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(173,25): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(175,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(196,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(203,25): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(210,25): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(217,24): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(224,25): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(231,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(240,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(272,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(279,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(286,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(293,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(309,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(318,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(327,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(334,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(341,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(362,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(369,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(382,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(389,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(396,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(403,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(408,25): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(415,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(454,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(461,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(466,25): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(468,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(473,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(475,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(494,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(501,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(508,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(543,82): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(563,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(589,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(596,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(615,43): error TS2694: Namespace 'NetworkRequest' has no exported member 'NameValue'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(622,42): error TS2694: Namespace 'NetworkRequest' has no exported member 'NameValue'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(661,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(670,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(677,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(709,43): error TS2694: Namespace 'NetworkRequest' has no exported member 'NameValue'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(711,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(716,42): error TS2694: Namespace 'NetworkRequest' has no exported member 'NameValue'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(718,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(731,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(738,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(745,43): error TS2694: Namespace 'NetworkRequest' has no exported member 'NameValue'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(747,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(772,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(788,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(815,43): error TS2694: Namespace 'NetworkRequest' has no exported member 'NameValue'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(817,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(828,43): error TS2694: Namespace 'NetworkRequest' has no exported member 'NameValue'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(830,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(860,43): error TS2694: Namespace 'NetworkRequest' has no exported member 'NameValue'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(874,42): error TS2694: Namespace 'NetworkRequest' has no exported member 'NameValue'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(895,44): error TS2694: Namespace 'NetworkRequest' has no exported member 'ContentData'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(908,54): error TS2694: Namespace 'NetworkRequest' has no exported member 'ContentData'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(933,15): error TS1055: Type 'Promise<boolean>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(941,15): error TS1055: Type 'Promise<string>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(980,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(987,25): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(994,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
@@ -12397,7 +11793,6 @@ node_modules/chrome-devtools-frontend/front_end/sdk/OverlayModel.js(81,22): erro
 node_modules/chrome-devtools-frontend/front_end/sdk/OverlayModel.js(85,22): error TS2339: Property '_highlightDisabled' does not exist on type 'typeof OverlayModel'.
 node_modules/chrome-devtools-frontend/front_end/sdk/OverlayModel.js(110,9): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sdk/OverlayModel.js(123,24): error TS2694: Namespace 'Protocol' has no exported member 'Overlay'.
-node_modules/chrome-devtools-frontend/front_end/sdk/OverlayModel.js(124,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/OverlayModel.js(128,50): error TS2339: Property 'Overlay' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/OverlayModel.js(141,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/OverlayModel.js(143,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
@@ -12430,26 +11825,17 @@ node_modules/chrome-devtools-frontend/front_end/sdk/OverlayModel.js(317,24): err
 node_modules/chrome-devtools-frontend/front_end/sdk/OverlayModel.js(326,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
 node_modules/chrome-devtools-frontend/front_end/sdk/PaintProfiler.js(37,35): error TS2339: Property 'layerTreeAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/PaintProfiler.js(41,27): error TS2694: Namespace 'SDK' has no exported member 'PictureFragment'.
-node_modules/chrome-devtools-frontend/front_end/sdk/PaintProfiler.js(42,15): error TS1055: Type 'Promise<PaintProfilerSnapshot>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
-node_modules/chrome-devtools-frontend/front_end/sdk/PaintProfiler.js(60,15): error TS1055: Type 'Promise<PaintProfilerSnapshot>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/PaintProfiler.js(72,2): error TS1003: Identifier expected.
 node_modules/chrome-devtools-frontend/front_end/sdk/PaintProfiler.js(73,5): error TS2339: Property 'PictureFragment' does not exist on type 'typeof SDK'.
 node_modules/chrome-devtools-frontend/front_end/sdk/PaintProfiler.js(108,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/PaintProfiler.js(109,41): error TS2694: Namespace 'Protocol' has no exported member 'LayerTree'.
-node_modules/chrome-devtools-frontend/front_end/sdk/PaintProfiler.js(116,15): error TS1055: Type 'Promise<PaintProfilerLogItem[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/PaintProfiler.js(126,2): error TS1003: Identifier expected.
 node_modules/chrome-devtools-frontend/front_end/sdk/PaintProfiler.js(127,5): error TS2339: Property 'RawPaintProfilerLogItem' does not exist on type 'typeof SDK'.
 node_modules/chrome-devtools-frontend/front_end/sdk/PaintProfiler.js(134,19): error TS2694: Namespace 'SDK' has no exported member 'RawPaintProfilerLogItem'.
 node_modules/chrome-devtools-frontend/front_end/sdk/PerformanceMetricsModel.js(11,26): error TS2339: Property 'performanceAgent' does not exist on type 'Target'.
-node_modules/chrome-devtools-frontend/front_end/sdk/PerformanceMetricsModel.js(29,15): error TS1055: Type 'Promise<any[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/PerformanceMetricsModel.js(29,41): error TS2694: Namespace 'Protocol' has no exported member 'Performance'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ProfileTreeModel.js(9,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ProfileTreeModel.js(12,26): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/ProfileTreeModel.js(31,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/ProfileTreeModel.js(38,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/ProfileTreeModel.js(45,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/ProfileTreeModel.js(52,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/ProfileTreeModel.js(59,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/ProfileTreeModel.js(80,10): error TS2339: Property 'depth' does not exist on type 'ProfileNode'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ProfileTreeModel.js(86,26): error TS2339: Property 'depth' does not exist on type 'ProfileNode'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ProfileTreeModel.js(93,15): error TS2339: Property 'depth' does not exist on type 'ProfileNode'.
@@ -12471,18 +11857,9 @@ node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(103,47): err
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(158,27): error TS2339: Property 'valuesArray' does not exist on type 'Map<any, any>'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(189,25): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(195,26): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(196,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(201,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(206,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(211,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(216,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(221,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(226,25): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(228,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(316,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(317,15): error TS1055: Type 'Promise<string>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(324,31): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(326,15): error TS1055: Type 'Promise<string>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(333,39): error TS1110: Type expected.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(334,31): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(342,39): error TS1110: Type expected.
@@ -12504,28 +11881,18 @@ node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(450,46): err
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(451,46): error TS2339: Property 'Runtime' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(465,25): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(473,25): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(475,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(483,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(491,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(499,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(507,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(515,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(521,25): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(523,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(586,26): error TS2694: Namespace 'Protocol' has no exported member 'RuntimeAgent'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(590,29): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(612,28): error TS2339: Property 'getter' does not exist on type 'RemoteObjectProperty'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(614,28): error TS2339: Property 'setter' does not exist on type 'RemoteObjectProperty'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(636,31): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(638,15): error TS1055: Type 'Promise<string>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(645,27): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(646,32): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(663,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(664,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(665,15): error TS1055: Type 'Promise<string>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(677,35): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(683,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(684,15): error TS1055: Type 'Promise<string>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(694,27): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(695,32): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(703,39): error TS1110: Type expected.
@@ -12542,17 +11909,9 @@ node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(795,24): err
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(797,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(850,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(851,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(852,15): error TS1055: Type 'Promise<string>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(913,15): error TS1055: Type 'Promise<boolean>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(928,20): error TS2339: Property 'getter' does not exist on type 'RemoteObjectProperty'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(928,35): error TS2339: Property 'setter' does not exist on type 'RemoteObjectProperty'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(953,25): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(955,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(963,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(971,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(1059,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(1067,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(1084,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(1152,39): error TS1110: Type expected.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(1153,31): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(1176,31): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
@@ -12575,20 +11934,8 @@ node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(38,24): error TS
 node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(39,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(56,55): error TS2339: Property 'isValid' does not exist on type 'Date'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(74,39): error TS2339: Property 'isValid' does not exist on type 'Date'.
-node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(90,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(97,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(104,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(109,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(116,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(121,25): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
-node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(123,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(128,25): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
-node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(130,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(137,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(151,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(158,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(182,15): error TS1055: Type 'Promise<boolean>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
-node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(217,15): error TS1055: Type 'Promise<SearchMatch[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(224,57): error TS2339: Property 'pageAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(241,13): error TS2339: Property 'src' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(263,61): error TS2339: Property 'pageAgent' does not exist on type 'Target'.
@@ -12608,28 +11955,18 @@ node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(273,24)
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(294,25): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, ResourceTreeFrame>'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(308,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(334,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
-node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(385,15): error TS1055: Type 'Promise<{ currentIndex: number; entries: any; }>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(385,67): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(389,27): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(395,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(402,57): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(406,27): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
-node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(459,23): error TS2569: Type 'IterableIterator<ResourceTreeFrame>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(501,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(502,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(503,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(545,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(552,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(559,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(566,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(573,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(580,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(587,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(592,33): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(593,25): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(601,25): error TS2339: Property 'parent' does not exist on type 'ResourceTreeFrame'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(614,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
-node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(633,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(641,23): error TS2339: Property 'remove' does not exist on type 'ResourceTreeFrame[]'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(731,14): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(738,12): error TS2555: Expected at least 2 arguments, but got 1.
@@ -12668,15 +12005,12 @@ node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(203,40): err
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(205,40): error TS2339: Property 'Runtime' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(209,5): error TS2322: Type 'RemoteObjectImpl' is not assignable to type 'RemoteObject'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(237,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(249,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(249,42): error TS2694: Namespace 'RuntimeModel' has no exported member 'CompileScriptResult'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(259,27): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(260,39): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(267,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(275,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(275,42): error TS2694: Namespace 'RuntimeModel' has no exported member 'EvaluationResult'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(291,35): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(301,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(301,42): error TS2694: Namespace 'RuntimeModel' has no exported member 'QueryObjectResult'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(308,35): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(317,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
@@ -12711,10 +12045,8 @@ node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(670,32): err
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(673,42): error TS2694: Namespace 'RuntimeModel' has no exported member 'EvaluationResult'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(685,42): error TS2694: Namespace 'RuntimeModel' has no exported member 'EvaluationResult'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(701,32): error TS2694: Namespace 'RuntimeModel' has no exported member 'EvaluationOptions'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(704,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(704,42): error TS2694: Namespace 'RuntimeModel' has no exported member 'EvaluationResult'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(724,35): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(733,15): error TS1055: Type 'Promise<string[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(737,30): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(767,33): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ScreenCaptureModel.js(14,26): error TS2339: Property 'pageAgent' does not exist on type 'Target'.
@@ -12722,7 +12054,6 @@ node_modules/chrome-devtools-frontend/front_end/sdk/ScreenCaptureModel.js(15,44)
 node_modules/chrome-devtools-frontend/front_end/sdk/ScreenCaptureModel.js(19,12): error TS2339: Property 'registerPageDispatcher' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ScreenCaptureModel.js(28,41): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ScreenCaptureModel.js(46,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
-node_modules/chrome-devtools-frontend/front_end/sdk/ScreenCaptureModel.js(54,15): error TS1055: Type 'Promise<{ viewportX: number; viewportY: number; viewportScale: number; contentWidth: number; cont...' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/ScreenCaptureModel.js(58,27): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ScreenCaptureModel.js(72,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ScreenCaptureModel.js(106,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
@@ -12736,12 +12067,10 @@ node_modules/chrome-devtools-frontend/front_end/sdk/ScreenCaptureModel.js(145,24
 node_modules/chrome-devtools-frontend/front_end/sdk/ScreenCaptureModel.js(152,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ScreenCaptureModel.js(160,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(39,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(136,15): error TS1055: Type 'Promise<string>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(143,52): error TS2339: Property 'debuggerAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(159,5): error TS2322: Type 'StaticContentProvider' is not assignable to type '{ [x: string]: any; contentURL(): string; contentType(): ResourceType; contentEncoded(): Promise<...'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(159,5): error TS2322: Type 'StaticContentProvider' is not assignable to type '{ [x: string]: any; contentURL(): string; contentType(): ResourceType; contentEncoded(): Promise<...'.
   Property '_contentURL' does not exist on type '{ [x: string]: any; contentURL(): string; contentType(): ResourceType; contentEncoded(): Promise<...'.
-node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(167,15): error TS1055: Type 'Promise<SearchMatch[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(174,43): error TS2339: Property 'debuggerAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(190,33): error TS2694: Namespace 'Protocol' has no exported member 'Error'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(190,50): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
@@ -12752,11 +12081,8 @@ node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(203,54): error TS2
 node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(206,28): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(211,27): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(247,31): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
-node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(248,15): error TS1055: Type 'Promise<boolean>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(251,54): error TS2339: Property 'debuggerAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(253,35): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
-node_modules/chrome-devtools-frontend/front_end/sdk/SecurityOriginManager.js(26,24): error TS2569: Type 'Set<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/sdk/SecurityOriginManager.js(31,24): error TS2569: Type 'Set<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sdk/SecurityOriginManager.js(41,34): error TS2339: Property 'valuesArray' does not exist on type 'Set<string>'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServerTiming.js(20,41): error TS2694: Namespace 'NetworkRequest' has no exported member 'NameValue'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServerTiming.js(110,26): error TS2554: Expected 2 arguments, but got 1.
@@ -12773,16 +12099,11 @@ node_modules/chrome-devtools-frontend/front_end/sdk/ServerTiming.js(186,25): err
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(15,12): error TS2339: Property 'registerStorageDispatcher' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(20,31): error TS2339: Property 'cacheStorageAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(21,33): error TS2339: Property 'storageAgent' does not exist on type 'Target'.
-node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(55,23): error TS2569: Type 'IterableIterator<Cache>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(68,27): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(69,108): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
-node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(79,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(83,28): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(87,27): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(94,41): error TS2694: Namespace 'Protocol' has no exported member 'CacheStorage'.
-node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(105,23): error TS2569: Type 'IterableIterator<Cache>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(114,23): error TS2569: Type 'IterableIterator<Cache>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(135,26): error TS2569: Type 'IterableIterator<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(151,36): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(203,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(211,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
@@ -12792,12 +12113,8 @@ node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(2
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(332,34): error TS2694: Namespace 'Protocol' has no exported member 'CacheStorage'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(40,12): error TS2339: Property 'registerServiceWorkerDispatcher' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(42,26): error TS2339: Property 'serviceWorkerAgent' does not exist on type 'Target'.
-node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(80,30): error TS2569: Type 'IterableIterator<ServiceWorkerRegistration>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(101,25): error TS2569: Type 'IterableIterator<ServiceWorkerVersion>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(177,32): error TS2694: Namespace 'Protocol' has no exported member 'ServiceWorker'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(200,32): error TS2694: Namespace 'Protocol' has no exported member 'ServiceWorker'.
-node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(212,14): error TS2403: Subsequent variable declarations must have the same type.  Variable 'registration' must be of type 'ServiceWorkerRegistration', but here has type 'any'.
-node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(212,30): error TS2569: Type 'Set<ServiceWorkerRegistration>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(223,24): error TS2694: Namespace 'Protocol' has no exported member 'ServiceWorker'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(269,32): error TS2694: Namespace 'Protocol' has no exported member 'ServiceWorker'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(277,32): error TS2694: Namespace 'Protocol' has no exported member 'ServiceWorker'.
@@ -12819,9 +12136,7 @@ node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(405,
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(437,24): error TS2694: Namespace 'Protocol' has no exported member 'ServiceWorker'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(444,33): error TS2694: Namespace 'Protocol' has no exported member 'ServiceWorker'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(449,24): error TS2694: Namespace 'Protocol' has no exported member 'ServiceWorker'.
-node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(474,25): error TS2569: Type 'IterableIterator<ServiceWorkerVersion>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(480,24): error TS2694: Namespace 'Protocol' has no exported member 'ServiceWorker'.
-node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(499,25): error TS2569: Type 'IterableIterator<ServiceWorkerVersion>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(549,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(553,68): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, ServiceWorkerRegistration>'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(565,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
@@ -12879,8 +12194,6 @@ node_modules/chrome-devtools-frontend/front_end/sdk/Target.js(166,48): error TS2
 node_modules/chrome-devtools-frontend/front_end/sdk/Target.js(173,20): error TS1005: '>' expected.
 node_modules/chrome-devtools-frontend/front_end/sdk/Target.js(191,34): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Target.js(194,29): error TS2339: Property 'inspectedURLChanged' does not exist on type 'typeof InspectorFrontendHost'.
-node_modules/chrome-devtools-frontend/front_end/sdk/Target.js(209,23): error TS2569: Type 'IterableIterator<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/sdk/Target.js(223,23): error TS2569: Type 'IterableIterator<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sdk/Target.js(308,17): error TS1005: '>' expected.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(15,120): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(17,21): error TS1005: '>' expected.
@@ -12904,10 +12217,8 @@ node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(224,72): er
       Type 'this' is not assignable to type '{ [x: string]: any; targetAdded(target: Target): void; targetRemoved(target: Target): void; }'.
         Type 'TargetManager' is not assignable to type '{ [x: string]: any; targetAdded(target: Target): void; targetRemoved(target: Target): void; }'.
           Property 'targetAdded' is missing in type 'TargetManager'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(234,22): error TS2569: Type 'Map<symbol, { modelClass: Function; thisObject: any; listener: (arg0: any) => any; }[]>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(267,19): error TS2339: Property 'remove' does not exist on type 'Target[]'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(269,28): error TS2569: Type 'IterableIterator<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(276,22): error TS2569: Type 'Map<symbol, { modelClass: Function; thisObject: any; listener: (arg0: any) => any; }[]>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
+node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(279,34): error TS2345: Argument of type 'Function' is not assignable to parameter of type 'new (arg1: Target) => any'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(329,11): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ [x: string]: any; targetAdded(target: Target): void; targetRemoved(target: Target): void; } & T...'.
   Type 'this' is not assignable to type '{ [x: string]: any; targetAdded(target: Target): void; targetRemoved(target: Target): void; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(329,25): error TS2555: Expected at least 2 arguments, but got 1.
@@ -12932,7 +12243,6 @@ node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(406,18): er
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(414,31): error TS2339: Property 'setDevicesUpdatesEnabled' does not exist on type 'typeof InspectorFrontendHost'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(424,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(427,34): error TS2694: Namespace 'Adb' has no exported member 'Config'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(458,27): error TS2569: Type 'IterableIterator<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(483,24): error TS2694: Namespace 'Protocol' has no exported member 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(501,24): error TS2694: Namespace 'Protocol' has no exported member 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(530,24): error TS2694: Namespace 'Protocol' has no exported member 'Target'.
@@ -12957,8 +12267,6 @@ node_modules/chrome-devtools-frontend/front_end/sdk/TracingManager.js(119,20): e
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingManager.js(150,42): error TS2694: Namespace 'TracingManager' has no exported member 'EventPayload'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(77,34): error TS2694: Namespace 'TracingManager' has no exported member 'EventPayload'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(133,42): error TS2694: Namespace 'TracingManager' has no exported member 'EventPayload'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(145,25): error TS2569: Type 'IterableIterator<Process>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(162,27): error TS2569: Type 'IterableIterator<Process>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(179,34): error TS2694: Namespace 'TracingManager' has no exported member 'EventPayload'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(250,47): error TS2339: Property 'id' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(254,37): error TS2339: Property 'id' does not exist on type 'Event'.
@@ -12969,8 +12277,6 @@ node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(283,5): erro
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(283,65): error TS2339: Property 'valuesArray' does not exist on type 'Map<string | number, Process>'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(305,23): error TS2339: Property 'stableSort' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(308,49): error TS2345: Argument of type '{ [x: string]: any; Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: st...' is not assignable to parameter of type 'string'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(318,23): error TS2569: Type 'IterableIterator<AsyncEvent>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(326,28): error TS2569: Type 'IterableIterator<AsyncEvent[]>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(338,52): error TS2339: Property 'id' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(342,12): error TS2678: Type 'string' is not comparable to type '{ [x: string]: any; Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: st...'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(352,12): error TS2678: Type 'string' is not comparable to type '{ [x: string]: any; Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: st...'.
@@ -13088,7 +12394,6 @@ node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(458,38
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(459,24): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(471,23): error TS2339: Property 'Security' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(474,23): error TS2339: Property 'Security' does not exist on type 'typeof Protocol'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(496,29): error TS2569: Type 'IterableIterator<TreeElement>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(515,15): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(516,14): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(517,11): error TS2555: Expected at least 2 arguments, but got 1.
@@ -13172,7 +12477,6 @@ node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(871,25
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(872,25): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(873,25): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(879,43): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(880,16): error TS1251: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Class definitions are automatically in strict mode.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(883,47): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(885,47): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(891,38): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -13187,11 +12491,10 @@ node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(904,11
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(915,28): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(921,27): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(927,41): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(930,18): error TS1251: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Class definitions are automatically in strict mode.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(933,46): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(947,24): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(980,29): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/security_test_runner/SecurityTestRunner.js(21,29): error TS2495: Type 'NodeListOf<HTMLSpanElement>' is not an array type or a string type.
+node_modules/chrome-devtools-frontend/front_end/security_test_runner/SecurityTestRunner.js(21,29): error TS2488: Type 'NodeListOf<HTMLSpanElement>' must have a '[Symbol.iterator]()' method that returns an iterator.
 node_modules/chrome-devtools-frontend/front_end/security_test_runner/SecurityTestRunner.js(29,14): error TS2339: Property 'networkManager' does not exist on type 'typeof TestRunner'.
 node_modules/chrome-devtools-frontend/front_end/services/ServiceManager.js(20,50): error TS2345: Argument of type 'RemoteServicePort' is not assignable to parameter of type 'typeof ServicePort'.
   Type 'RemoteServicePort' provides no match for the signature '(): void'.
@@ -13201,8 +12504,6 @@ node_modules/chrome-devtools-frontend/front_end/services/ServiceManager.js(62,16
 node_modules/chrome-devtools-frontend/front_end/services/ServiceManager.js(65,29): error TS1005: '>' expected.
 node_modules/chrome-devtools-frontend/front_end/services/ServiceManager.js(94,18): error TS2339: Property 'close' does not exist on type 'typeof ServicePort'.
 node_modules/chrome-devtools-frontend/front_end/services/ServiceManager.js(106,23): error TS2339: Property 'send' does not exist on type 'typeof ServicePort'.
-node_modules/chrome-devtools-frontend/front_end/services/ServiceManager.js(144,26): error TS2569: Type 'IterableIterator<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/services/ServiceManager.js(147,25): error TS2569: Type 'IterableIterator<Service>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/services/ServiceManager.js(166,29): error TS1005: '>' expected.
 node_modules/chrome-devtools-frontend/front_end/services/ServiceManager.js(271,36): error TS2339: Property 'data' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/services/ServiceManager.js(321,7): error TS2554: Expected 1 arguments, but got 0.
@@ -13273,7 +12574,6 @@ node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(5
         Types of parameters 'debuggerModel' and 'model' are incompatible.
           Type 'T' is not assignable to type 'DebuggerModel'.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(70,35): error TS2339: Property 'remove' does not exist on type 'Map<DebuggerModel, SnippetScriptMapping>'.
-node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(93,25): error TS2569: Type 'IterableIterator<SnippetScriptMapping>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(113,5): error TS2322: Type 'SnippetsProject' is not assignable to type '{ [x: string]: any; workspace(): Workspace; id(): string; type(): string; isServiceProject(): boo...'.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(113,5): error TS2322: Type 'SnippetsProject' is not assignable to type '{ [x: string]: any; workspace(): Workspace; id(): string; type(): string; isServiceProject(): boo...'.
   Property '_model' does not exist on type '{ [x: string]: any; workspace(): Workspace; id(): string; type(): string; isServiceProject(): boo...'.
@@ -13282,7 +12582,6 @@ node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(1
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(165,36): error TS2339: Property 'remove' does not exist on type 'Map<UISourceCode, string>'.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(207,35): error TS2339: Property 'valuesArray' does not exist on type 'Map<DebuggerModel, SnippetScriptMapping>'.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(216,27): error TS2365: Operator '+' cannot be applied to types 'V' and '1'.
-node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(224,15): error TS1055: Type 'Promise<undefined>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(249,46): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(260,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(280,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
@@ -13290,20 +12589,11 @@ node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(2
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(329,35): error TS2339: Property 'valuesArray' does not exist on type 'Map<DebuggerModel, SnippetScriptMapping>'.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(379,33): error TS2339: Property 'remove' does not exist on type 'Map<UISourceCode, Script>'.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(380,42): error TS2339: Property 'remove' does not exist on type 'Map<UISourceCode, number>'.
-node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(518,15): error TS1055: Type 'Promise<SearchMatch[]>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(534,35): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ [x: string]: any; Debugger: string; Formatter: string; Network: string; Snippets: string; FileS...'.
-node_modules/chrome-devtools-frontend/front_end/snippets/SnippetStorage.js(47,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/snippets/SnippetStorage.js(53,25): error TS2569: Type 'IterableIterator<Snippet>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/snippets/SnippetStorage.js(55,31): error TS2345: Argument of type 'any[]' is not assignable to parameter of type 'V'.
 node_modules/chrome-devtools-frontend/front_end/snippets/SnippetStorage.js(62,27): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, Snippet>'.
-node_modules/chrome-devtools-frontend/front_end/snippets/SnippetStorage.js(78,25): error TS2569: Type 'IterableIterator<Snippet>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/snippets/SnippetStorage.js(87,39): error TS2339: Property 'length' does not exist on type 'V'.
 node_modules/chrome-devtools-frontend/front_end/snippets/SnippetStorage.js(103,18): error TS2365: Operator '+' cannot be applied to types 'V' and '1'.
-node_modules/chrome-devtools-frontend/front_end/snippets/SnippetStorage.js(150,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/snippets/SnippetStorage.js(157,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/snippets/SnippetStorage.js(164,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/snippets/SnippetStorage.js(175,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/snippets/SnippetStorage.js(182,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/snippets/SnippetsQuickOpen.js(30,12): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/source_frame/FontView.js(38,11): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/source_frame/FontView.js(52,5): error TS2322: Type 'ToolbarText[]' is not assignable to type '({ [x: string]: any; item(): any & ToolbarItem; } & ToolbarItem)[]'.
@@ -13357,10 +12647,8 @@ node_modules/chrome-devtools-frontend/front_end/source_frame/JSONView.js(66,47):
 node_modules/chrome-devtools-frontend/front_end/source_frame/JSONView.js(165,28): error TS2339: Property 'setSearchRegex' does not exist on type 'TreeElement'.
 node_modules/chrome-devtools-frontend/front_end/source_frame/JSONView.js(170,23): error TS2339: Property 'setSearchRegex' does not exist on type 'TreeElement'.
 node_modules/chrome-devtools-frontend/front_end/source_frame/JSONView.js(170,60): error TS2339: Property 'highlightedCurrentSearchResultClassName' does not exist on type 'typeof UI'.
-node_modules/chrome-devtools-frontend/front_end/source_frame/PreviewFactory.js(9,16): error TS1055: Type 'Promise<Widget>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/source_frame/PreviewFactory.js(14,33): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/source_frame/ResourceSourceFrame.js(51,35): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/source_frame/ResourceSourceFrame.js(57,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/source_frame/ResourceSourceFrame.js(69,5): error TS2554: Expected 3 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(15,22): error TS2339: Property 'installGutter' does not exist on type 'CodeMirrorTextEditor'.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(50,11): error TS2365: Operator '===' cannot be applied to types '{ [x: string]: any; Insert: symbol; Delete: symbol; Modify: symbol; }' and 'symbol'.
@@ -13385,10 +12673,7 @@ node_modules/chrome-devtools-frontend/front_end/source_frame/SourceFrame.js(115,
   Type 'ToolbarText' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; } & ToolbarItem'.
     Type 'ToolbarText' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; }'.
       Property 'item' is missing in type 'ToolbarText'.
-node_modules/chrome-devtools-frontend/front_end/source_frame/SourceFrame.js(118,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/source_frame/SourceFrame.js(122,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceFrame.js(371,32): error TS2339: Property 'lowerBound' does not exist on type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/source_frame/SourceFrame.js(407,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceFrame.js(435,15): error TS2339: Property '__fromRegExpQuery' does not exist on type 'RegExp'.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceFrame.js(459,15): error TS2339: Property '__fromRegExpQuery' does not exist on type 'RegExp'.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceFrame.js(472,36): error TS2339: Property 'lowerBound' does not exist on type 'TextRange[]'.
@@ -13524,7 +12809,6 @@ node_modules/chrome-devtools-frontend/front_end/sources/AdvancedSearchView.js(29
 node_modules/chrome-devtools-frontend/front_end/sources/AdvancedSearchView.js(318,19): error TS2339: Property 'keyCode' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/AdvancedSearchView.js(331,36): error TS2345: Argument of type '{ query: string; ignoreCase: boolean; isRegex: boolean; }' is not assignable to parameter of type 'V'.
 node_modules/chrome-devtools-frontend/front_end/sources/AdvancedSearchView.js(335,63): error TS2345: Argument of type 'V' is not assignable to parameter of type '{ query: string; ignoreCase: boolean; isRegex: boolean; }'.
-node_modules/chrome-devtools-frontend/front_end/sources/AdvancedSearchView.js(369,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sources/AdvancedSearchView.js(397,46): error TS2339: Property 'window' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(84,13): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(102,19): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
@@ -13551,13 +12835,11 @@ node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(44,17): error TS2315: Type 'ListControl' is not generic.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(44,62): error TS2694: Namespace 'CallStackSidebarPane' has no exported member 'Item'.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(45,56): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ [x: string]: any; NonViewport: symbol; EqualHeightItems: symbol; VariousHeightItems: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(78,15): error TS1055: Type 'Promise<undefined>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(137,21): error TS2345: Argument of type '{ asyncStackHeader: string; }' is not assignable to parameter of type '{ debuggerCallFrame: CallFrame; debuggerModel: DebuggerModel; }'.
   Object literal may only specify known properties, and 'asyncStackHeader' does not exist in type '{ debuggerCallFrame: CallFrame; debuggerModel: DebuggerModel; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(163,13): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(182,44): error TS2694: Namespace 'CallStackSidebarPane' has no exported member 'Item'.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(187,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(200,16): error TS1251: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Class definitions are automatically in strict mode.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(209,33): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(219,44): error TS2694: Namespace 'CallStackSidebarPane' has no exported member 'Item'.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(229,44): error TS2694: Namespace 'CallStackSidebarPane' has no exported member 'Item'.
@@ -13602,8 +12884,6 @@ node_modules/chrome-devtools-frontend/front_end/sources/EventListenerBreakpoints
 node_modules/chrome-devtools-frontend/front_end/sources/EventListenerBreakpointsSidebarPane.js(15,74): error TS2694: Namespace 'EventListenerBreakpointsSidebarPane' has no exported member 'Item'.
 node_modules/chrome-devtools-frontend/front_end/sources/EventListenerBreakpointsSidebarPane.js(24,113): error TS2694: Namespace 'EventListenerBreakpointsSidebarPane' has no exported member 'Item'.
 node_modules/chrome-devtools-frontend/front_end/sources/EventListenerBreakpointsSidebarPane.js(57,33): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/sources/EventListenerBreakpointsSidebarPane.js(93,28): error TS2569: Type 'IterableIterator<EventListenerBreakpoint>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/sources/EventListenerBreakpointsSidebarPane.js(110,23): error TS2569: Type 'IterableIterator<EventListenerBreakpoint>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sources/EventListenerBreakpointsSidebarPane.js(125,64): error TS1003: Identifier expected.
 node_modules/chrome-devtools-frontend/front_end/sources/EventListenerBreakpointsSidebarPane.js(126,45): error TS2300: Duplicate identifier 'Item'.
 node_modules/chrome-devtools-frontend/front_end/sources/EventListenerBreakpointsSidebarPane.js(126,45): error TS2339: Property 'Item' does not exist on type 'typeof EventListenerBreakpointsSidebarPane'.
@@ -13663,7 +12943,6 @@ node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(138,37): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(141,55): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(143,34): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(187,28): error TS2569: Type 'Set<BreakpointDecoration>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(218,13): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(220,13): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(223,13): error TS2555: Expected at least 2 arguments, but got 1.
@@ -13677,13 +12956,11 @@ node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(285,38): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(296,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(309,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(335,28): error TS2569: Type 'Set<BreakpointDecoration>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(345,56): error TS2339: Property 'valuesArray' does not exist on type 'Map<DebuggerModel, ResourceScriptFile>'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(380,19): error TS2694: Namespace 'UI' has no exported member 'PopoverRequest'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(491,15): error TS2339: Property 'consume' does not exist on type 'KeyboardEvent'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(517,37): error TS2339: Property 'enclosingNodeOrSelfWithClass' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(545,11): error TS2339: Property 'consume' does not exist on type 'MouseEvent'.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(549,28): error TS2569: Type 'IterableIterator<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(564,33): error TS2339: Property 'isAncestor' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(611,34): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(612,34): error TS2339: Property 'select' does not exist on type 'Element'.
@@ -13697,12 +12974,10 @@ node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(793,15): error TS2339: Property 'type' does not exist on type 'never'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(796,15): error TS2339: Property 'type' does not exist on type 'never'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(796,48): error TS2339: Property 'type' does not exist on type 'never'.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(872,24): error TS2569: Type 'IterableIterator<number>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(888,5): error TS2554: Expected 1 arguments, but got 2.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(890,7): error TS2554: Expected 1 arguments, but got 2.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(938,14): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(939,14): error TS2339: Property '__nameToToken' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(942,24): error TS2569: Type 'Set<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(948,18): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(949,36): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(950,16): error TS2339: Property '__nameToToken' does not exist on type 'Element'.
@@ -13712,12 +12987,8 @@ node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(969,32): error TS2339: Property '__nameToToken' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(969,65): error TS2339: Property '__nameToToken' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(974,49): error TS2339: Property '__nameToToken' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1003,24): error TS2569: Type 'IterableIterator<number>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1013,30): error TS2569: Type 'IterableIterator<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1036,67): error TS2339: Property 'lineNumber' does not exist on type '{ lineNumber: number; columnNumber: number; } | {}'.
   Property 'lineNumber' does not exist on type '{}'.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1045,28): error TS2569: Type 'Set<BreakpointDecoration>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1079,30): error TS2569: Type 'Set<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1150,11): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1152,17): error TS2339: Property 'shiftKey' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1169,11): error TS2339: Property 'consume' does not exist on type 'Event'.
@@ -13805,7 +13076,6 @@ node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(1023,17
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(1024,28): error TS2345: Argument of type 'Element[]' is not assignable to parameter of type 'Icon[]'.
   Type 'Element' is not assignable to type 'Icon'.
     Property 'createdCallback' is missing in type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(1037,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(1045,26): error TS2339: Property 'draggable' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(1055,51): error TS2339: Property 'hasFocus' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(1190,14): error TS2339: Property 'parent' does not exist on type 'NavigatorTreeNode'.
@@ -13880,31 +13150,19 @@ node_modules/chrome-devtools-frontend/front_end/sources/SourceFormatter.js(36,47
 node_modules/chrome-devtools-frontend/front_end/sources/SourceFormatter.js(48,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceFormatter.js(55,32): error TS2339: Property 'remove' does not exist on type 'Map<UISourceCode, { promise: Promise<SourceFormatData>; formatData: SourceFormatData; }>'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceFormatter.js(67,32): error TS2339: Property 'remove' does not exist on type 'Map<UISourceCode, { promise: Promise<SourceFormatData>; formatData: SourceFormatData; }>'.
-node_modules/chrome-devtools-frontend/front_end/sources/SourceFormatter.js(91,15): error TS1055: Type 'Promise<SourceFormatData>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(33,33): error TS2339: Property 'Debugger' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(55,5): error TS2322: Type 'Promise<{ name: string; offset: number; }[]>' is not assignable to type 'Promise<Identifier[]>'.
   Type '{ name: string; offset: number; }[]' is not assignable to type 'Identifier[]'.
     Type '{ name: string; offset: number; }' is not assignable to type 'Identifier'.
       Property 'lineNumber' is missing in type '{ name: string; offset: number; }'.
-node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(206,32): error TS2569: Type 'IterableIterator<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(304,37): error TS2339: Property 'inverse' does not exist on type 'Map<string, string>'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(322,32): error TS2694: Namespace 'RuntimeModel' has no exported member 'EvaluationResult'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(338,33): error TS2339: Property 'Debugger' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(361,25): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(369,25): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(371,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(379,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(387,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(395,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(403,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(411,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(417,25): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(419,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(482,31): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(484,15): error TS1055: Type 'Promise<string>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
-node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(496,30): error TS2569: Type 'IterableIterator<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(516,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(517,15): error TS1055: Type 'Promise<string>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(525,39): error TS1110: Type expected.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(526,31): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(535,39): error TS1110: Type expected.
@@ -13964,7 +13222,6 @@ node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(277,20):
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(289,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(313,27): error TS2339: Property 'bringToFront' does not exist on type 'typeof InspectorFrontendHost'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(330,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(343,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(356,44): error TS2339: Property '_instance' does not exist on type 'typeof WrapperView'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(356,90): error TS2339: Property '_instance' does not exist on type 'typeof WrapperView'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(366,42): error TS2339: Property '_instance' does not exist on type 'typeof WrapperView'.
@@ -14065,8 +13322,6 @@ node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js
 node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(73,70): error TS2345: Argument of type 'V' is not assignable to parameter of type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(77,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(109,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(119,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(126,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(201,50): error TS2339: Property 'textEditor' does not exist on type 'Widget'.
 node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(203,23): error TS2339: Property 'textEditor' does not exist on type 'Widget'.
 node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(205,23): error TS2339: Property 'textEditor' does not exist on type 'Widget'.
@@ -14122,12 +13377,9 @@ node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(112
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(113,28): error TS2339: Property 'addEventListener' does not exist on type 'UISourceCode'.
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(114,28): error TS2339: Property 'addEventListener' does not exist on type 'UISourceCode'.
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(116,28): error TS2339: Property 'addEventListener' does not exist on type 'UISourceCode'.
-node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(192,25): error TS2569: Type 'Set<Message>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(204,19): error TS2339: Property 'addAll' does not exist on type 'Set<Message>'.
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(229,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(239,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(276,25): error TS2569: Type 'Set<Message>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(282,25): error TS2569: Type 'Set<Message>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(374,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(402,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(434,19): error TS2694: Namespace 'UI' has no exported member 'PopoverRequest'.
@@ -14135,7 +13387,6 @@ node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(437
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(438,22): error TS2339: Property 'enclosingNodeOrSelfWithClass' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(443,29): error TS2339: Property 'clientX' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(443,44): error TS2339: Property 'clientY' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(456,24): error TS2569: Type 'IterableIterator<RowMessageBucket>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(461,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(469,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(483,10): error TS2339: Property 'runtime' does not exist on type 'Window'.
@@ -14245,7 +13496,6 @@ node_modules/chrome-devtools-frontend/front_end/sources/XHRBreakpointsSidebarPan
 node_modules/chrome-devtools-frontend/front_end/sources/XHRBreakpointsSidebarPane.js(158,45): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/XHRBreakpointsSidebarPane.js(159,45): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/XHRBreakpointsSidebarPane.js(186,41): error TS2339: Property '_checkboxElement' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/sources/XHRBreakpointsSidebarPane.js(226,21): error TS2569: Type 'IterableIterator<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/sources_test_runner/BreakpointManagerTestRunner.js(13,21): error TS2339: Property 'testTargetManager' does not exist on type 'typeof SourcesTestRunner'.
 node_modules/chrome-devtools-frontend/front_end/sources_test_runner/BreakpointManagerTestRunner.js(14,21): error TS2339: Property 'testWorkspace' does not exist on type 'typeof SourcesTestRunner'.
 node_modules/chrome-devtools-frontend/front_end/sources_test_runner/BreakpointManagerTestRunner.js(15,21): error TS2339: Property 'testNetworkProjectManager' does not exist on type 'typeof SourcesTestRunner'.
@@ -14475,7 +13725,6 @@ node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(76,8):
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(117,18): error TS1099: Type argument list cannot be empty.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(117,19): error TS1005: '>' expected.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(117,19): error TS8024: JSDoc '@param' tag has name 'function', but there is no parameter with that name.
-node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(204,13): error TS1055: Type 'Promise<undefined>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(208,14): error TS2339: Property 'runtime' does not exist on type 'Window'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(287,22): error TS2339: Property 'traverseNextNode' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(288,31): error TS2339: Property 'traverseNextNode' does not exist on type 'Node'.
@@ -14526,19 +13775,15 @@ node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(351,14
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(352,14): error TS2339: Property 'serviceWorkerManager' does not exist on type 'typeof TestRunner'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(353,14): error TS2339: Property 'tracingManager' does not exist on type 'typeof TestRunner'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(354,14): error TS2339: Property 'mainTarget' does not exist on type 'typeof TestRunner'.
-node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(359,13): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(363,21): error TS2339: Property 'runtimeModel' does not exist on type 'typeof TestRunner'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(363,62): error TS2339: Property 'result' does not exist on type '{ response: RemoteObject; }'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(372,42): error TS2339: Property 'result' does not exist on type '{ response: RemoteObject; }'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(372,65): error TS2339: Property 'exceptionDetails' does not exist on type '{ response: RemoteObject; }'.
-node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(380,13): error TS1055: Type 'Promise<{ response: RemoteObject; }>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(381,2): error TS1131: Property or signature expected.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(398,35): error TS2339: Property 'RuntimeAgent' does not exist on type 'typeof TestRunner'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(399,33): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
-node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(412,13): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(415,35): error TS2339: Property 'RuntimeAgent' does not exist on type 'typeof TestRunner'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(416,26): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
-node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(434,13): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(437,35): error TS2339: Property 'RuntimeAgent' does not exist on type 'typeof TestRunner'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(440,33): error TS2339: Property 'Error' does not exist on type 'typeof Protocol'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(473,32): error TS2339: Property 'runtimeModel' does not exist on type 'typeof TestRunner'.
@@ -14582,7 +13827,6 @@ node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1035,1
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1035,19): error TS1005: '>' expected.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1035,19): error TS8024: JSDoc '@param' tag has name 'function', but there is no parameter with that name.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1129,21): error TS2339: Property 'resourceTreeModel' does not exist on type 'typeof TestRunner'.
-node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1144,15): error TS1055: Type 'Promise<boolean>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1192,15): error TS2339: Property 'runtime' does not exist on type 'Window'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1203,19): error TS2339: Property 'naturalOrderComparator' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1249,23): error TS2694: Namespace 'Workspace' has no exported member 'projectTypes'.
@@ -14644,7 +13888,6 @@ node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(1038,34): error TS2694: Namespace 'CodeMirror' has no exported member 'ChangeObject'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(1052,23): error TS2339: Property 'valuesArray' does not exist on type 'Multimap'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(1053,23): error TS2339: Property 'clear' does not exist on type 'Multimap'.
-node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(1244,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(1261,5): error TS2322: Type 'CodeMirrorPositionHandle' is not assignable to type '{ [x: string]: any; resolve(): { lineNumber: number; columnNumber: number; }; equal(positionHandl...'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(1261,5): error TS2322: Type 'CodeMirrorPositionHandle' is not assignable to type '{ [x: string]: any; resolve(): { lineNumber: number; columnNumber: number; }; equal(positionHandl...'.
   Property '_codeMirror' does not exist on type '{ [x: string]: any; resolve(): { lineNumber: number; columnNumber: number; }; equal(positionHandl...'.
@@ -14736,7 +13979,6 @@ node_modules/chrome-devtools-frontend/front_end/text_utils/Text.js(122,16): erro
 node_modules/chrome-devtools-frontend/front_end/text_utils/Text.js(122,16): error TS2339: Property 'Position' does not exist on type 'typeof Text'.
 node_modules/chrome-devtools-frontend/front_end/text_utils/Text.js(160,42): error TS2339: Property 'lowerBound' does not exist on type 'number[]'.
 node_modules/chrome-devtools-frontend/front_end/text_utils/TextRange.js(84,31): error TS2339: Property 'computeLineEndings' does not exist on type 'string'.
-node_modules/chrome-devtools-frontend/front_end/text_utils/TextRange.js(131,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/text_utils/TextUtils.js(30,11): error TS2339: Property 'TextUtils' does not exist on type 'typeof TextUtils'.
 node_modules/chrome-devtools-frontend/front_end/text_utils/TextUtils.js(45,23): error TS2339: Property 'TextUtils' does not exist on type 'typeof TextUtils'.
 node_modules/chrome-devtools-frontend/front_end/text_utils/TextUtils.js(45,64): error TS2339: Property 'TextUtils' does not exist on type 'typeof TextUtils'.
@@ -14790,6 +14032,7 @@ node_modules/chrome-devtools-frontend/front_end/timeline/CountersGraph.js(379,28
 node_modules/chrome-devtools-frontend/front_end/timeline/CountersGraph.js(380,28): error TS2339: Property 'borderColor' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/CountersGraph.js(383,45): error TS2345: Argument of type 'ToolbarSettingCheckbox' is not assignable to parameter of type '{ [x: string]: any; item(): any & ToolbarItem; } & ToolbarItem'.
   Type 'ToolbarSettingCheckbox' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; }'.
+    Property 'item' is missing in type 'ToolbarSettingCheckbox'.
 node_modules/chrome-devtools-frontend/front_end/timeline/CountersGraph.js(384,40): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/CountersGraph.js(394,50): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/CountersGraph.js(414,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
@@ -14808,6 +14051,7 @@ node_modules/chrome-devtools-frontend/front_end/timeline/EventsTimelineTreeView.
   Type 'ToolbarComboBox' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/EventsTimelineTreeView.js(176,33): error TS2345: Argument of type 'ToolbarCheckbox' is not assignable to parameter of type '{ [x: string]: any; item(): any & ToolbarItem; } & ToolbarItem'.
   Type 'ToolbarCheckbox' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; }'.
+    Property 'item' is missing in type 'ToolbarCheckbox'.
 node_modules/chrome-devtools-frontend/front_end/timeline/EventsTimelineTreeView.js(183,56): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceModel.js(57,51): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ [x: string]: any; animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceModel.js(57,89): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ [x: string]: any; animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
@@ -14858,7 +14102,6 @@ node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(4
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(456,69): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ [x: string]: any; Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(479,36): error TS2345: Argument of type 'string[]' is not assignable to parameter of type 'V'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(484,51): error TS2694: Namespace 'PerformanceMonitor' has no exported member 'ChartInfo'.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(502,22): error TS2569: Type 'IterableIterator<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(517,43): error TS2694: Namespace 'PerformanceMonitor' has no exported member 'ChartInfo'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(526,27): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(539,43): error TS2694: Namespace 'PerformanceMonitor' has no exported member 'ChartInfo'.
@@ -14884,7 +14127,6 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(38,38): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(42,38): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(46,38): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(59,22): error TS2569: Type 'IterableIterator<TimelineTreeView>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(118,12): error TS2678: Type 'string' is not comparable to type '{ [x: string]: any; Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(124,12): error TS2678: Type 'string' is not comparable to type '{ [x: string]: any; Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(130,22): error TS2339: Property 'showLayerTree' does not exist on type 'Widget'.
@@ -14926,7 +14168,7 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataP
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(111,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(119,9): error TS2365: Operator '===' cannot be applied to types '{ [x: string]: any; Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symb...' and 'symbol'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(123,9): error TS2365: Operator '===' cannot be applied to types '{ [x: string]: any; Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symb...' and 'symbol'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(140,27): error TS2339: Property '_blackboxRoot' does not exist on type 'Event | Frame | TimelineFrame | { [x: string]: any; Idle: string; Response: string; Scroll: strin...'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(140,27): error TS2339: Property '_blackboxRoot' does not exist on type 'Event | { [x: string]: any; Idle: string; Response: string; Scroll: string; Fling: string; Drag: ...'.
   Property '_blackboxRoot' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(155,133): error TS2694: Namespace 'TimelineIRModel' has no exported member 'Phases'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(159,64): error TS2694: Namespace 'TimelineFlameChartDataProvider' has no exported member 'EntryType'.
@@ -15052,7 +14294,6 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartView.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartView.js(434,24): error TS2694: Namespace 'Timeline' has no exported member 'TimelineMarkerStyle'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartView.js(463,28): error TS2339: Property 'millisToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(68,26): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(73,15): error TS1055: Type 'Promise<PerformanceModel>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(106,27): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(144,14): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(164,64): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
@@ -15150,6 +14391,7 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(245,42
   Type 'ToolbarToggle' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(251,42): error TS2345: Argument of type 'ToolbarSettingToggle' is not assignable to parameter of type '{ [x: string]: any; item(): any & ToolbarItem; } & ToolbarItem'.
   Type 'ToolbarSettingToggle' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; }'.
+    Property 'item' is missing in type 'ToolbarSettingToggle'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(257,67): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(274,9): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(277,9): error TS2555: Expected at least 2 arguments, but got 1.
@@ -15235,6 +14477,7 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(133
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(134,46): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(136,31): error TS2345: Argument of type 'ToolbarInput' is not assignable to parameter of type '{ [x: string]: any; item(): any & ToolbarItem; } & ToolbarItem'.
   Type 'ToolbarInput' is not assignable to type '{ [x: string]: any; item(): any & ToolbarItem; }'.
+    Property 'item' is missing in type 'ToolbarInput'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(162,76): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(170,38): error TS2345: Argument of type '0' is not assignable to parameter of type 'V'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(173,52): error TS2555: Expected at least 2 arguments, but got 1.
@@ -15245,8 +14488,6 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(230
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(231,16): error TS2339: Property 'reveal' does not exist on type 'GridNode'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(232,16): error TS2339: Property 'select' does not exist on type 'GridNode'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(241,20): error TS2339: Property 'rootNode' does not exist on type 'SortableDataGrid'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(251,23): error TS2569: Type 'IterableIterator<Node>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(255,23): error TS2569: Type 'IterableIterator<Node>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(258,34): error TS2345: Argument of type 'TreeGridNode' is not assignable to parameter of type 'NODE_TYPE'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(286,40): error TS2694: Namespace 'DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(289,38): error TS2555: Expected at least 2 arguments, but got 1.
@@ -15272,7 +14513,6 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(515
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(523,21): error TS2339: Property 'createTD' does not exist on type 'GridNode'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(579,21): error TS2339: Property 'createTD' does not exist on type 'GridNode'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(610,10): error TS2339: Property 'setHasChildren' does not exist on type 'TreeGridNode'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(623,22): error TS2569: Type 'IterableIterator<Node>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(626,31): error TS2345: Argument of type 'TreeGridNode' is not assignable to parameter of type 'NODE_TYPE'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(676,35): error TS2339: Property 'rootNode' does not exist on type 'SortableDataGrid'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(696,14): error TS2555: Expected at least 2 arguments, but got 1.
@@ -15500,7 +14740,6 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(703,
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(707,19): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(716,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'url' must be of type 'string', but here has type 'any'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(721,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'url' must be of type 'string', but here has type 'any'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(763,15): error TS1055: Type 'Promise<DocumentFragment>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(807,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'url' must be of type 'string', but here has type 'any'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(815,35): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(815,73): error TS2339: Property 'millisToString' does not exist on type 'NumberConstructor'.
@@ -15563,7 +14802,6 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1058
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1058,92): error TS2339: Property 'millisToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1075,43): error TS2339: Property 'lowerBound' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1076,42): error TS2339: Property 'lowerBound' does not exist on type 'Event[]'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1183,15): error TS1055: Type 'Promise<DocumentFragment>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1190,30): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1194,38): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1197,35): error TS2555: Expected at least 2 arguments, but got 1.
@@ -15608,7 +14846,6 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1403
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1412,13): error TS2339: Property 'addAll' does not exist on type 'Set<number>'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1431,24): error TS2339: Property 'binaryIndexOf' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1452,39): error TS2345: Argument of type '{ [x: string]: any; Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: st...' is not assignable to parameter of type 'string'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1467,15): error TS1055: Type 'Promise<Element>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1481,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1483,41): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1484,39): error TS2555: Expected at least 2 arguments, but got 1.
@@ -15697,8 +14934,6 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(2057
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(2059,21): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(2078,23): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(2078,39): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(2126,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(2133,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(2146,2): error TS1131: Property or signature expected.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(2154,10): error TS2551: Property 'TimelineMarkerStyle' does not exist on type 'typeof Timeline'. Did you mean 'TimelineRecordStyle'?
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(2167,15): error TS2339: Property 'colSpan' does not exist on type 'Element'.
@@ -15721,7 +14956,6 @@ node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineFrameMode
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineFrameModel.js(223,43): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineFrameModel.js(266,9): error TS2365: Operator '===' cannot be applied to types '{ [x: string]: any; Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: st...' and 'string'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineFrameModel.js(267,24): error TS2339: Property 'id' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineFrameModel.js(364,15): error TS1055: Type 'Promise<TracingLayerTree>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(14,46): error TS2694: Namespace 'TimelineIRModel' has no exported member 'Phases'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(61,14): error TS2678: Type 'string' is not comparable to type '{ [x: string]: any; Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingS...'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(62,61): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ [x: string]: any; Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; ...'.
@@ -15831,7 +15065,6 @@ node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(836,7): error TS2322: Type 'symbol' is not assignable to type '{ [x: string]: any; animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(855,48): error TS2694: Namespace 'TimelineModel' has no exported member 'AsyncEventGroup'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(856,48): error TS2694: Namespace 'TimelineModel' has no exported member 'AsyncEventGroup'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(859,23): error TS2569: Type 'IterableIterator<{ [x: string]: any; animation: symbol; console: symbol; userTiming: symbol; inpu...' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(861,23): error TS2339: Property 'mergeOrdered' does not exist on type 'AsyncEvent[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(883,50): error TS2694: Namespace 'TimelineModel' has no exported member 'AsyncEventGroup'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(940,49): error TS2694: Namespace 'TimelineModel' has no exported member 'AsyncEventGroup'.
@@ -15841,18 +15074,17 @@ node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1423,31): error TS2694: Namespace 'TimelineModel' has no exported member 'InvalidationCause'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1433,82): error TS1003: Identifier expected.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1434,15): error TS2339: Property 'InvalidationCause' does not exist on type 'typeof TimelineModel'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1524,30): error TS2495: Type 'Iterator<InvalidationTrackingEvent>' is not an array type or a string type.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1524,30): error TS2488: Type 'Iterator<InvalidationTrackingEvent>' must have a '[Symbol.iterator]()' method that returns an iterator.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1532,22): error TS2339: Property 'linkedRecalcStyleEvent' does not exist on type 'InvalidationTrackingEvent'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1548,18): error TS2339: Property 'linkedRecalcStyleEvent' does not exist on type 'InvalidationTrackingEvent'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1600,23): error TS2339: Property 'linkedRecalcStyleEvent' does not exist on type 'InvalidationTrackingEvent'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1609,30): error TS2495: Type 'Iterator<InvalidationTrackingEvent>' is not an array type or a string type.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1642,30): error TS2495: Type 'Iterator<InvalidationTrackingEvent>' is not an array type or a string type.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1609,30): error TS2488: Type 'Iterator<InvalidationTrackingEvent>' must have a '[Symbol.iterator]()' method that returns an iterator.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1642,30): error TS2488: Type 'Iterator<InvalidationTrackingEvent>' must have a '[Symbol.iterator]()' method that returns an iterator.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1707,50): error TS2694: Namespace 'TimelineModel' has no exported member 'RecordType'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1709,67): error TS2339: Property '_asyncEvents' does not exist on type 'typeof TimelineAsyncEventTracker'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1714,49): error TS2339: Property '_asyncEvents' does not exist on type 'typeof TimelineAsyncEventTracker'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1730,45): error TS2339: Property '_asyncEvents' does not exist on type 'typeof TimelineAsyncEventTracker'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1732,45): error TS2339: Property '_typeToInitiator' does not exist on type 'typeof TimelineAsyncEventTracker'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1733,23): error TS2569: Type 'Map<any, any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1736,49): error TS2339: Property '_typeToInitiator' does not exist on type 'typeof TimelineAsyncEventTracker'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1744,65): error TS2339: Property '_typeToInitiator' does not exist on type 'typeof TimelineAsyncEventTracker'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1745,13): error TS2352: Type 'string' cannot be converted to type '{ [x: string]: any; Task: string; Program: string; EventDispatch: string; GPUTask: string; Animat...'.
@@ -15870,7 +15102,6 @@ node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModelFilt
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModelFilter.js(42,7): error TS2322: Type 'string' is not assignable to type '{ [x: string]: any; Task: string; Program: string; EventDispatch: string; GPUTask: string; Animat...'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModelFilter.js(43,22): error TS1110: Type expected.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModelFilter.js(62,38): error TS2345: Argument of type '{ [x: string]: any; Task: string; Program: string; EventDispatch: string; GPUTask: string; Animat...' is not assignable to parameter of type 'string'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTree.js(62,23): error TS2569: Type 'IterableIterator<Node>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTree.js(68,49): error TS2506: 'TopDownNode' is referenced directly or indirectly in its own base expression.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTree.js(105,48): error TS2339: Property '_isGroupNode' does not exist on type 'TopDownNode'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTree.js(168,31): error TS2345: Argument of type 'string | symbol' is not assignable to parameter of type 'string'.
@@ -15879,8 +15110,6 @@ node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTr
   Type 'symbol' is not assignable to type 'string'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTree.js(218,53): error TS2506: 'TopDownRootNode' is referenced directly or indirectly in its own base expression.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTree.js(273,54): error TS2506: 'BottomUpRootNode' is referenced directly or indirectly in its own base expression.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTree.js(359,22): error TS2569: Type 'Map<string, Node>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTree.js(376,22): error TS2569: Type 'IterableIterator<Node>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTree.js(391,47): error TS2506: 'GroupNode' is referenced directly or indirectly in its own base expression.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTree.js(411,10): error TS2339: Property 'selfTime' does not exist on type 'GroupNode'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTree.js(412,10): error TS2339: Property 'totalTime' does not exist on type 'GroupNode'.
@@ -15907,7 +15136,6 @@ node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(38,45): error TS2694: Namespace 'TimelineModel' has no exported member 'TracingLayerTile'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(44,29): error TS2694: Namespace 'TimelineModel' has no exported member 'TracingLayerPayload'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(45,36): error TS2694: Namespace 'TimelineModel' has no exported member 'TracingLayerPayload'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(47,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(81,37): error TS2694: Namespace 'TimelineModel' has no exported member 'TracingLayerTile'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(91,29): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(97,39): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
@@ -15961,7 +15189,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(418,83): error
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(420,46): error TS2339: Property 'ownerDocument' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(422,29): error TS2339: Property 'showContextMenuAtPoint' does not exist on type 'typeof InspectorFrontendHost'.
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(422,101): error TS2339: Property 'ownerDocument' does not exist on type 'EventTarget'.
-node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(427,16): error TS1251: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Class definitions are automatically in strict mode.
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(450,49): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'ContextMenuDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(453,57): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'ContextMenuDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(457,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
@@ -15978,7 +15205,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/Dialog.js(67,15): error TS233
 node_modules/chrome-devtools-frontend/front_end/ui/Dialog.js(80,22): error TS2339: Property '_instance' does not exist on type 'typeof Dialog'.
 node_modules/chrome-devtools-frontend/front_end/ui/Dialog.js(91,43): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/Dialog.js(101,49): error TS2339: Property 'traverseNextNode' does not exist on type 'Document'.
-node_modules/chrome-devtools-frontend/front_end/ui/Dialog.js(114,25): error TS2569: Type 'IterableIterator<HTMLElement>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/ui/Dialog.js(123,38): error TS2339: Property 'keyCode' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/Dialog.js(124,13): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/DropTarget.js(36,13): error TS2339: Property 'consume' does not exist on type 'Event'.
@@ -15991,7 +15217,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/DropTarget.js(75,11): error T
 node_modules/chrome-devtools-frontend/front_end/ui/DropTarget.js(78,30): error TS2339: Property 'dataTransfer' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/DropTarget.js(85,11): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/EmptyWidget.js(42,41): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/ui/EmptyWidget.js(57,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(46,94): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(83,28): error TS2345: Argument of type 'true' is not assignable to parameter of type 'V'.
 node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(87,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
@@ -16045,7 +15270,7 @@ node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(166,103): error T
 node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(171,22): error TS2339: Property 'classList' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(174,21): error TS2339: Property 'remove' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(179,27): error TS2694: Namespace 'Fragment' has no exported member '_Template'.
-node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(247,24): error TS2495: Type 'NodeListOf<Element>' is not an array type or a string type.
+node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(247,24): error TS2488: Type 'NodeListOf<Element>' must have a '[Symbol.iterator]()' method that returns an iterator.
 node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(272,2): error TS1131: Property or signature expected.
 node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(276,13): error TS2551: Property '_Template' does not exist on type 'typeof Fragment'. Did you mean '_template'?
 node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(280,2): error TS1131: Property or signature expected.
@@ -16087,7 +15312,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(325,25): error T
 node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(327,27): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(329,27): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(331,25): error TS2339: Property 'positionAt' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(363,22): error TS2569: Type 'Set<GlassPane>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/ui/HistoryInput.js(16,26): error TS2339: Property '_constructor' does not exist on type 'typeof HistoryInput'.
 node_modules/chrome-devtools-frontend/front_end/ui/HistoryInput.js(17,23): error TS2339: Property '_constructor' does not exist on type 'typeof HistoryInput'.
 node_modules/chrome-devtools-frontend/front_end/ui/HistoryInput.js(19,65): error TS2339: Property '_constructor' does not exist on type 'typeof HistoryInput'.
@@ -16162,12 +15386,9 @@ node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(97,36): e
 node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(108,36): error TS2694: Namespace 'KeyboardShortcut' has no exported member 'Descriptor'.
 node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(135,42): error TS2694: Namespace 'KeyboardShortcut' has no exported member 'Key'.
 node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(144,42): error TS2694: Namespace 'KeyboardShortcut' has no exported member 'Key'.
-node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(205,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(209,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(215,73): error TS1003: Identifier expected.
 node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(216,21): error TS2551: Property 'Key' does not exist on type 'typeof KeyboardShortcut'. Did you mean 'Keys'?
 node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(218,50): error TS2694: Namespace 'KeyboardShortcut' has no exported member 'Key'.
-node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(269,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(288,45): error TS1003: Identifier expected.
 node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(289,21): error TS2300: Duplicate identifier 'Descriptor'.
 node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(289,21): error TS2339: Property 'Descriptor' does not exist on type 'typeof KeyboardShortcut'.
@@ -16199,7 +15420,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/ListControl.js(529,35): error
 node_modules/chrome-devtools-frontend/front_end/ui/ListControl.js(557,33): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/ui/ListControl.js(592,18): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/ListControl.js(637,14): error TS2403: Subsequent variable declarations must have the same type.  Variable 'index' must be of type 'number', but here has type 'any'.
-node_modules/chrome-devtools-frontend/front_end/ui/ListModel.js(28,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/ui/ListWidget.js(16,38): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/ListWidget.js(17,18): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/ListWidget.js(28,17): error TS2315: Type 'Editor' is not generic.
@@ -16234,7 +15454,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/ListWidget.js(395,18): error
 node_modules/chrome-devtools-frontend/front_end/ui/ListWidget.js(402,28): error TS2339: Property 'disabled' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/Panel.js(29,4): error TS2551: Property 'panels' does not exist on type 'typeof UI'. Did you mean 'Panel'?
 node_modules/chrome-devtools-frontend/front_end/ui/Panel.js(44,8): error TS2551: Property 'panels' does not exist on type 'typeof UI'. Did you mean 'Panel'?
-node_modules/chrome-devtools-frontend/front_end/ui/Panel.js(49,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/ui/Panel.js(75,13): error TS2339: Property 'handled' does not exist on type 'KeyboardEvent'.
 node_modules/chrome-devtools-frontend/front_end/ui/Panel.js(79,43): error TS2694: Namespace 'KeyboardShortcut' has no exported member 'Descriptor'.
 node_modules/chrome-devtools-frontend/front_end/ui/Popover.js(37,40): error TS2694: Namespace 'UI' has no exported member 'PopoverRequest'.
@@ -16497,8 +15716,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/SyntaxHighlighter.js(102,14):
 node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(40,25): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(41,47): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(47,48): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(88,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(125,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(159,27): error TS2339: Property 'focus' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(314,56): error TS2339: Property 'getComponentRoot' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(405,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
@@ -16512,14 +15729,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(793,21): error
 node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(873,19): error TS2339: Property 'key' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(894,28): error TS2339: Property 'click' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(899,20): error TS2339: Property 'focus' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(941,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(948,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(955,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(999,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(1006,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(1013,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(1020,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(1029,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(1047,21): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(1064,20): error TS2339: Property '__iconElement' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(1065,18): error TS2339: Property '__iconElement' does not exist on type 'Element'.
@@ -16782,20 +15991,12 @@ node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1317,27): error TS
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1318,24): error TS2339: Property '_constructor' does not exist on type 'typeof CheckboxLabel'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1319,74): error TS2339: Property '_constructor' does not exist on type 'typeof CheckboxLabel'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1324,29): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1333,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1342,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1353,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1367,12): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1381,12): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1382,12): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1410,12): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
-node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1417,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1439,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1446,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1459,32): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
-node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1468,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1481,34): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
-node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1494,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1519,41): error TS2339: Property 'select' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1522,59): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1526,32): error TS2339: Property 'value' does not exist on type 'Element'.
@@ -16814,7 +16015,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1646,40): error TS
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1649,25): error TS2339: Property '_textWidthCache' does not exist on type '(context: CanvasRenderingContext2D, text: string) => number'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1695,5): error TS2322: Type 'string | V' is not assignable to type 'string'.
   Type 'V' is not assignable to type 'string'.
-node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1713,25): error TS2569: Type 'Set<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1715,20): error TS2339: Property 'type' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1745,18): error TS2339: Property 'type' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1763,20): error TS2339: Property 'type' does not exist on type 'Element'.
@@ -16842,13 +16042,11 @@ node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1967,23): error TS
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1968,48): error TS2345: Argument of type '-1' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1969,23): error TS2339: Property 'onchange' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1971,34): error TS2339: Property 'files' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1986,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1990,28): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ [x: string]: any; SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1993,30): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1995,42): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1999,15): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(2003,16): error TS2339: Property 'focus' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(2013,15): error TS1055: Type 'Promise<boolean>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(2017,28): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ [x: string]: any; SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(2020,30): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(2024,50): error TS2555: Expected at least 2 arguments, but got 1.
@@ -16864,7 +16062,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/View.js(31,15): error TS2355:
 node_modules/chrome-devtools-frontend/front_end/ui/View.js(36,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/ui/View.js(195,47): error TS2352: Type 'Widget' cannot be converted to type '{ [x: string]: any; toolbarItems(): ({ [x: string]: any; item(): any & ToolbarItem; } & ToolbarIt...'.
   Property 'toolbarItems' is missing in type 'Widget'.
-node_modules/chrome-devtools-frontend/front_end/ui/View.js(201,15): error TS1055: Type 'Promise<Widget>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/ui/View.js(244,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/ui/View.js(254,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/ui/View.js(263,1): error TS8022: JSDoc '@extends' is not attached to a class.
@@ -16882,7 +16079,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/View.js(401,5): error TS2322:
 node_modules/chrome-devtools-frontend/front_end/ui/View.js(411,5): error TS2322: Type '_StackLocation' is not assignable to type '{ [x: string]: any; appendApplicableItems(locationName: string): void; appendView(view: { [x: str...'.
 node_modules/chrome-devtools-frontend/front_end/ui/View.js(411,5): error TS2322: Type '_StackLocation' is not assignable to type '{ [x: string]: any; appendApplicableItems(locationName: string): void; appendView(view: { [x: str...'.
   Property '_vbox' does not exist on type '{ [x: string]: any; appendApplicableItems(locationName: string): void; appendView(view: { [x: str...'.
-node_modules/chrome-devtools-frontend/front_end/ui/View.js(420,20): error TS2569: Type 'IterableIterator<string>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/ui/View.js(440,18): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/View.js(454,38): error TS2339: Property 'hasFocus' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/View.js(461,44): error TS2345: Argument of type '(Promise<void> | Promise<({ [x: string]: any; item(): any & ToolbarItem; } & ToolbarItem)[]>)[]' is not assignable to parameter of type 'Iterable<void | PromiseLike<void>>'.
@@ -16952,9 +16148,7 @@ node_modules/chrome-devtools-frontend/front_end/ui/Widget.js(740,40): error TS23
 node_modules/chrome-devtools-frontend/front_end/ui/Widget.js(745,19): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/Widget.js(746,28): error TS2339: Property '__widgetCounter' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/XElement.js(8,1): error TS8022: JSDoc '@extends' is not attached to a class.
-node_modules/chrome-devtools-frontend/front_end/ui/XElement.js(9,14): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/ui/XElement.js(53,1): error TS8022: JSDoc '@extends' is not attached to a class.
-node_modules/chrome-devtools-frontend/front_end/ui/XElement.js(64,14): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/ui/XElement.js(90,1): error TS8022: JSDoc '@extends' is not attached to a class.
 node_modules/chrome-devtools-frontend/front_end/ui/XElement.js(99,1): error TS8022: JSDoc '@extends' is not attached to a class.
 node_modules/chrome-devtools-frontend/front_end/ui/XElement.js(108,1): error TS8022: JSDoc '@extends' is not attached to a class.
@@ -16965,7 +16159,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/XLink.js(8,1): error TS8022:
 node_modules/chrome-devtools-frontend/front_end/ui/XLink.js(22,31): error TS2345: Argument of type 'TemplateStringsArray' is not assignable to parameter of type 'string[]'.
 node_modules/chrome-devtools-frontend/front_end/ui/XLink.js(42,29): error TS2339: Property 'openInNewTab' does not exist on type 'typeof InspectorFrontendHost'.
 node_modules/chrome-devtools-frontend/front_end/ui/XLink.js(48,29): error TS2339: Property 'openInNewTab' does not exist on type 'typeof InspectorFrontendHost'.
-node_modules/chrome-devtools-frontend/front_end/ui/XLink.js(55,14): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/ui/XLink.js(115,31): error TS2339: Property 'parentNodeOrShadowHost' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/ui/XLink.js(116,36): error TS2339: Property '_href' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/ui/XLink.js(119,67): error TS2339: Property 'openInNewTab' does not exist on type 'typeof InspectorFrontendHost'.
@@ -17027,21 +16220,11 @@ node_modules/chrome-devtools-frontend/front_end/ui/treeoutline.js(370,24): error
 node_modules/chrome-devtools-frontend/front_end/ui/treeoutline.js(379,28): error TS2339: Property 'parentTreeElement' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/treeoutline.js(470,39): error TS2339: Property 'lowerBound' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/ui/treeoutline.js(582,15): error TS2339: Property 'root' does not exist on type 'TreeElement'.
-node_modules/chrome-devtools-frontend/front_end/ui/treeoutline.js(602,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/ui/treeoutline.js(608,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/ui/treeoutline.js(612,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/ui/treeoutline.js(623,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/ui/treeoutline.js(630,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/ui/treeoutline.js(637,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/ui/treeoutline.js(650,24): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/treeoutline.js(675,22): error TS2339: Property '_shadowRoot' does not exist on type 'TreeOutline'.
 node_modules/chrome-devtools-frontend/front_end/ui/treeoutline.js(690,31): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/treeoutline.js(707,32): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/ui/treeoutline.js(716,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/ui/treeoutline.js(723,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/ui/treeoutline.js(727,24): error TS2339: Property 'title' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/ui/treeoutline.js(769,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-node_modules/chrome-devtools-frontend/front_end/ui/treeoutline.js(773,7): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 node_modules/chrome-devtools-frontend/front_end/ui/treeoutline.js(805,48): error TS2339: Property '_renderSelection' does not exist on type 'TreeOutline'.
 node_modules/chrome-devtools-frontend/front_end/ui/treeoutline.js(810,30): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/treeoutline.js(819,17): error TS2339: Property 'treeElement' does not exist on type 'EventTarget'.
@@ -17066,7 +16249,6 @@ node_modules/chrome-devtools-frontend/front_end/worker_service/ServiceDispatcher
 node_modules/chrome-devtools-frontend/front_end/worker_service/ServiceDispatcher.js(17,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/worker_service/ServiceDispatcher.js(34,16): error TS2339: Property 'setHandlers' does not exist on type 'typeof ServicePort'.
 node_modules/chrome-devtools-frontend/front_end/worker_service/ServiceDispatcher.js(63,16): error TS2339: Property 'runtime' does not exist on type 'Window'.
-node_modules/chrome-devtools-frontend/front_end/worker_service/ServiceDispatcher.js(102,24): error TS2569: Type 'IterableIterator<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/worker_service/ServiceDispatcher.js(116,16): error TS2339: Property 'send' does not exist on type 'typeof ServicePort'.
 node_modules/chrome-devtools-frontend/front_end/worker_service/ServiceDispatcher.js(125,16): error TS2339: Property 'send' does not exist on type 'typeof ServicePort'.
 node_modules/chrome-devtools-frontend/front_end/worker_service/ServiceDispatcher.js(134,16): error TS2339: Property 'send' does not exist on type 'typeof ServicePort'.
@@ -17086,7 +16268,6 @@ node_modules/chrome-devtools-frontend/front_end/workspace/SearchConfig.js(177,24
 node_modules/chrome-devtools-frontend/front_end/workspace/UISourceCode.js(45,25): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/workspace/UISourceCode.js(136,14): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/workspace/UISourceCode.js(199,10): error TS2339: Property 'dispatchEventToListeners' does not exist on type 'UISourceCode'.
-node_modules/chrome-devtools-frontend/front_end/workspace/UISourceCode.js(222,15): error TS1055: Type 'Promise<boolean>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/workspace/UISourceCode.js(298,26): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/workspace/UISourceCode.js(332,10): error TS2339: Property 'dispatchEventToListeners' does not exist on type 'UISourceCode'.
 node_modules/chrome-devtools-frontend/front_end/workspace/UISourceCode.js(408,10): error TS2339: Property 'dispatchEventToListeners' does not exist on type 'UISourceCode'.
@@ -17094,7 +16275,6 @@ node_modules/chrome-devtools-frontend/front_end/workspace/UISourceCode.js(486,46
 node_modules/chrome-devtools-frontend/front_end/workspace/UISourceCode.js(498,46): error TS2694: Namespace 'Workspace.UISourceCode.Message' has no exported member 'Level'.
 node_modules/chrome-devtools-frontend/front_end/workspace/UISourceCode.js(508,10): error TS2339: Property 'dispatchEventToListeners' does not exist on type 'UISourceCode'.
 node_modules/chrome-devtools-frontend/front_end/workspace/UISourceCode.js(517,12): error TS2339: Property 'dispatchEventToListeners' does not exist on type 'UISourceCode'.
-node_modules/chrome-devtools-frontend/front_end/workspace/UISourceCode.js(523,25): error TS2569: Type 'Set<Message>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/workspace/UISourceCode.js(524,12): error TS2339: Property 'dispatchEventToListeners' does not exist on type 'UISourceCode'.
 node_modules/chrome-devtools-frontend/front_end/workspace/UISourceCode.js(546,23): error TS2339: Property 'set' does not exist on type 'Multimap'.
 node_modules/chrome-devtools-frontend/front_end/workspace/UISourceCode.js(547,10): error TS2339: Property 'dispatchEventToListeners' does not exist on type 'UISourceCode'.
@@ -17136,10 +16316,7 @@ node_modules/chrome-devtools-frontend/front_end/workspace/Workspace.js(243,25):
   Type 'ProjectStore' is not comparable to type '{ [x: string]: any; workspace(): Workspace; id(): string; type(): string; isServiceProject(): boo...'.
     Property 'isServiceProject' is missing in type 'ProjectStore'.
 node_modules/chrome-devtools-frontend/front_end/workspace/Workspace.js(257,5): error TS2322: Type '{ [x: string]: any; Debugger: string; Formatter: string; Network: string; Snippets: string; FileS...' is not assignable to type 'string'.
-node_modules/chrome-devtools-frontend/front_end/workspace/Workspace.js(382,25): error TS2569: Type 'IterableIterator<{ [x: string]: any; workspace(): Workspace; id(): string; type(): string; isServ...' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
-node_modules/chrome-devtools-frontend/front_end/workspace/Workspace.js(396,25): error TS2569: Type 'IterableIterator<{ [x: string]: any; workspace(): Workspace; id(): string; type(): string; isServ...' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/workspace/Workspace.js(432,27): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, { [x: string]: any; workspace(): Workspace; id(): string; type(): string; isServicePr...'.
-node_modules/chrome-devtools-frontend/front_end/workspace/Workspace.js(451,25): error TS2569: Type 'IterableIterator<{ [x: string]: any; workspace(): Workspace; id(): string; type(): string; isServ...' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(30,30): error TS2694: Namespace 'Diff' has no exported member 'Diff'.
 node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(38,31): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(47,31): error TS2694: Namespace 'Common' has no exported member 'Event'.
@@ -17151,7 +16328,6 @@ node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(
 node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(206,18): error TS2339: Property 'addEventListener' does not exist on type 'UISourceCode'.
 node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(207,18): error TS2339: Property 'addEventListener' does not exist on type 'UISourceCode'.
 node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(236,30): error TS2694: Namespace 'Diff' has no exported member 'Diff'.
-node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(260,15): error TS1055: Type 'Promise<any>' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.
 node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(260,30): error TS2694: Namespace 'Diff' has no exported member 'Diff'.
 node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(301,36): error TS2339: Property '_instance' does not exist on type 'typeof WorkspaceDiff'.
 node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(302,33): error TS2339: Property '_instance' does not exist on type 'typeof WorkspaceDiff'.
diff --git a/tests/baselines/reference/user/create-react-app.log b/tests/baselines/reference/user/create-react-app.log
new file mode 100644
index 00000000000..2fefa8b230e
--- /dev/null
+++ b/tests/baselines/reference/user/create-react-app.log
@@ -0,0 +1,79 @@
+Exit Code: 1
+Standard output:
+packages/babel-preset-react-app/dependencies.js(38,17): error TS2307: Cannot find module '@babel/preset-env'.
+packages/babel-preset-react-app/dependencies.js(49,17): error TS2307: Cannot find module '@babel/preset-env'.
+packages/babel-preset-react-app/index.js(52,17): error TS2307: Cannot find module '@babel/preset-env'.
+packages/babel-preset-react-app/index.js(61,17): error TS2307: Cannot find module '@babel/preset-env'.
+packages/babel-preset-react-app/index.js(74,17): error TS2307: Cannot find module '@babel/preset-react'.
+packages/babel-preset-react-app/index.js(84,33): error TS2307: Cannot find module '@babel/preset-flow'.
+packages/babel-preset-react-app/index.js(89,15): error TS2307: Cannot find module 'babel-plugin-macros'.
+packages/babel-preset-react-app/index.js(93,15): error TS2307: Cannot find module '@babel/plugin-transform-destructuring'.
+packages/babel-preset-react-app/index.js(98,17): error TS2307: Cannot find module '@babel/plugin-proposal-class-properties'.
+packages/babel-preset-react-app/index.js(107,17): error TS2307: Cannot find module '@babel/plugin-proposal-object-rest-spread'.
+packages/babel-preset-react-app/index.js(114,17): error TS2307: Cannot find module '@babel/plugin-transform-runtime'.
+packages/babel-preset-react-app/index.js(123,17): error TS2307: Cannot find module 'babel-plugin-transform-react-remove-prop-types'.
+packages/babel-preset-react-app/index.js(130,17): error TS2307: Cannot find module '@babel/plugin-transform-regenerator'.
+packages/babel-preset-react-app/index.js(137,15): error TS2307: Cannot find module '@babel/plugin-syntax-dynamic-import'.
+packages/babel-preset-react-app/index.js(140,17): error TS2307: Cannot find module 'babel-plugin-transform-dynamic-import'.
+packages/confusing-browser-globals/test.js(14,1): error TS2304: Cannot find name 'it'.
+packages/confusing-browser-globals/test.js(15,3): error TS2304: Cannot find name 'expect'.
+packages/confusing-browser-globals/test.js(18,1): error TS2304: Cannot find name 'it'.
+packages/confusing-browser-globals/test.js(19,3): error TS2304: Cannot find name 'expect'.
+packages/create-react-app/createReactApp.js(37,37): error TS2307: Cannot find module 'validate-npm-package-name'.
+packages/create-react-app/createReactApp.js(47,24): error TS2307: Cannot find module 'tar-pack'.
+packages/create-react-app/createReactApp.js(49,28): error TS2307: Cannot find module 'hyperquest'.
+packages/create-react-app/createReactApp.js(50,25): error TS2307: Cannot find module 'envinfo'.
+packages/create-react-app/createReactApp.js(52,30): error TS2307: Cannot find module 'react-dev-utils/workspaceUtils'.
+packages/create-react-app/createReactApp.js(53,29): error TS2307: Cannot find module './package.json'.
+packages/create-react-app/createReactApp.js(771,20): error TS2345: Argument of type 'string | undefined' is not assignable to parameter of type 'string'.
+  Type 'undefined' is not assignable to type 'string'.
+packages/create-react-app/index.js(45,5): error TS2365: Operator '<' cannot be applied to types 'string' and 'number'.
+packages/eslint-config-react-app/index.js(24,33): error TS2307: Cannot find module 'confusing-browser-globals'.
+packages/react-dev-utils/FileSizeReporter.js(13,24): error TS2307: Cannot find module 'filesize'.
+packages/react-dev-utils/FileSizeReporter.js(14,25): error TS2307: Cannot find module 'recursive-readdir'.
+packages/react-dev-utils/FileSizeReporter.js(16,24): error TS2307: Cannot find module 'gzip-size'.
+packages/react-dev-utils/WebpackDevServerUtils.js(9,25): error TS2307: Cannot find module 'address'.
+packages/react-dev-utils/WebpackDevServerUtils.js(14,24): error TS2307: Cannot find module 'detect-port-alt'.
+packages/react-dev-utils/WebpackDevServerUtils.js(15,24): error TS2307: Cannot find module 'is-root'.
+packages/react-dev-utils/__tests__/ignoredFiles.test.js(12,1): error TS2304: Cannot find name 'describe'.
+packages/react-dev-utils/__tests__/ignoredFiles.test.js(13,3): error TS2304: Cannot find name 'it'.
+packages/react-dev-utils/__tests__/ignoredFiles.test.js(18,5): error TS2304: Cannot find name 'expect'.
+packages/react-dev-utils/__tests__/ignoredFiles.test.js(19,5): error TS2304: Cannot find name 'expect'.
+packages/react-dev-utils/__tests__/ignoredFiles.test.js(22,3): error TS2304: Cannot find name 'it'.
+packages/react-dev-utils/__tests__/ignoredFiles.test.js(26,5): error TS2304: Cannot find name 'expect'.
+packages/react-dev-utils/__tests__/ignoredFiles.test.js(29,3): error TS2304: Cannot find name 'it'.
+packages/react-dev-utils/__tests__/ignoredFiles.test.js(36,5): error TS2304: Cannot find name 'expect'.
+packages/react-dev-utils/__tests__/ignoredFiles.test.js(37,5): error TS2304: Cannot find name 'expect'.
+packages/react-dev-utils/__tests__/ignoredFiles.test.js(40,3): error TS2304: Cannot find name 'it'.
+packages/react-dev-utils/__tests__/ignoredFiles.test.js(46,5): error TS2304: Cannot find name 'expect'.
+packages/react-dev-utils/__tests__/ignoredFiles.test.js(49,3): error TS2304: Cannot find name 'it'.
+packages/react-dev-utils/__tests__/ignoredFiles.test.js(53,5): error TS2304: Cannot find name 'expect'.
+packages/react-dev-utils/browsersHelper.js(9,30): error TS2307: Cannot find module 'browserslist'.
+packages/react-dev-utils/browsersHelper.js(13,23): error TS2307: Cannot find module 'pkg-up'.
+packages/react-dev-utils/browsersHelper.js(59,22): error TS2554: Expected 1 arguments, but got 0.
+packages/react-dev-utils/browsersHelper.js(61,36): error TS2345: Argument of type 'Buffer' is not assignable to parameter of type 'string'.
+packages/react-dev-utils/browsersHelper.js(97,25): error TS2538: Type 'undefined' cannot be used as an index type.
+packages/react-dev-utils/checkRequiredFiles.js(19,34): error TS2339: Property 'F_OK' does not exist on type 'typeof import("fs")'.
+packages/react-dev-utils/checkRequiredFiles.js(23,32): error TS2345: Argument of type 'undefined' is not assignable to parameter of type 'string'.
+packages/react-dev-utils/checkRequiredFiles.js(24,34): error TS2345: Argument of type 'undefined' is not assignable to parameter of type 'string'.
+packages/react-dev-utils/getProcessForPort.js(29,6): error TS2339: Property 'split' does not exist on type 'Buffer'.
+packages/react-dev-utils/getProcessForPort.js(49,21): error TS2339: Property 'replace' does not exist on type 'Buffer'.
+packages/react-dev-utils/getProcessForPort.js(63,5): error TS2339: Property 'trim' does not exist on type 'Buffer'.
+packages/react-dev-utils/openBrowser.js(13,19): error TS2307: Cannot find module 'opn'.
+packages/react-dev-utils/webpackHotDevClient.js(19,22): error TS2307: Cannot find module 'sockjs-client'.
+packages/react-dev-utils/webpackHotDevClient.js(24,28): error TS2307: Cannot find module 'react-error-overlay'.
+packages/react-dev-utils/webpackHotDevClient.js(31,14): error TS2339: Property 'encodeURIComponent' does not exist on type 'Window'.
+packages/react-dev-utils/webpackHotDevClient.js(33,14): error TS2339: Property 'encodeURIComponent' does not exist on type 'Window'.
+packages/react-dev-utils/webpackHotDevClient.js(35,14): error TS2339: Property 'encodeURIComponent' does not exist on type 'Window'.
+packages/react-dev-utils/webpackHotDevClient.js(53,12): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
+packages/react-dev-utils/webpackHotDevClient.js(53,33): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
+packages/react-dev-utils/webpackHotDevClient.js(54,10): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
+packages/react-dev-utils/webpackHotDevClient.js(223,40): error TS2304: Cannot find name '__webpack_hash__'.
+packages/react-dev-utils/webpackHotDevClient.js(228,17): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
+packages/react-dev-utils/webpackHotDevClient.js(233,15): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
+packages/react-dev-utils/webpackHotDevClient.js(261,23): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
+packages/react-dev-utils/workspaceUtils.js(11,25): error TS2307: Cannot find module 'find-pkg'.
+
+
+
+Standard error:
diff --git a/tests/baselines/reference/user/debug.log b/tests/baselines/reference/user/debug.log
index 1d83e53c74b..7bc9c556746 100644
--- a/tests/baselines/reference/user/debug.log
+++ b/tests/baselines/reference/user/debug.log
@@ -1,6 +1,5 @@
 Exit Code: 1
 Standard output:
-node_modules/debug/src/browser.js(7,1): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/debug/node_modules/debug/src/browser"' because it is not a variable.
 node_modules/debug/src/browser.js(13,41): error TS2304: Cannot find name 'chrome'.
 node_modules/debug/src/browser.js(14,41): error TS2304: Cannot find name 'chrome'.
 node_modules/debug/src/browser.js(15,21): error TS2304: Cannot find name 'chrome'.
@@ -12,7 +11,6 @@ node_modules/debug/src/browser.js(73,9): error TS2551: Property 'formatters' doe
 node_modules/debug/src/browser.js(96,21): error TS2339: Property 'humanize' does not exist on type 'typeof import("/home/nathansa/ts/tests/cases/user/debug/node_modules/debug/src/browser")'.
 node_modules/debug/src/browser.js(178,9): error TS2339: Property 'enable' does not exist on type 'typeof import("/home/nathansa/ts/tests/cases/user/debug/node_modules/debug/src/browser")'.
 node_modules/debug/src/browser.js(187,13): error TS2304: Cannot find name 'LocalStorage'.
-node_modules/debug/src/debug.js(9,1): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/debug/node_modules/debug/src/debug"' because it is not a variable.
 node_modules/debug/src/debug.js(25,1): error TS2323: Cannot redeclare exported variable 'names'.
 node_modules/debug/src/debug.js(26,1): error TS2323: Cannot redeclare exported variable 'skips'.
 node_modules/debug/src/debug.js(46,13): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter, but here has type 'string'.
@@ -34,7 +32,6 @@ node_modules/debug/src/debug.js(156,3): error TS2323: Cannot redeclare exported
 node_modules/debug/src/debug.js(217,12): error TS2304: Cannot find name 'Mixed'.
 node_modules/debug/src/debug.js(218,13): error TS2304: Cannot find name 'Mixed'.
 node_modules/debug/src/index.js(6,47): error TS2339: Property 'type' does not exist on type 'Process'.
-node_modules/debug/src/node.js(14,1): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/debug/node_modules/debug/src/node"' because it is not a variable.
 node_modules/debug/src/node.js(26,1): error TS2323: Cannot redeclare exported variable 'colors'.
 node_modules/debug/src/node.js(31,5): error TS2323: Cannot redeclare exported variable 'colors'.
 node_modules/debug/src/node.js(60,39): error TS2345: Argument of type 'string | undefined' is not assignable to parameter of type 'string'.
diff --git a/tests/baselines/reference/user/enhanced-resolve.log b/tests/baselines/reference/user/enhanced-resolve.log
index 38a4f3d5312..24d0b2076df 100644
--- a/tests/baselines/reference/user/enhanced-resolve.log
+++ b/tests/baselines/reference/user/enhanced-resolve.log
@@ -6,7 +6,6 @@ node_modules/enhanced-resolve/lib/CachedInputFileSystem.js(129,18): error TS2345
   Type 'null' is not assignable to type 'number | undefined'.
 node_modules/enhanced-resolve/lib/CachedInputFileSystem.js(147,18): error TS2345: Argument of type 'Timer | null' is not assignable to parameter of type 'number | undefined'.
   Type 'null' is not assignable to type 'number | undefined'.
-node_modules/enhanced-resolve/lib/CachedInputFileSystem.js(154,19): error TS2569: Type 'IterableIterator<any>' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.
 node_modules/enhanced-resolve/lib/CachedInputFileSystem.js(176,19): error TS2322: Type 'null' is not assignable to type '(path: any, callback: any) => void'.
 node_modules/enhanced-resolve/lib/CachedInputFileSystem.js(179,23): error TS2322: Type 'null' is not assignable to type '(path: any) => any'.
 node_modules/enhanced-resolve/lib/CachedInputFileSystem.js(182,22): error TS2322: Type 'null' is not assignable to type '(path: any, callback: any) => void'.
diff --git a/tests/baselines/reference/user/lodash.log b/tests/baselines/reference/user/lodash.log
index e0d63aa9304..7a2ae30ef94 100644
--- a/tests/baselines/reference/user/lodash.log
+++ b/tests/baselines/reference/user/lodash.log
@@ -328,7 +328,6 @@ node_modules/lodash/fp/string.js(2,26): error TS2345: Argument of type '{ [x: st
 node_modules/lodash/fp/util.js(2,26): error TS2345: Argument of type '{ [x: string]: any; 'attempt': Function; 'bindAll': Function; 'cond': (pairs: any[]) => Function;...' is not assignable to parameter of type 'string'.
 node_modules/lodash/includes.js(24,10): error TS1003: Identifier expected.
 node_modules/lodash/includes.js(24,10): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/index.js(1,26): error TS2306: File '/home/nathansa/ts/tests/cases/user/lodash/node_modules/lodash/lodash.js' is not a module.
 node_modules/lodash/intersectionBy.js(41,32): error TS2554: Expected 0-1 arguments, but got 2.
 node_modules/lodash/isBuffer.js(5,69): error TS2339: Property 'nodeType' does not exist on type 'typeof import("/home/nathansa/ts/tests/cases/user/lodash/node_modules/lodash/isBuffer")'.
 node_modules/lodash/isBuffer.js(8,80): error TS2339: Property 'nodeType' does not exist on type 'NodeModule'.
@@ -336,321 +335,6 @@ node_modules/lodash/isEqual.js(32,10): error TS2554: Expected 3-5 arguments, but
 node_modules/lodash/isEqualWith.js(38,59): error TS2345: Argument of type 'undefined' is not assignable to parameter of type 'boolean'.
 node_modules/lodash/iteratee.js(50,74): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
 node_modules/lodash/keys.js(34,32): error TS2554: Expected 2 arguments, but got 1.
-node_modules/lodash/lodash.js(419,58): error TS2339: Property 'Object' does not exist on type 'Window'.
-node_modules/lodash/lodash.js(428,82): error TS2339: Property 'nodeType' does not exist on type 'NodeModule'.
-node_modules/lodash/lodash.js(434,49): error TS2339: Property 'process' does not exist on type 'false | Global'.
-  Property 'process' does not exist on type 'false'.
-node_modules/lodash/lodash.js(488,19): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(508,20): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(512,5): error TS2322: Type 'any[] | undefined' is not assignable to type 'any[]'.
-  Type 'undefined' is not assignable to type 'any[]'.
-node_modules/lodash/lodash.js(528,20): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(532,5): error TS2322: Type 'any[] | undefined' is not assignable to type 'any[]'.
-  Type 'undefined' is not assignable to type 'any[]'.
-node_modules/lodash/lodash.js(550,22): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(573,19): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(587,17): error TS8024: JSDoc '@param' tag has name 'target', but there is no parameter with that name.
-node_modules/lodash/lodash.js(592,36): error TS2345: Argument of type 'any[] | undefined' is not assignable to parameter of type 'any[]'.
-  Type 'undefined' is not assignable to type 'any[]'.
-node_modules/lodash/lodash.js(600,17): error TS8024: JSDoc '@param' tag has name 'target', but there is no parameter with that name.
-node_modules/lodash/lodash.js(609,29): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(631,32): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(672,21): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(675,43): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(695,21): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(698,43): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(718,21): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(749,22): error TS8024: JSDoc '@param' tag has name 'The', but there is no parameter with that name.
-node_modules/lodash/lodash.js(924,16): error TS2345: Argument of type 'Function' is not assignable to parameter of type '((a: any, b: any) => number) | undefined'.
-  Type 'Function' is not assignable to type '(a: any, b: any) => number'.
-node_modules/lodash/lodash.js(1374,22): error TS8024: JSDoc '@param' tag has name 'The', but there is no parameter with that name.
-node_modules/lodash/lodash.js(1771,9): error TS2322: Type 'typeof lodash' is not assignable to type 'Function'.
-  Types of property 'bind' are incompatible.
-    Type 'Function' is not assignable to type '(this: Function, thisArg: any, ...argArray: any[]) => any'.
-      Type 'Function' provides no match for the signature '(this: Function, thisArg: any, ...argArray: any[]): any'.
-node_modules/lodash/lodash.js(1916,21): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(1939,24): error TS8024: JSDoc '@param' tag has name 'hash', but there is no parameter with that name.
-node_modules/lodash/lodash.js(2020,21): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(2137,21): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(2241,18): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(2288,24): error TS2339: Property 'size' does not exist on type 'ListCache'.
-node_modules/lodash/lodash.js(2604,11): error TS2322: Type 'number | undefined' is not assignable to type 'number'.
-  Type 'undefined' is not assignable to type 'number'.
-node_modules/lodash/lodash.js(2604,30): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(2628,20): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-node_modules/lodash/lodash.js(2629,20): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-node_modules/lodash/lodash.js(2630,20): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-node_modules/lodash/lodash.js(2652,37): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean | undefined'.
-node_modules/lodash/lodash.js(2665,47): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean | undefined'.
-node_modules/lodash/lodash.js(2791,9): error TS2322: Type '(array?: any[] | undefined, value: any, comparator: Function) => boolean' is not assignable to type '(array?: any[] | undefined, value: any) => boolean'.
-node_modules/lodash/lodash.js(2797,9): error TS2322: Type 'SetCache' is not assignable to type 'any[]'.
-  Property 'flatMap' is missing in type 'SetCache'.
-node_modules/lodash/lodash.js(2814,19): error TS2554: Expected 2 arguments, but got 3.
-node_modules/lodash/lodash.js(2905,35): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(2949,21): error TS2322: Type '(value: any) => boolean' is not assignable to type 'boolean | undefined'.
-  Type '(value: any) => boolean' is not assignable to type 'false'.
-node_modules/lodash/lodash.js(2954,26): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(2954,26): error TS2722: Cannot invoke an object which is possibly 'undefined'.
-node_modules/lodash/lodash.js(2954,26): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type 'Boolean' has no compatible call signatures.
-node_modules/lodash/lodash.js(3176,44): error TS2345: Argument of type 'Function | undefined' is not assignable to parameter of type 'Function'.
-  Type 'undefined' is not assignable to type 'Function'.
-node_modules/lodash/lodash.js(3183,58): error TS2345: Argument of type 'Function | undefined' is not assignable to parameter of type 'Function'.
-  Type 'undefined' is not assignable to type 'Function'.
-node_modules/lodash/lodash.js(3286,44): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'number'.
-node_modules/lodash/lodash.js(3403,51): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
-node_modules/lodash/lodash.js(3587,40): error TS2345: Argument of type 'string | symbol' is not assignable to parameter of type 'string'.
-  Type 'symbol' is not assignable to type 'string'.
-node_modules/lodash/lodash.js(3593,45): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
-node_modules/lodash/lodash.js(3830,64): error TS2345: Argument of type 'Function | undefined' is not assignable to parameter of type 'Function'.
-  Type 'undefined' is not assignable to type 'Function'.
-node_modules/lodash/lodash.js(3860,30): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string | any[]'.
-node_modules/lodash/lodash.js(4001,29): error TS2345: Argument of type 'string | symbol' is not assignable to parameter of type 'string'.
-  Type 'symbol' is not assignable to type 'string'.
-node_modules/lodash/lodash.js(4061,11): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(4062,18): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(4062,49): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(4064,13): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(4065,11): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(4066,9): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(4068,16): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(4068,24): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(4068,36): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(4068,42): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(4069,7): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(4073,39): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(4271,9): error TS2322: Type '(array?: any[] | undefined, value: any, comparator: Function) => boolean' is not assignable to type '(array?: any[] | undefined, value: any) => boolean'.
-node_modules/lodash/lodash.js(4274,37): error TS2554: Expected 0 arguments, but got 1.
-node_modules/lodash/lodash.js(4280,9): error TS2322: Type 'SetCache' is not assignable to type 'any[]'.
-node_modules/lodash/lodash.js(4303,19): error TS2554: Expected 2 arguments, but got 3.
-node_modules/lodash/lodash.js(4497,25): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(4537,20): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-node_modules/lodash/lodash.js(4757,9): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(4759,7): error TS2322: Type 'any[] | undefined' is not assignable to type 'any[]'.
-  Type 'undefined' is not assignable to type 'any[]'.
-node_modules/lodash/lodash.js(4807,33): error TS2554: Expected 0 arguments, but got 1.
-node_modules/lodash/lodash.js(4819,33): error TS2554: Expected 0 arguments, but got 1.
-node_modules/lodash/lodash.js(4982,28): error TS2554: Expected 3 arguments, but got 1.
-node_modules/lodash/lodash.js(5001,26): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-node_modules/lodash/lodash.js(5002,26): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-node_modules/lodash/lodash.js(5003,26): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-node_modules/lodash/lodash.js(5004,26): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-node_modules/lodash/lodash.js(5005,26): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-node_modules/lodash/lodash.js(5006,26): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-node_modules/lodash/lodash.js(5007,26): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-node_modules/lodash/lodash.js(5008,26): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-node_modules/lodash/lodash.js(5047,50): error TS2339: Property 'placeholder' does not exist on type '(...args: any[]) => any'.
-node_modules/lodash/lodash.js(5072,38): error TS2454: Variable 'iteratee' is used before being assigned.
-node_modules/lodash/lodash.js(5097,26): error TS2454: Variable 'wrapper' is used before being assigned.
-node_modules/lodash/lodash.js(5101,17): error TS2454: Variable 'wrapper' is used before being assigned.
-node_modules/lodash/lodash.js(5106,46): error TS2554: Expected 0 arguments, but got 1.
-node_modules/lodash/lodash.js(5112,23): error TS2454: Variable 'wrapper' is used before being assigned.
-node_modules/lodash/lodash.js(5112,59): error TS2454: Variable 'wrapper' is used before being assigned.
-node_modules/lodash/lodash.js(5115,17): error TS2454: Variable 'wrapper' is used before being assigned.
-node_modules/lodash/lodash.js(5116,17): error TS2454: Variable 'wrapper' is used before being assigned.
-node_modules/lodash/lodash.js(5116,25): error TS2339: Property 'thru' does not exist on type 'LodashWrapper'.
-node_modules/lodash/lodash.js(5124,28): error TS2339: Property 'plant' does not exist on type 'LodashWrapper'.
-node_modules/lodash/lodash.js(5162,53): error TS2345: Argument of type 'string | Function' is not assignable to parameter of type 'Function'.
-  Type 'string' is not assignable to type 'Function'.
-node_modules/lodash/lodash.js(5177,46): error TS2345: Argument of type 'any[] | undefined' is not assignable to parameter of type 'any[]'.
-  Type 'undefined' is not assignable to type 'any[]'.
-node_modules/lodash/lodash.js(5180,56): error TS2345: Argument of type 'any[] | undefined' is not assignable to parameter of type 'any[]'.
-  Type 'undefined' is not assignable to type 'any[]'.
-node_modules/lodash/lodash.js(5182,19): error TS2454: Variable 'holdersCount' is used before being assigned.
-node_modules/lodash/lodash.js(5183,35): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(5186,13): error TS2345: Argument of type 'string | Function' is not assignable to parameter of type 'Function'.
-  Type 'string' is not assignable to type 'Function'.
-node_modules/lodash/lodash.js(5186,50): error TS2339: Property 'placeholder' does not exist on type '(...args: any[]) => any'.
-node_modules/lodash/lodash.js(5187,44): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(5191,42): error TS2538: Type 'Function' cannot be used as an index type.
-node_modules/lodash/lodash.js(5199,22): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(5520,42): error TS2554: Expected 0 arguments, but got 1.
-node_modules/lodash/lodash.js(5543,33): error TS2345: Argument of type 'string | Function' is not assignable to parameter of type 'Function'.
-  Type 'string' is not assignable to type 'Function'.
-node_modules/lodash/lodash.js(5545,30): error TS2345: Argument of type 'string | Function' is not assignable to parameter of type 'Function'.
-  Type 'string' is not assignable to type 'Function'.
-node_modules/lodash/lodash.js(5546,104): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(5547,32): error TS2345: Argument of type 'string | Function' is not assignable to parameter of type 'Function'.
-  Type 'string' is not assignable to type 'Function'.
-node_modules/lodash/lodash.js(5552,55): error TS2345: Argument of type 'string | Function' is not assignable to parameter of type 'Function'.
-  Type 'string' is not assignable to type 'Function'.
-node_modules/lodash/lodash.js(5605,24): error TS8024: JSDoc '@param' tag has name 'key', but there is no parameter with that name.
-node_modules/lodash/lodash.js(5742,11): error TS2454: Variable 'convert' is used before being assigned.
-node_modules/lodash/lodash.js(5826,22): error TS2322: Type 'boolean' is not assignable to type 'number'.
-node_modules/lodash/lodash.js(5921,21): error TS2339: Property 'placeholder' does not exist on type 'Function | typeof lodash'.
-  Property 'placeholder' does not exist on type 'Function'.
-node_modules/lodash/lodash.js(5932,25): error TS8029: JSDoc '@param' tag has name 'arity', but there is no parameter with that name. It would match 'arguments' if it had an array type.
-node_modules/lodash/lodash.js(5938,33): error TS2554: Expected 0-1 arguments, but got 2.
-node_modules/lodash/lodash.js(6006,11): error TS2454: Variable 'unmasked' is used before being assigned.
-node_modules/lodash/lodash.js(6043,27): error TS2554: Expected 0 arguments, but got 1.
-node_modules/lodash/lodash.js(6149,54): error TS2454: Variable 'key' is used before being assigned.
-node_modules/lodash/lodash.js(6162,20): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-node_modules/lodash/lodash.js(6166,30): error TS2339: Property 'index' does not exist on type 'any[]'.
-node_modules/lodash/lodash.js(6167,30): error TS2339: Property 'input' does not exist on type 'any[]'.
-node_modules/lodash/lodash.js(6239,9): error TS1223: 'returns' tag already specified.
-node_modules/lodash/lodash.js(6244,9): error TS2322: Type 'string' is not assignable to type 'any[]'.
-node_modules/lodash/lodash.js(6249,7): error TS2322: Type 'string' is not assignable to type 'any[]'.
-node_modules/lodash/lodash.js(6359,18): error TS2554: Expected 0 arguments, but got 1.
-node_modules/lodash/lodash.js(6444,26): error TS2339: Property 'cache' does not exist on type 'Function'.
-node_modules/lodash/lodash.js(6489,30): error TS2554: Expected 4 arguments, but got 3.
-node_modules/lodash/lodash.js(6496,30): error TS2554: Expected 4 arguments, but got 3.
-node_modules/lodash/lodash.js(6563,46): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(6567,31): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(6570,31): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(6571,26): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(6574,19): error TS2538: Type 'undefined' cannot be used as an index type.
-node_modules/lodash/lodash.js(6709,24): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(6716,7): error TS2322: Type 'number | undefined' is not assignable to type 'number'.
-  Type 'undefined' is not assignable to type 'number'.
-node_modules/lodash/lodash.js(6778,9): error TS1223: 'returns' tag already specified.
-node_modules/lodash/lodash.js(6821,14): error TS1003: Identifier expected.
-node_modules/lodash/lodash.js(6821,14): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/lodash.js(6838,22): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(6843,46): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(6846,64): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(6941,56): error TS2345: Argument of type '(value: any) => boolean' is not assignable to parameter of type 'boolean | undefined'.
-  Type '(value: any) => boolean' is not assignable to type 'false'.
-node_modules/lodash/lodash.js(6977,56): error TS2345: Argument of type '(value: any) => boolean' is not assignable to parameter of type 'boolean | undefined'.
-  Type '(value: any) => boolean' is not assignable to type 'false'.
-node_modules/lodash/lodash.js(7010,56): error TS2345: Argument of type '(value: any) => boolean' is not assignable to parameter of type 'boolean | undefined'.
-  Type '(value: any) => boolean' is not assignable to type 'false'.
-node_modules/lodash/lodash.js(7023,14): error TS1003: Identifier expected.
-node_modules/lodash/lodash.js(7023,14): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/lodash.js(7057,14): error TS1003: Identifier expected.
-node_modules/lodash/lodash.js(7057,14): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/lodash.js(7296,17): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(8145,14): error TS1003: Identifier expected.
-node_modules/lodash/lodash.js(8145,14): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/lodash.js(8178,14): error TS1003: Identifier expected.
-node_modules/lodash/lodash.js(8178,14): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/lodash.js(8303,46): error TS2345: Argument of type '(value: any) => boolean' is not assignable to parameter of type 'boolean | undefined'.
-  Type '(value: any) => boolean' is not assignable to type 'false'.
-node_modules/lodash/lodash.js(8334,46): error TS2345: Argument of type '(value: any) => boolean' is not assignable to parameter of type 'boolean | undefined'.
-  Type '(value: any) => boolean' is not assignable to type 'false'.
-node_modules/lodash/lodash.js(8361,46): error TS2345: Argument of type '(value: any) => boolean' is not assignable to parameter of type 'boolean | undefined'.
-  Type '(value: any) => boolean' is not assignable to type 'false'.
-node_modules/lodash/lodash.js(8822,55): error TS2339: Property 'thru' does not exist on type 'LodashWrapper'.
-node_modules/lodash/lodash.js(9093,14): error TS1003: Identifier expected.
-node_modules/lodash/lodash.js(9093,14): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/lodash.js(9407,14): error TS1003: Identifier expected.
-node_modules/lodash/lodash.js(9407,14): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/lodash.js(9432,12): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(9433,55): error TS2345: Argument of type 'number | undefined' is not assignable to parameter of type 'number'.
-  Type 'undefined' is not assignable to type 'number'.
-node_modules/lodash/lodash.js(9563,14): error TS1003: Identifier expected.
-node_modules/lodash/lodash.js(9563,14): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/lodash.js(9587,9): error TS2322: Type 'string[][]' is not assignable to type 'string[] | undefined'.
-  Type 'string[][]' is not assignable to type 'string[]'.
-    Type 'string[]' is not assignable to type 'string'.
-node_modules/lodash/lodash.js(9589,38): error TS2345: Argument of type 'any[] | string[] | Function[] | any[][] | undefined' is not assignable to parameter of type 'any[] | string[] | Function[]'.
-  Type 'undefined' is not assignable to type 'any[] | string[] | Function[]'.
-node_modules/lodash/lodash.js(9673,14): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '((array?: any[] | undefined, iteratee: Function, accumulator?: any, initAccum?: boolean | undefin...' has no compatible call signatures.
-node_modules/lodash/lodash.js(9702,14): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '((collection: any, iteratee: Function, accumulator: any, initAccum: boolean, eachFunc: Function) ...' has no compatible call signatures.
-node_modules/lodash/lodash.js(9773,14): error TS1003: Identifier expected.
-node_modules/lodash/lodash.js(9773,14): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/lodash.js(9859,14): error TS1003: Identifier expected.
-node_modules/lodash/lodash.js(9859,14): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/lodash.js(10004,14): error TS1003: Identifier expected.
-node_modules/lodash/lodash.js(10004,14): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/lodash.js(10092,59): error TS2454: Variable 'holders' is used before being assigned.
-node_modules/lodash/lodash.js(10146,57): error TS2454: Variable 'holders' is used before being assigned.
-node_modules/lodash/lodash.js(10167,14): error TS1003: Identifier expected.
-node_modules/lodash/lodash.js(10167,14): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/lodash.js(10193,14): error TS2339: Property 'placeholder' does not exist on type 'Function'.
-node_modules/lodash/lodash.js(10193,34): error TS2339: Property 'placeholder' does not exist on type '(func: Function, arity?: number | undefined, guard: any) => Function'.
-node_modules/lodash/lodash.js(10212,14): error TS1003: Identifier expected.
-node_modules/lodash/lodash.js(10212,14): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/lodash.js(10238,14): error TS2339: Property 'placeholder' does not exist on type 'Function'.
-node_modules/lodash/lodash.js(10238,39): error TS2339: Property 'placeholder' does not exist on type '(func: Function, arity?: number | undefined, guard: any) => Function'.
-node_modules/lodash/lodash.js(10313,21): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(10314,31): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(10315,47): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(10316,34): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(10341,27): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(10355,69): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(10834,26): error TS2538: Type 'undefined' cannot be used as an index type.
-node_modules/lodash/lodash.js(10896,32): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(10897,34): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(10899,35): error TS2345: Argument of type '{ 'leading': boolean; 'maxWait': number | undefined; 'trailing': boolean; }' is not assignable to parameter of type '{ leading?: boolean; maxWait?: number; trailing?: boolean; } | undefined'.
-  Type '{ 'leading': boolean; 'maxWait': number | undefined; 'trailing': boolean; }' is not assignable to type '{ leading?: boolean; maxWait?: number; trailing?: boolean; }'.
-    Types of property 'maxWait' are incompatible.
-      Type 'number | undefined' is not assignable to type 'number'.
-        Type 'undefined' is not assignable to type 'number'.
-node_modules/lodash/lodash.js(10922,14): error TS2554: Expected 3 arguments, but got 2.
-node_modules/lodash/lodash.js(10960,19): error TS8029: JSDoc '@param' tag has name 'value', but there is no parameter with that name. It would match 'arguments' if it had an array type.
-node_modules/lodash/lodash.js(11021,31): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
-node_modules/lodash/lodash.js(11057,31): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
-node_modules/lodash/lodash.js(11079,31): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
-node_modules/lodash/lodash.js(11112,31): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
-node_modules/lodash/lodash.js(11523,14): error TS2554: Expected 3-5 arguments, but got 2.
-node_modules/lodash/lodash.js(13298,36): error TS2554: Expected 2 arguments, but got 1.
-node_modules/lodash/lodash.js(13354,33): error TS2722: Cannot invoke an object which is possibly 'undefined'.
-node_modules/lodash/lodash.js(13392,38): error TS2722: Cannot invoke an object which is possibly 'undefined'.
-node_modules/lodash/lodash.js(13500,36): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
-node_modules/lodash/lodash.js(13581,16): error TS2722: Cannot invoke an object which is possibly 'undefined'.
-node_modules/lodash/lodash.js(13796,7): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '((array?: any[] | undefined, iteratee: Function) => any[]) | ((object: any, iteratee: Function) =...' has no compatible call signatures.
-node_modules/lodash/lodash.js(13797,16): error TS2722: Cannot invoke an object which is possibly 'undefined'.
-node_modules/lodash/lodash.js(13974,9): error TS2322: Type 'number | undefined' is not assignable to type 'number'.
-  Type 'undefined' is not assignable to type 'number'.
-node_modules/lodash/lodash.js(14174,48): error TS2345: Argument of type 'Function' is not assignable to parameter of type '(substring: string, ...args: any[]) => string'.
-node_modules/lodash/lodash.js(14245,43): error TS2345: Argument of type 'Function' is not assignable to parameter of type '(substring: string, ...args: any[]) => string'.
-node_modules/lodash/lodash.js(14458,14): error TS1003: Identifier expected.
-node_modules/lodash/lodash.js(14458,14): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/lodash.js(14486,14): error TS1003: Identifier expected.
-node_modules/lodash/lodash.js(14486,14): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/lodash.js(14520,33): error TS8029: JSDoc '@param' tag has name 'replacement', but there is no parameter with that name. It would match 'arguments' if it had an array type.
-node_modules/lodash/lodash.js(14582,56): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(14692,14): error TS1003: Identifier expected.
-node_modules/lodash/lodash.js(14692,14): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/lodash.js(14773,38): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(14780,25): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(14785,10): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(14788,10): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(14793,25): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(14802,19): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(14827,22): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(14877,25): error TS8024: JSDoc '@param' tag has name 'string', but there is no parameter with that name.
-node_modules/lodash/lodash.js(14902,25): error TS8024: JSDoc '@param' tag has name 'string', but there is no parameter with that name.
-node_modules/lodash/lodash.js(14928,14): error TS1003: Identifier expected.
-node_modules/lodash/lodash.js(14928,14): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/lodash.js(14966,14): error TS1003: Identifier expected.
-node_modules/lodash/lodash.js(14966,14): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/lodash.js(14999,14): error TS1003: Identifier expected.
-node_modules/lodash/lodash.js(14999,14): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/lodash.js(15065,40): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(15066,30): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(15067,34): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(15083,20): error TS2454: Variable 'strSymbols' is used before being assigned.
-node_modules/lodash/lodash.js(15090,11): error TS2454: Variable 'strSymbols' is used before being assigned.
-node_modules/lodash/lodash.js(15138,41): error TS2345: Argument of type 'Function' is not assignable to parameter of type '(substring: string, ...args: any[]) => string'.
-node_modules/lodash/lodash.js(15194,14): error TS1003: Identifier expected.
-node_modules/lodash/lodash.js(15194,14): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/lodash.js(15356,45): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
-node_modules/lodash/lodash.js(15518,78): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
-node_modules/lodash/lodash.js(15550,44): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
-node_modules/lodash/lodash.js(15580,34): error TS2345: Argument of type 'string | any[]' is not assignable to parameter of type 'string'.
-  Type 'any[]' is not assignable to type 'string'.
-node_modules/lodash/lodash.js(15580,60): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
-node_modules/lodash/lodash.js(15689,53): error TS2532: Object is possibly 'undefined'.
-node_modules/lodash/lodash.js(15706,65): error TS2345: Argument of type 'IArguments' is not assignable to parameter of type 'any[]'.
-node_modules/lodash/lodash.js(15773,30): error TS2345: Argument of type 'number | undefined' is not assignable to parameter of type 'number'.
-  Type 'undefined' is not assignable to type 'number'.
-node_modules/lodash/lodash.js(15872,41): error TS2345: Argument of type 'string | symbol' is not assignable to parameter of type 'string'.
-  Type 'symbol' is not assignable to type 'string'.
-node_modules/lodash/lodash.js(16914,19): error TS2339: Property 'filter' does not exist on type 'LazyWrapper'.
-node_modules/lodash/lodash.js(16918,19): error TS2339: Property 'filter' does not exist on type 'LazyWrapper'.
-node_modules/lodash/lodash.js(16935,19): error TS2339: Property 'filter' does not exist on type 'LazyWrapper'.
-node_modules/lodash/lodash.js(16946,25): error TS2339: Property 'takeRight' does not exist on type 'LazyWrapper'.
-node_modules/lodash/lodash.js(16948,25): error TS2339: Property 'drop' does not exist on type 'LazyWrapper'.
-node_modules/lodash/lodash.js(16952,35): error TS2339: Property 'dropRight' does not exist on type 'LazyWrapper'.
-node_modules/lodash/lodash.js(16952,60): error TS2339: Property 'take' does not exist on type 'LazyWrapper'.
-node_modules/lodash/lodash.js(16962,19): error TS2339: Property 'take' does not exist on type 'LazyWrapper'.
-node_modules/lodash/lodash.js(16983,68): error TS2345: Argument of type 'IArguments | number[]' is not assignable to parameter of type 'any[]'.
-  Type 'IArguments' is not assignable to type 'any[]'.
-node_modules/lodash/lodash.js(17073,14): error TS2304: Cannot find name 'define'.
-node_modules/lodash/lodash.js(17073,45): error TS2304: Cannot find name 'define'.
-node_modules/lodash/lodash.js(17073,71): error TS2304: Cannot find name 'define'.
-node_modules/lodash/lodash.js(17082,5): error TS2304: Cannot find name 'define'.
-node_modules/lodash/lodash.js(17089,30): error TS2339: Property '_' does not exist on type 'typeof lodash'.
 node_modules/lodash/map.js(50,27): error TS2554: Expected 0-1 arguments, but got 2.
 node_modules/lodash/mapKeys.js(28,14): error TS2554: Expected 0-1 arguments, but got 2.
 node_modules/lodash/mapKeys.js(31,29): error TS2722: Cannot invoke an object which is possibly 'undefined'.
diff --git a/tests/baselines/reference/user/npm.log b/tests/baselines/reference/user/npm.log
index 3550dacc7a2..4cf192bee0c 100644
--- a/tests/baselines/reference/user/npm.log
+++ b/tests/baselines/reference/user/npm.log
@@ -1,8 +1,7 @@
 Exit Code: 1
 Standard output:
-node_modules/npm/bin/npm-cli.js(5,14): error TS2304: Cannot find name 'WScript'.
-node_modules/npm/bin/npm-cli.js(6,5): error TS2304: Cannot find name 'WScript'.
-node_modules/npm/bin/npm-cli.js(13,5): error TS2304: Cannot find name 'WScript'.
+node_modules/npm/bin/npm-cli.js(6,13): error TS2551: Property 'echo' does not exist on type '{ Echo(s: any): void; StdErr: TextStreamWriter; StdOut: TextStreamWriter; Arguments: { length: nu...'. Did you mean 'Echo'?
+node_modules/npm/bin/npm-cli.js(13,13): error TS2551: Property 'quit' does not exist on type '{ Echo(s: any): void; StdErr: TextStreamWriter; StdOut: TextStreamWriter; Arguments: { length: nu...'. Did you mean 'Quit'?
 node_modules/npm/bin/npm-cli.js(30,23): error TS2307: Cannot find module '../package.json'.
 node_modules/npm/bin/npm-cli.js(54,7): error TS2339: Property 'argv' does not exist on type 'EventEmitter'.
 node_modules/npm/bin/npm-cli.js(55,11): error TS2339: Property 'deref' does not exist on type 'EventEmitter'.
@@ -63,7 +62,6 @@ node_modules/npm/lib/build.js(95,32): error TS2339: Property 'config' does not e
 node_modules/npm/lib/build.js(101,11): error TS2339: Property 'config' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/build.js(106,12): error TS2339: Property 'config' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/cache.js(16,34): error TS2339: Property 'commands' does not exist on type 'EventEmitter'.
-node_modules/npm/lib/cache.js(40,1): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/npm/node_modules/npm/lib/cache"' because it is not a variable.
 node_modules/npm/lib/cache.js(49,30): error TS2339: Property 'prefix' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/cache.js(69,35): error TS2339: Property 'cache' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/cache.js(70,12): error TS2339: Property 'config' does not exist on type 'EventEmitter'.
@@ -443,7 +441,6 @@ node_modules/npm/lib/logout.js(17,7): error TS2339: Property 'config' does not e
 node_modules/npm/lib/logout.js(23,26): error TS2339: Property 'config' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/logout.js(28,11): error TS2339: Property 'registry' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/logout.js(38,10): error TS2554: Expected 0-1 arguments, but got 3.
-node_modules/npm/lib/ls.js(7,18): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/npm/node_modules/npm/lib/ls"' because it is not a variable.
 node_modules/npm/lib/ls.js(37,30): error TS2339: Property 'dir' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/ls.js(88,18): error TS2339: Property 'config' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/ls.js(89,18): error TS2339: Property 'config' does not exist on type 'EventEmitter'.
@@ -474,9 +471,8 @@ node_modules/npm/lib/ls.js(522,18): error TS2339: Property 'config' does not exi
 node_modules/npm/lib/ls.js(528,19): error TS2339: Property 'config' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/ls.js(538,12): error TS2339: Property 'config' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/ls.js(544,56): error TS2339: Property 'globalDir' does not exist on type 'EventEmitter'.
-node_modules/npm/lib/npm.js(4,14): error TS2304: Cannot find name 'WScript'.
-node_modules/npm/lib/npm.js(5,5): error TS2304: Cannot find name 'WScript'.
-node_modules/npm/lib/npm.js(12,5): error TS2304: Cannot find name 'WScript'.
+node_modules/npm/lib/npm.js(5,13): error TS2551: Property 'echo' does not exist on type '{ Echo(s: any): void; StdErr: TextStreamWriter; StdOut: TextStreamWriter; Arguments: { length: nu...'. Did you mean 'Echo'?
+node_modules/npm/lib/npm.js(12,13): error TS2551: Property 'quit' does not exist on type '{ Echo(s: any): void; StdErr: TextStreamWriter; StdOut: TextStreamWriter; Arguments: { length: nu...'. Did you mean 'Quit'?
 node_modules/npm/lib/npm.js(30,14): error TS2345: Argument of type '"log"' is not assignable to parameter of type 'Signals'.
 node_modules/npm/lib/npm.js(58,7): error TS2339: Property 'config' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/npm.js(68,7): error TS2339: Property 'commands' does not exist on type 'EventEmitter'.
@@ -627,7 +623,6 @@ node_modules/npm/lib/run-script.js(77,21): error TS2345: Argument of type 'strin
 node_modules/npm/lib/run-script.js(94,13): error TS2339: Property 'config' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/run-script.js(99,13): error TS2339: Property 'config' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/run-script.js(148,22): error TS2339: Property 'config' does not exist on type 'EventEmitter'.
-node_modules/npm/lib/search.js(3,18): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/npm/node_modules/npm/lib/search"' because it is not a variable.
 node_modules/npm/lib/search.js(25,22): error TS2339: Property 'config' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/search.js(26,34): error TS2339: Property 'config' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/search.js(27,40): error TS2339: Property 'config' does not exist on type 'EventEmitter'.
@@ -652,7 +647,6 @@ node_modules/npm/lib/search/format-package-stream.js(130,63): error TS2339: Prop
 node_modules/npm/lib/set.js(8,22): error TS2339: Property 'commands' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/set.js(12,7): error TS2339: Property 'commands' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/shrinkwrap.js(30,29): error TS2339: Property 'lockfileVersion' does not exist on type 'EventEmitter'.
-node_modules/npm/lib/shrinkwrap.js(36,18): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/npm/node_modules/npm/lib/shrinkwrap"' because it is not a variable.
 node_modules/npm/lib/shrinkwrap.js(48,22): error TS2339: Property 'prefix' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/shrinkwrap.js(49,22): error TS2339: Property 'prefix' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/shrinkwrap.js(53,38): error TS2339: Property 'prefix' does not exist on type 'EventEmitter'.
@@ -762,13 +756,10 @@ node_modules/npm/lib/utils/error-handler.js(236,7): error TS2322: Type 'string'
 node_modules/npm/lib/utils/error-message.js(66,37): error TS2339: Property 'prefix' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/utils/error-message.js(295,24): error TS2339: Property 'version' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/utils/error-message.js(296,25): error TS2339: Property 'config' does not exist on type 'EventEmitter'.
-node_modules/npm/lib/utils/gently-rm.js(4,1): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/npm/node_modules/npm/lib/utils/gently-rm"' because it is not a variable.
 node_modules/npm/lib/utils/git.js(9,17): error TS2339: Property 'config' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/utils/is-windows-bash.js(3,53): error TS2345: Argument of type 'string | undefined' is not assignable to parameter of type 'string'.
   Type 'undefined' is not assignable to type 'string'.
-node_modules/npm/lib/utils/lifecycle-cmd.js(1,1): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/npm/node_modules/npm/lib/utils/lifecycle-cmd"' because it is not a variable.
 node_modules/npm/lib/utils/lifecycle-cmd.js(8,9): error TS2339: Property 'commands' does not exist on type 'EventEmitter'.
-node_modules/npm/lib/utils/lifecycle.js(1,1): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/npm/node_modules/npm/lib/utils/lifecycle"' because it is not a variable.
 node_modules/npm/lib/utils/locker.js(16,23): error TS2339: Property 'cache' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/utils/locker.js(22,29): error TS2339: Property 'cache' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/utils/locker.js(27,18): error TS2339: Property 'config' does not exist on type 'EventEmitter'.
@@ -792,7 +783,6 @@ node_modules/npm/lib/utils/parse-json.js(7,11): error TS2339: Property 'noExcept
 node_modules/npm/lib/utils/perf.js(9,12): error TS2345: Argument of type '"time"' is not assignable to parameter of type 'Signals'.
 node_modules/npm/lib/utils/perf.js(10,12): error TS2345: Argument of type '"timeEnd"' is not assignable to parameter of type 'Signals'.
 node_modules/npm/lib/utils/perf.js(21,18): error TS2345: Argument of type '"timing"' is not assignable to parameter of type '"removeListener"'.
-node_modules/npm/lib/utils/read-local-package.js(1,1): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/npm/node_modules/npm/lib/utils/read-local-package"' because it is not a variable.
 node_modules/npm/lib/utils/read-local-package.js(7,11): error TS2339: Property 'config' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/utils/read-local-package.js(9,29): error TS2339: Property 'prefix' does not exist on type 'EventEmitter'.
 node_modules/npm/lib/utils/spawn.js(26,8): error TS2339: Property 'file' does not exist on type 'Error'.
diff --git a/tests/baselines/reference/user/npmlog.log b/tests/baselines/reference/user/npmlog.log
index a5fafbe9112..13f3b0871c8 100644
--- a/tests/baselines/reference/user/npmlog.log
+++ b/tests/baselines/reference/user/npmlog.log
@@ -1,6 +1,5 @@
 Exit Code: 1
 Standard output:
-node_modules/npmlog/log.js(5,11): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/npmlog/node_modules/npmlog/log"' because it is not a variable.
 node_modules/npmlog/log.js(16,14): error TS2339: Property 'gauge' does not exist on type 'PropertyDescriptor'.
 node_modules/npmlog/log.js(16,26): error TS2339: Property 'gauge' does not exist on type 'PropertyDescriptor'.
 node_modules/npmlog/log.js(25,5): error TS2339: Property 'useColor' does not exist on type 'EventEmitter'.
diff --git a/tests/baselines/reference/user/puppeteer.log b/tests/baselines/reference/user/puppeteer.log
new file mode 100644
index 00000000000..b2a53a08dd3
--- /dev/null
+++ b/tests/baselines/reference/user/puppeteer.log
@@ -0,0 +1,40 @@
+Exit Code: 1
+Standard output:
+lib/Coverage.js(109,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/Coverage.js(196,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/ElementHandle.js(24,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/ElementHandle.js(83,29): error TS2503: Cannot find namespace 'Protocol'.
+lib/EmulationManager.js(36,16): error TS2503: Cannot find namespace 'Protocol'.
+lib/ExecutionContext.js(22,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/ExecutionContext.js(132,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/FrameManager.js(28,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/FrameManager.js(54,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/FrameManager.js(76,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/FrameManager.js(127,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/FrameManager.js(773,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/NetworkManager.js(129,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/NetworkManager.js(174,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/NetworkManager.js(207,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/NetworkManager.js(224,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/NetworkManager.js(256,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/NetworkManager.js(270,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/NetworkManager.js(286,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/NetworkManager.js(313,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/NetworkManager.js(640,13): error TS2503: Cannot find namespace 'Protocol'.
+lib/Page.js(66,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/Page.js(185,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/Page.js(394,22): error TS2503: Cannot find namespace 'Protocol'.
+lib/Page.js(407,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/Page.js(731,19): error TS2503: Cannot find namespace 'Protocol'.
+lib/externs.d.ts(16,26): error TS2503: Cannot find namespace 'Protocol'.
+lib/externs.d.ts(16,69): error TS2503: Cannot find namespace 'Protocol'.
+lib/externs.d.ts(17,28): error TS2503: Cannot find namespace 'Protocol'.
+lib/externs.d.ts(17,81): error TS2503: Cannot find namespace 'Protocol'.
+lib/externs.d.ts(17,121): error TS2503: Cannot find namespace 'Protocol'.
+lib/helper.js(59,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/helper.js(77,15): error TS2503: Cannot find namespace 'Protocol'.
+lib/helper.js(101,15): error TS2503: Cannot find namespace 'Protocol'.
+
+
+
+Standard error:
diff --git a/tests/baselines/reference/user/uglify-js.log b/tests/baselines/reference/user/uglify-js.log
index 4f6fb657807..66a1267e755 100644
--- a/tests/baselines/reference/user/uglify-js.log
+++ b/tests/baselines/reference/user/uglify-js.log
@@ -6,94 +6,76 @@ node_modules/uglify-js/lib/ast.js(858,5): error TS2322: Type '{ [x: string]: any
   Object literal may only specify known properties, but '_visit' does not exist in type 'TreeWalker'. Did you mean to write 'visit'?
 node_modules/uglify-js/lib/compress.js(165,27): error TS2554: Expected 0 arguments, but got 1.
 node_modules/uglify-js/lib/compress.js(453,26): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/compress.js(733,18): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/compress.js(975,38): error TS2339: Property 'parent' does not exist on type 'TreeTransformer'.
-node_modules/uglify-js/lib/compress.js(1001,51): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type 'true | ((node: any) => any)' has no compatible call signatures.
-node_modules/uglify-js/lib/compress.js(1085,53): error TS2339: Property 'parent' does not exist on type 'TreeTransformer'.
-node_modules/uglify-js/lib/compress.js(1125,112): error TS2532: Object is possibly 'undefined'.
-node_modules/uglify-js/lib/compress.js(1126,29): error TS2532: Object is possibly 'undefined'.
-node_modules/uglify-js/lib/compress.js(1135,87): error TS2322: Type 'false' is not assignable to type 'number'.
-node_modules/uglify-js/lib/compress.js(1143,29): error TS2322: Type 'false' is not assignable to type 'never'.
-node_modules/uglify-js/lib/compress.js(1196,38): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/compress.js(1289,38): error TS2339: Property 'parent' does not exist on type 'TreeTransformer'.
-node_modules/uglify-js/lib/compress.js(1385,27): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/compress.js(1417,26): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/compress.js(1831,44): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/compress.js(2009,19): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/compress.js(2269,27): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/compress.js(2767,13): error TS2322: Type 'string[]' is not assignable to type '() => boolean'.
-  Type 'string[]' provides no match for the signature '(): boolean'.
-node_modules/uglify-js/lib/compress.js(2769,13): error TS2322: Type 'string[]' is not assignable to type '() => boolean'.
-node_modules/uglify-js/lib/compress.js(2771,13): error TS2322: Type 'string[]' is not assignable to type '() => boolean'.
-node_modules/uglify-js/lib/compress.js(2773,13): error TS2322: Type 'string[]' is not assignable to type '() => boolean'.
-node_modules/uglify-js/lib/compress.js(2775,13): error TS2322: Type 'string[]' is not assignable to type '() => boolean'.
-node_modules/uglify-js/lib/compress.js(2777,13): error TS2322: Type 'string[]' is not assignable to type '() => boolean'.
-node_modules/uglify-js/lib/compress.js(2779,16): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/compress.js(3006,23): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/compress.js(3019,33): error TS2322: Type '"f"' is not assignable to type 'boolean'.
-node_modules/uglify-js/lib/compress.js(3156,18): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/compress.js(3166,33): error TS2339: Property 'add' does not exist on type 'Dictionary'.
-node_modules/uglify-js/lib/compress.js(3170,32): error TS2339: Property 'add' does not exist on type 'Dictionary'.
-node_modules/uglify-js/lib/compress.js(3176,40): error TS2339: Property 'add' does not exist on type 'Dictionary'.
-node_modules/uglify-js/lib/compress.js(3185,41): error TS2339: Property 'add' does not exist on type 'Dictionary'.
-node_modules/uglify-js/lib/compress.js(3202,14): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/compress.js(3204,40): error TS2339: Property 'get' does not exist on type 'Dictionary'.
-node_modules/uglify-js/lib/compress.js(3212,33): error TS2339: Property 'parent' does not exist on type 'TreeTransformer'.
-node_modules/uglify-js/lib/compress.js(3286,63): error TS2339: Property 'get' does not exist on type 'Dictionary'.
-node_modules/uglify-js/lib/compress.js(3475,23): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/compress.js(3492,36): error TS2339: Property 'parent' does not exist on type 'TreeTransformer'.
-node_modules/uglify-js/lib/compress.js(3498,38): error TS2339: Property 'set' does not exist on type 'Dictionary'.
-node_modules/uglify-js/lib/compress.js(3502,40): error TS2339: Property 'parent' does not exist on type 'TreeTransformer'.
-node_modules/uglify-js/lib/compress.js(3527,22): error TS2339: Property 'each' does not exist on type 'Dictionary'.
-node_modules/uglify-js/lib/compress.js(3532,30): error TS2339: Property 'del' does not exist on type 'Dictionary'.
-node_modules/uglify-js/lib/compress.js(3537,30): error TS2339: Property 'set' does not exist on type 'Dictionary'.
-node_modules/uglify-js/lib/compress.js(3548,41): error TS2339: Property 'has' does not exist on type 'Dictionary'.
-node_modules/uglify-js/lib/compress.js(3550,48): error TS2339: Property 'get' does not exist on type 'Dictionary'.
-node_modules/uglify-js/lib/compress.js(3562,41): error TS2339: Property 'has' does not exist on type 'Dictionary'.
-node_modules/uglify-js/lib/compress.js(3564,48): error TS2339: Property 'get' does not exist on type 'Dictionary'.
-node_modules/uglify-js/lib/compress.js(3648,21): error TS2403: Subsequent variable declarations must have the same type.  Variable 'defs' must be of type 'Dictionary', but here has type 'any'.
-node_modules/uglify-js/lib/compress.js(3650,36): error TS2339: Property 'get' does not exist on type 'Dictionary'.
-node_modules/uglify-js/lib/compress.js(3667,22): error TS2339: Property 'set' does not exist on type 'Dictionary'.
-node_modules/uglify-js/lib/compress.js(3687,17): error TS2447: The '|=' operator is not allowed for boolean types. Consider using '||' instead.
-node_modules/uglify-js/lib/compress.js(3712,30): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/compress.js(3863,22): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/compress.js(4141,17): error TS2403: Subsequent variable declarations must have the same type.  Variable 'body' must be of type 'any[]', but here has type 'any'.
-node_modules/uglify-js/lib/compress.js(4225,22): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/compress.js(4553,30): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/compress.js(4560,25): error TS2403: Subsequent variable declarations must have the same type.  Variable 'code' must be of type 'string', but here has type '{ [x: string]: any; get: () => string; toString: () => string; indent: () => void; indentation: (...'.
-node_modules/uglify-js/lib/compress.js(4564,36): error TS2532: Object is possibly 'undefined'.
-node_modules/uglify-js/lib/compress.js(4569,41): error TS2339: Property 'get' does not exist on type 'string'.
-node_modules/uglify-js/lib/compress.js(5043,18): error TS2454: Variable 'is_strict_comparison' is used before being assigned.
-node_modules/uglify-js/lib/compress.js(5508,32): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/compress.js(5568,24): error TS2554: Expected 0 arguments, but got 1.
+node_modules/uglify-js/lib/compress.js(734,18): error TS2554: Expected 0 arguments, but got 1.
+node_modules/uglify-js/lib/compress.js(976,38): error TS2339: Property 'parent' does not exist on type 'TreeTransformer'.
+node_modules/uglify-js/lib/compress.js(1002,51): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type 'true | ((node: any) => any)' has no compatible call signatures.
+node_modules/uglify-js/lib/compress.js(1086,53): error TS2339: Property 'parent' does not exist on type 'TreeTransformer'.
+node_modules/uglify-js/lib/compress.js(1126,112): error TS2532: Object is possibly 'undefined'.
+node_modules/uglify-js/lib/compress.js(1127,29): error TS2532: Object is possibly 'undefined'.
+node_modules/uglify-js/lib/compress.js(1136,87): error TS2322: Type 'false' is not assignable to type 'number'.
+node_modules/uglify-js/lib/compress.js(1144,29): error TS2322: Type 'false' is not assignable to type 'never'.
+node_modules/uglify-js/lib/compress.js(1197,38): error TS2554: Expected 0 arguments, but got 1.
+node_modules/uglify-js/lib/compress.js(1290,38): error TS2339: Property 'parent' does not exist on type 'TreeTransformer'.
+node_modules/uglify-js/lib/compress.js(1386,27): error TS2554: Expected 0 arguments, but got 1.
+node_modules/uglify-js/lib/compress.js(1418,26): error TS2554: Expected 0 arguments, but got 1.
+node_modules/uglify-js/lib/compress.js(1832,44): error TS2554: Expected 0 arguments, but got 1.
+node_modules/uglify-js/lib/compress.js(2024,19): error TS2554: Expected 0 arguments, but got 1.
+node_modules/uglify-js/lib/compress.js(2284,27): error TS2554: Expected 0 arguments, but got 1.
+node_modules/uglify-js/lib/compress.js(3024,23): error TS2554: Expected 0 arguments, but got 1.
+node_modules/uglify-js/lib/compress.js(3037,33): error TS2322: Type '"f"' is not assignable to type 'boolean'.
+node_modules/uglify-js/lib/compress.js(3174,18): error TS2554: Expected 0 arguments, but got 1.
+node_modules/uglify-js/lib/compress.js(3184,33): error TS2339: Property 'add' does not exist on type 'Dictionary'.
+node_modules/uglify-js/lib/compress.js(3188,32): error TS2339: Property 'add' does not exist on type 'Dictionary'.
+node_modules/uglify-js/lib/compress.js(3194,40): error TS2339: Property 'add' does not exist on type 'Dictionary'.
+node_modules/uglify-js/lib/compress.js(3203,41): error TS2339: Property 'add' does not exist on type 'Dictionary'.
+node_modules/uglify-js/lib/compress.js(3220,14): error TS2554: Expected 0 arguments, but got 1.
+node_modules/uglify-js/lib/compress.js(3222,40): error TS2339: Property 'get' does not exist on type 'Dictionary'.
+node_modules/uglify-js/lib/compress.js(3230,33): error TS2339: Property 'parent' does not exist on type 'TreeTransformer'.
+node_modules/uglify-js/lib/compress.js(3304,63): error TS2339: Property 'get' does not exist on type 'Dictionary'.
+node_modules/uglify-js/lib/compress.js(3493,23): error TS2554: Expected 0 arguments, but got 1.
+node_modules/uglify-js/lib/compress.js(3510,36): error TS2339: Property 'parent' does not exist on type 'TreeTransformer'.
+node_modules/uglify-js/lib/compress.js(3516,38): error TS2339: Property 'set' does not exist on type 'Dictionary'.
+node_modules/uglify-js/lib/compress.js(3520,40): error TS2339: Property 'parent' does not exist on type 'TreeTransformer'.
+node_modules/uglify-js/lib/compress.js(3545,22): error TS2339: Property 'each' does not exist on type 'Dictionary'.
+node_modules/uglify-js/lib/compress.js(3550,30): error TS2339: Property 'del' does not exist on type 'Dictionary'.
+node_modules/uglify-js/lib/compress.js(3555,30): error TS2339: Property 'set' does not exist on type 'Dictionary'.
+node_modules/uglify-js/lib/compress.js(3566,41): error TS2339: Property 'has' does not exist on type 'Dictionary'.
+node_modules/uglify-js/lib/compress.js(3568,48): error TS2339: Property 'get' does not exist on type 'Dictionary'.
+node_modules/uglify-js/lib/compress.js(3580,41): error TS2339: Property 'has' does not exist on type 'Dictionary'.
+node_modules/uglify-js/lib/compress.js(3582,48): error TS2339: Property 'get' does not exist on type 'Dictionary'.
+node_modules/uglify-js/lib/compress.js(3688,21): error TS2403: Subsequent variable declarations must have the same type.  Variable 'defs' must be of type 'Dictionary', but here has type 'any'.
+node_modules/uglify-js/lib/compress.js(3690,36): error TS2339: Property 'get' does not exist on type 'Dictionary'.
+node_modules/uglify-js/lib/compress.js(3719,22): error TS2339: Property 'set' does not exist on type 'Dictionary'.
+node_modules/uglify-js/lib/compress.js(3739,17): error TS2447: The '|=' operator is not allowed for boolean types. Consider using '||' instead.
+node_modules/uglify-js/lib/compress.js(3764,30): error TS2554: Expected 0 arguments, but got 1.
+node_modules/uglify-js/lib/compress.js(3902,18): error TS2554: Expected 0 arguments, but got 1.
+node_modules/uglify-js/lib/compress.js(4201,17): error TS2403: Subsequent variable declarations must have the same type.  Variable 'body' must be of type 'any[]', but here has type 'any'.
+node_modules/uglify-js/lib/compress.js(4285,22): error TS2554: Expected 0 arguments, but got 1.
+node_modules/uglify-js/lib/compress.js(4613,30): error TS2554: Expected 0 arguments, but got 1.
+node_modules/uglify-js/lib/compress.js(4620,25): error TS2403: Subsequent variable declarations must have the same type.  Variable 'code' must be of type 'string', but here has type '{ [x: string]: any; get: () => string; toString: () => string; indent: () => void; indentation: (...'.
+node_modules/uglify-js/lib/compress.js(4624,36): error TS2532: Object is possibly 'undefined'.
+node_modules/uglify-js/lib/compress.js(4629,41): error TS2339: Property 'get' does not exist on type 'string'.
+node_modules/uglify-js/lib/compress.js(5114,18): error TS2454: Variable 'is_strict_comparison' is used before being assigned.
+node_modules/uglify-js/lib/compress.js(5553,25): error TS2365: Operator '==' cannot be applied to types 'boolean' and '"f"'.
+node_modules/uglify-js/lib/compress.js(5580,32): error TS2554: Expected 0 arguments, but got 1.
 node_modules/uglify-js/lib/compress.js(5640,24): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/compress.js(5646,26): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/compress.js(5996,43): error TS2454: Variable 'property' is used before being assigned.
-node_modules/uglify-js/lib/compress.js(6010,25): error TS2403: Subsequent variable declarations must have the same type.  Variable 'value' must be of type 'number', but here has type 'any'.
-node_modules/uglify-js/lib/compress.js(6013,46): error TS2339: Property 'has_side_effects' does not exist on type 'number'.
-node_modules/uglify-js/lib/compress.js(6020,25): error TS2403: Subsequent variable declarations must have the same type.  Variable 'value' must be of type 'number', but here has type 'any'.
-node_modules/uglify-js/lib/compress.js(6073,19): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/minify.js(148,75): error TS2339: Property 'compress' does not exist on type 'Compressor'.
+node_modules/uglify-js/lib/compress.js(5712,24): error TS2554: Expected 0 arguments, but got 1.
+node_modules/uglify-js/lib/compress.js(5718,26): error TS2554: Expected 0 arguments, but got 1.
+node_modules/uglify-js/lib/compress.js(6068,43): error TS2454: Variable 'property' is used before being assigned.
+node_modules/uglify-js/lib/compress.js(6082,25): error TS2403: Subsequent variable declarations must have the same type.  Variable 'value' must be of type 'number', but here has type 'any'.
+node_modules/uglify-js/lib/compress.js(6085,46): error TS2339: Property 'has_side_effects' does not exist on type 'number'.
+node_modules/uglify-js/lib/compress.js(6092,25): error TS2403: Subsequent variable declarations must have the same type.  Variable 'value' must be of type 'number', but here has type 'any'.
+node_modules/uglify-js/lib/compress.js(6145,19): error TS2554: Expected 0 arguments, but got 1.
+node_modules/uglify-js/lib/minify.js(166,75): error TS2339: Property 'compress' does not exist on type 'Compressor'.
 node_modules/uglify-js/lib/mozilla-ast.js(569,18): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/output.js(471,22): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/output.js(765,23): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/output.js(1177,29): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/output.js(1247,37): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type 'String' has no compatible call signatures.
-node_modules/uglify-js/lib/output.js(1359,20): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type 'String' has no compatible call signatures.
-node_modules/uglify-js/lib/parse.js(53,1): error TS2322: Type 'Function' is not assignable to type 'string'.
-node_modules/uglify-js/lib/parse.js(54,1): error TS2322: Type 'Function' is not assignable to type 'string'.
-node_modules/uglify-js/lib/parse.js(55,1): error TS2322: Type 'Function' is not assignable to type 'string'.
-node_modules/uglify-js/lib/parse.js(56,1): error TS2322: Type 'Function' is not assignable to type 'string'.
-node_modules/uglify-js/lib/parse.js(168,13): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type 'String' has no compatible call signatures.
-node_modules/uglify-js/lib/parse.js(296,50): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type 'String' has no compatible call signatures.
+node_modules/uglify-js/lib/output.js(473,22): error TS2554: Expected 0 arguments, but got 1.
+node_modules/uglify-js/lib/output.js(767,23): error TS2554: Expected 0 arguments, but got 1.
+node_modules/uglify-js/lib/output.js(1179,29): error TS2554: Expected 0 arguments, but got 1.
 node_modules/uglify-js/lib/parse.js(365,20): error TS2345: Argument of type 'number | undefined' is not assignable to parameter of type 'number'.
   Type 'undefined' is not assignable to type 'number'.
 node_modules/uglify-js/lib/parse.js(447,32): error TS2345: Argument of type 'any' is not assignable to parameter of type 'never'.
 node_modules/uglify-js/lib/parse.js(458,32): error TS2345: Argument of type 'any' is not assignable to parameter of type 'never'.
-node_modules/uglify-js/lib/parse.js(479,13): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type 'String' has no compatible call signatures.
 node_modules/uglify-js/lib/parse.js(509,20): error TS2339: Property 'raw_source' does not exist on type 'RegExp'.
-node_modules/uglify-js/lib/parse.js(553,16): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type 'String' has no compatible call signatures.
-node_modules/uglify-js/lib/parse.js(554,16): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type 'String' has no compatible call signatures.
 node_modules/uglify-js/lib/parse.js(620,57): error TS2339: Property 'push' does not exist on type 'never'.
 node_modules/uglify-js/lib/parse.js(630,32): error TS2345: Argument of type 'never[]' is not assignable to parameter of type 'never'.
 node_modules/uglify-js/lib/parse.js(636,40): error TS2339: Property 'length' does not exist on type 'never'.
@@ -111,7 +93,6 @@ node_modules/uglify-js/lib/parse.js(1097,9): error TS2322: Type 'any[]' is not a
   Type 'any' is not assignable to type 'never'.
 node_modules/uglify-js/lib/parse.js(1156,17): error TS2531: Object is possibly 'null'.
 node_modules/uglify-js/lib/parse.js(1324,32): error TS2531: Object is possibly 'null'.
-node_modules/uglify-js/lib/parse.js(1409,18): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type 'String' has no compatible call signatures.
 node_modules/uglify-js/lib/parse.js(1430,20): error TS2531: Object is possibly 'null'.
 node_modules/uglify-js/lib/parse.js(1516,48): error TS2531: Object is possibly 'null'.
 node_modules/uglify-js/lib/parse.js(1542,35): error TS2531: Object is possibly 'null'.
@@ -126,11 +107,11 @@ node_modules/uglify-js/lib/propmangle.js(139,14): error TS2554: Expected 0 argum
 node_modules/uglify-js/lib/scope.js(104,14): error TS2554: Expected 0 arguments, but got 1.
 node_modules/uglify-js/lib/scope.js(165,14): error TS2554: Expected 0 arguments, but got 1.
 node_modules/uglify-js/lib/scope.js(202,19): error TS2554: Expected 0 arguments, but got 1.
-node_modules/uglify-js/lib/scope.js(410,14): error TS2554: Expected 0 arguments, but got 1.
+node_modules/uglify-js/lib/scope.js(411,14): error TS2554: Expected 0 arguments, but got 1.
 node_modules/uglify-js/lib/scope.js(466,15): error TS2554: Expected 0 arguments, but got 1.
 node_modules/uglify-js/lib/scope.js(491,15): error TS2554: Expected 0 arguments, but got 1.
 node_modules/uglify-js/lib/sourcemap.js(56,25): error TS2304: Cannot find name 'MOZ_SourceMap'.
-node_modules/uglify-js/lib/sourcemap.js(60,40): error TS2304: Cannot find name 'MOZ_SourceMap'.
+node_modules/uglify-js/lib/sourcemap.js(62,23): error TS2304: Cannot find name 'MOZ_SourceMap'.
 node_modules/uglify-js/lib/utils.js(73,38): error TS2339: Property 'message' does not exist on type 'PropertyDescriptor'.
 node_modules/uglify-js/lib/utils.js(74,29): error TS2339: Property 'name' does not exist on type 'PropertyDescriptor'.
 node_modules/uglify-js/tools/exit.js(2,12): error TS2454: Variable 'process' is used before being assigned.
diff --git a/tests/baselines/reference/user/url-search-params.log b/tests/baselines/reference/user/url-search-params.log
index 95849823ccd..f3d6544ff8d 100644
--- a/tests/baselines/reference/user/url-search-params.log
+++ b/tests/baselines/reference/user/url-search-params.log
@@ -1,60 +1,5 @@
 Exit Code: 1
 Standard output:
-node_modules/url-search-params/build/url-search-params.js(2,5): error TS2322: Type '{ new (init?: string | URLSearchParams | undefined): URLSearchParams; prototype: URLSearchParams; }' is not assignable to type '(query: any) => void'.
-  Type '{ new (init?: string | URLSearchParams | undefined): URLSearchParams; prototype: URLSearchParams; }' provides no match for the signature '(query: any): void'.
-node_modules/url-search-params/build/url-search-params.js(2,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 'URLSearchParams' must be of type '{ new (init?: string | URLSearchParams | undefined): URLSearchParams; prototype: URLSearchParams; }', but here has type '(query: any) => void'.
-node_modules/url-search-params/build/url-search-params.js(2,3851): error TS2532: Object is possibly 'undefined'.
-node_modules/url-search-params/build/url-search-params.js(2,3851): error TS2532: Object is possibly 'undefined'.
-node_modules/url-search-params/build/url-search-params.js(2,3851): error TS2684: The 'this' context of type '(() => any) | undefined' is not assignable to method's 'this' of type 'Function'.
-  Type 'undefined' is not assignable to type 'Function'.
-node_modules/url-search-params/build/url-search-params.js(2,3918): error TS2532: Object is possibly 'undefined'.
-node_modules/url-search-params/build/url-search-params.js(2,3918): error TS2532: Object is possibly 'undefined'.
-node_modules/url-search-params/build/url-search-params.js(2,3918): error TS2684: The 'this' context of type '((v: any) => void) | undefined' is not assignable to method's 'this' of type 'Function'.
-  Type 'undefined' is not assignable to type 'Function'.
-node_modules/url-search-params/build/url-search-params.js(2,4005): error TS2532: Object is possibly 'undefined'.
-node_modules/url-search-params/build/url-search-params.js(2,4005): error TS2532: Object is possibly 'undefined'.
-node_modules/url-search-params/build/url-search-params.js(2,4005): error TS2684: The 'this' context of type '(() => any) | undefined' is not assignable to method's 'this' of type 'Function'.
-  Type 'undefined' is not assignable to type 'Function'.
-node_modules/url-search-params/build/url-search-params.js(2,4074): error TS2532: Object is possibly 'undefined'.
-node_modules/url-search-params/build/url-search-params.js(2,4074): error TS2532: Object is possibly 'undefined'.
-node_modules/url-search-params/build/url-search-params.js(2,4074): error TS2684: The 'this' context of type '((v: any) => void) | undefined' is not assignable to method's 'this' of type 'Function'.
-  Type 'undefined' is not assignable to type 'Function'.
-node_modules/url-search-params/build/url-search-params.js(2,4676): error TS2339: Property 'forEach' does not exist on type 'URLSearchParams'.
-node_modules/url-search-params/build/url-search-params.js(2,5038): error TS2339: Property 'keys' does not exist on type 'URLSearchParams'.
-node_modules/url-search-params/build/url-search-params.js(2,5077): error TS2339: Property 'forEach' does not exist on type 'URLSearchParams'.
-node_modules/url-search-params/build/url-search-params.js(2,5368): error TS2339: Property 'values' does not exist on type 'URLSearchParams'.
-node_modules/url-search-params/build/url-search-params.js(2,5411): error TS2339: Property 'forEach' does not exist on type 'URLSearchParams'.
-node_modules/url-search-params/build/url-search-params.js(2,5699): error TS2339: Property 'entries' does not exist on type 'URLSearchParams'.
-node_modules/url-search-params/build/url-search-params.js(2,5744): error TS2339: Property 'forEach' does not exist on type 'URLSearchParams'.
-node_modules/url-search-params/build/url-search-params.js(2,6099): error TS2339: Property 'entries' does not exist on type 'URLSearchParams'.
-node_modules/url-search-params/build/url-search-params.js(2,6165): error TS2339: Property 'sort' does not exist on type 'URLSearchParams'.
-node_modules/url-search-params/build/url-search-params.js(2,6203): error TS2339: Property 'entries' does not exist on type 'URLSearchParams'.
-node_modules/url-search-params/build/url-search-params.max.js(246,22): error TS2532: Object is possibly 'undefined'.
-node_modules/url-search-params/build/url-search-params.max.js(246,22): error TS2532: Object is possibly 'undefined'.
-node_modules/url-search-params/build/url-search-params.max.js(246,22): error TS2684: The 'this' context of type '(() => any) | undefined' is not assignable to method's 'this' of type 'Function'.
-  Type 'undefined' is not assignable to type 'Function'.
-node_modules/url-search-params/build/url-search-params.max.js(250,15): error TS2532: Object is possibly 'undefined'.
-node_modules/url-search-params/build/url-search-params.max.js(250,15): error TS2532: Object is possibly 'undefined'.
-node_modules/url-search-params/build/url-search-params.max.js(250,15): error TS2684: The 'this' context of type '((v: any) => void) | undefined' is not assignable to method's 'this' of type 'Function'.
-  Type 'undefined' is not assignable to type 'Function'.
-node_modules/url-search-params/build/url-search-params.max.js(256,22): error TS2532: Object is possibly 'undefined'.
-node_modules/url-search-params/build/url-search-params.max.js(256,22): error TS2532: Object is possibly 'undefined'.
-node_modules/url-search-params/build/url-search-params.max.js(256,22): error TS2684: The 'this' context of type '(() => any) | undefined' is not assignable to method's 'this' of type 'Function'.
-  Type 'undefined' is not assignable to type 'Function'.
-node_modules/url-search-params/build/url-search-params.max.js(260,15): error TS2532: Object is possibly 'undefined'.
-node_modules/url-search-params/build/url-search-params.max.js(260,15): error TS2532: Object is possibly 'undefined'.
-node_modules/url-search-params/build/url-search-params.max.js(260,15): error TS2684: The 'this' context of type '((v: any) => void) | undefined' is not assignable to method's 'this' of type 'Function'.
-  Type 'undefined' is not assignable to type 'Function'.
-node_modules/url-search-params/build/url-search-params.max.js(322,26): error TS2339: Property 'forEach' does not exist on type 'URLSearchParams'.
-node_modules/url-search-params/build/url-search-params.max.js(337,26): error TS2339: Property 'keys' does not exist on type 'URLSearchParams'.
-node_modules/url-search-params/build/url-search-params.max.js(339,12): error TS2339: Property 'forEach' does not exist on type 'URLSearchParams'.
-node_modules/url-search-params/build/url-search-params.max.js(358,26): error TS2339: Property 'values' does not exist on type 'URLSearchParams'.
-node_modules/url-search-params/build/url-search-params.max.js(360,12): error TS2339: Property 'forEach' does not exist on type 'URLSearchParams'.
-node_modules/url-search-params/build/url-search-params.max.js(379,26): error TS2339: Property 'entries' does not exist on type 'URLSearchParams'.
-node_modules/url-search-params/build/url-search-params.max.js(381,12): error TS2339: Property 'forEach' does not exist on type 'URLSearchParams'.
-node_modules/url-search-params/build/url-search-params.max.js(400,66): error TS2339: Property 'entries' does not exist on type 'URLSearchParams'.
-node_modules/url-search-params/build/url-search-params.max.js(404,26): error TS2339: Property 'sort' does not exist on type 'URLSearchParams'.
-node_modules/url-search-params/build/url-search-params.max.js(406,24): error TS2339: Property 'entries' does not exist on type 'URLSearchParams'.
 node_modules/url-search-params/build/url-search-params.node.js(174,1): error TS2539: Cannot assign to 'URLSearchParams' because it is not a variable.
 node_modules/url-search-params/build/url-search-params.node.js(174,44): error TS2339: Property 'URLSearchParams' does not exist on type 'Global'.
 
diff --git a/tests/baselines/reference/user/webpack.log b/tests/baselines/reference/user/webpack.log
deleted file mode 100644
index 8430b403e58..00000000000
--- a/tests/baselines/reference/user/webpack.log
+++ /dev/null
@@ -1,406 +0,0 @@
-Exit Code: 1
-Standard output:
-node_modules/enhanced-resolve/lib/CachedInputFileSystem.js(116,18): error TS2345: Argument of type 'Timer | null' is not assignable to parameter of type 'number | undefined'.
-  Type 'null' is not assignable to type 'number | undefined'.
-node_modules/enhanced-resolve/lib/CachedInputFileSystem.js(129,18): error TS2345: Argument of type 'Timer | null' is not assignable to parameter of type 'number | undefined'.
-  Type 'null' is not assignable to type 'number | undefined'.
-node_modules/enhanced-resolve/lib/CachedInputFileSystem.js(147,18): error TS2345: Argument of type 'Timer | null' is not assignable to parameter of type 'number | undefined'.
-  Type 'null' is not assignable to type 'number | undefined'.
-node_modules/enhanced-resolve/lib/CachedInputFileSystem.js(176,19): error TS2322: Type 'null' is not assignable to type '(path: any, callback: any) => void'.
-node_modules/enhanced-resolve/lib/CachedInputFileSystem.js(179,23): error TS2322: Type 'null' is not assignable to type '(path: any) => any'.
-node_modules/enhanced-resolve/lib/CachedInputFileSystem.js(182,22): error TS2322: Type 'null' is not assignable to type '(path: any, callback: any) => void'.
-node_modules/enhanced-resolve/lib/CachedInputFileSystem.js(185,26): error TS2322: Type 'null' is not assignable to type '(path: any) => any'.
-node_modules/enhanced-resolve/lib/CachedInputFileSystem.js(188,23): error TS2322: Type 'null' is not assignable to type '(path: any, callback: any) => void'.
-node_modules/enhanced-resolve/lib/CachedInputFileSystem.js(191,27): error TS2322: Type 'null' is not assignable to type '(path: any) => any'.
-node_modules/enhanced-resolve/lib/CachedInputFileSystem.js(209,4): error TS2322: Type 'null' is not assignable to type '(path: any, callback: any) => void'.
-node_modules/enhanced-resolve/lib/CachedInputFileSystem.js(220,4): error TS2322: Type 'null' is not assignable to type '(path: any) => any'.
-node_modules/enhanced-resolve/lib/CachedInputFileSystem.js(224,23): error TS2322: Type 'null' is not assignable to type '(path: any, callback: any) => void'.
-node_modules/enhanced-resolve/lib/CachedInputFileSystem.js(227,27): error TS2322: Type 'null' is not assignable to type '(path: any) => any'.
-node_modules/enhanced-resolve/lib/NodeJsInputFileSystem.js(7,20): error TS2307: Cannot find module 'graceful-fs'.
-node_modules/webpack/bin/webpack.js(62,22): error TS2307: Cannot find module 'webpack-cli'.
-node_modules/webpack/bin/webpack.js(80,10): error TS2307: Cannot find module 'webpack-cli'.
-node_modules/webpack/buildin/amd-options.js(2,18): error TS2304: Cannot find name '__webpack_amd_options__'.
-node_modules/webpack/hot/dev-server.js(6,12): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
-node_modules/webpack/hot/dev-server.js(9,27): error TS2304: Cannot find name '__webpack_hash__'.
-node_modules/webpack/hot/dev-server.js(13,10): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
-node_modules/webpack/hot/dev-server.js(37,25): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
-node_modules/webpack/hot/dev-server.js(53,29): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
-node_modules/webpack/hot/only-dev-server.js(6,12): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
-node_modules/webpack/hot/only-dev-server.js(9,27): error TS2304: Cannot find name '__webpack_hash__'.
-node_modules/webpack/hot/only-dev-server.js(13,10): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
-node_modules/webpack/hot/only-dev-server.js(25,19): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
-node_modules/webpack/hot/only-dev-server.js(69,25): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
-node_modules/webpack/hot/only-dev-server.js(88,24): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
-node_modules/webpack/hot/poll.js(6,12): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
-node_modules/webpack/hot/poll.js(7,25): error TS2304: Cannot find name '__resourceQuery'.
-node_modules/webpack/hot/poll.js(11,14): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
-node_modules/webpack/hot/poll.js(12,11): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
-node_modules/webpack/hot/poll.js(23,26): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
-node_modules/webpack/hot/signal.js(6,12): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
-node_modules/webpack/hot/signal.js(9,10): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
-node_modules/webpack/hot/signal.js(18,19): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
-node_modules/webpack/hot/signal.js(37,25): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
-node_modules/webpack/hot/signal.js(48,13): error TS2304: Cannot find name '__resourceQuery'.
-node_modules/webpack/hot/signal.js(49,14): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
-node_modules/webpack/hot/signal.js(52,51): error TS2339: Property 'hot' does not exist on type 'NodeModule'.
-node_modules/webpack/lib/AmdMainTemplatePlugin.js(8,34): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/AutomaticPrefetchPlugin.js(7,26): error TS2307: Cannot find module 'neo-async'.
-node_modules/webpack/lib/BannerPlugin.js(8,34): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/BannerPlugin.js(12,33): error TS2307: Cannot find module 'schema-utils'.
-node_modules/webpack/lib/BannerPlugin.js(13,24): error TS2307: Cannot find module '../schemas/plugins/BannerPlugin.json'.
-node_modules/webpack/lib/CachePlugin.js(7,26): error TS2307: Cannot find module 'neo-async'.
-node_modules/webpack/lib/ChunkGroup.js(267,21): error TS2345: Argument of type '(a: any, b: any) => 1 | 0 | -1 | undefined' is not assignable to parameter of type '((a: any, b: any) => number) | undefined'.
-  Type '(a: any, b: any) => 1 | 0 | -1 | undefined' is not assignable to type '(a: any, b: any) => number'.
-    Type '1 | 0 | -1 | undefined' is not assignable to type 'number'.
-      Type 'undefined' is not assignable to type 'number'.
-node_modules/webpack/lib/ChunkTemplate.js(7,58): error TS2307: Cannot find module 'tapable'.
-node_modules/webpack/lib/Compilation.js(7,26): error TS2307: Cannot find module 'neo-async'.
-node_modules/webpack/lib/Compilation.js(9,34): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/Compilation.js(16,13): error TS2307: Cannot find module 'tapable'.
-node_modules/webpack/lib/Compilation.js(1059,20): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/Compilation.js(1062,39): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/Compilation.js(1115,4): error TS2722: Cannot invoke an object which is possibly 'undefined'.
-node_modules/webpack/lib/Compiler.js(7,26): error TS2307: Cannot find module 'neo-async'.
-node_modules/webpack/lib/Compiler.js(16,13): error TS2307: Cannot find module 'tapable'.
-node_modules/webpack/lib/ContextModule.js(8,47): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/ContextModule.js(13,7): error TS2415: Class 'ContextModule' incorrectly extends base class 'Module'.
-  Types of property 'built' are incompatible.
-    Type 'boolean | undefined' is not assignable to type 'boolean'.
-      Type 'undefined' is not assignable to type 'boolean'.
-node_modules/webpack/lib/ContextModule.js(138,16): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/ContextModuleFactory.js(7,26): error TS2307: Cannot find module 'neo-async'.
-node_modules/webpack/lib/ContextModuleFactory.js(14,13): error TS2307: Cannot find module 'tapable'.
-node_modules/webpack/lib/DelegatedModule.js(7,47): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/DelegatedModule.js(14,7): error TS2415: Class 'DelegatedModule' incorrectly extends base class 'Module'.
-  Types of property 'built' are incompatible.
-    Type 'boolean | undefined' is not assignable to type 'boolean'.
-      Type 'undefined' is not assignable to type 'boolean'.
-node_modules/webpack/lib/DependenciesBlockVariable.js(7,46): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/DllModule.js(7,31): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/DllModule.js(10,7): error TS2415: Class 'DllModule' incorrectly extends base class 'Module'.
-  Types of property 'built' are incompatible.
-    Type 'boolean | undefined' is not assignable to type 'boolean'.
-      Type 'undefined' is not assignable to type 'boolean'.
-node_modules/webpack/lib/DllModuleFactory.js(7,29): error TS2307: Cannot find module 'tapable'.
-node_modules/webpack/lib/DllPlugin.js(11,33): error TS2307: Cannot find module 'schema-utils'.
-node_modules/webpack/lib/DllPlugin.js(12,24): error TS2307: Cannot find module '../schemas/plugins/DllPlugin.json'.
-node_modules/webpack/lib/DllReferencePlugin.js(13,33): error TS2307: Cannot find module 'schema-utils'.
-node_modules/webpack/lib/DllReferencePlugin.js(14,24): error TS2307: Cannot find module '../schemas/plugins/DllReferencePlugin.json'.
-node_modules/webpack/lib/EvalDevToolModuleTemplatePlugin.js(7,31): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/EvalSourceMapDevToolModuleTemplatePlugin.js(7,31): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/EvalSourceMapDevToolModuleTemplatePlugin.js(57,31): error TS2339: Property 'sources' does not exist on type '{}'.
-node_modules/webpack/lib/EvalSourceMapDevToolModuleTemplatePlugin.js(78,15): error TS2339: Property 'sources' does not exist on type '{}'.
-node_modules/webpack/lib/EvalSourceMapDevToolModuleTemplatePlugin.js(79,15): error TS2339: Property 'sourceRoot' does not exist on type '{}'.
-node_modules/webpack/lib/EvalSourceMapDevToolModuleTemplatePlugin.js(80,15): error TS2339: Property 'file' does not exist on type '{}'.
-node_modules/webpack/lib/ExportPropertyMainTemplatePlugin.js(7,34): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/ExternalModule.js(7,47): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/ExternalModule.js(12,7): error TS2415: Class 'ExternalModule' incorrectly extends base class 'Module'.
-  Types of property 'built' are incompatible.
-    Type 'boolean | undefined' is not assignable to type 'boolean'.
-      Type 'undefined' is not assignable to type 'boolean'.
-node_modules/webpack/lib/FunctionModuleTemplatePlugin.js(7,34): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/HashedModuleIdsPlugin.js(8,33): error TS2307: Cannot find module 'schema-utils'.
-node_modules/webpack/lib/HashedModuleIdsPlugin.js(9,24): error TS2307: Cannot find module '../schemas/plugins/HashedModuleIdsPlugin.json'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(8,23): error TS2304: Cannot find name '$hash$'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(9,26): error TS2552: Cannot find name '$requestTimeout$'. Did you mean 'hotRequestTimeout'?
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(17,12): error TS2304: Cannot find name 'installedModules'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(18,19): error TS2552: Cannot find name '$require$'. Did you mean 'require'?
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(21,9): error TS2304: Cannot find name 'installedModules'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(22,10): error TS2304: Cannot find name 'installedModules'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(23,7): error TS2304: Cannot find name 'installedModules'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(38,11): error TS2304: Cannot find name '$require$'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(45,13): error TS2304: Cannot find name '$require$'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(48,6): error TS2304: Cannot find name '$require$'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(52,20): error TS2552: Cannot find name '$require$'. Did you mean 'require'?
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(54,42): error TS2304: Cannot find name '$require$'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(63,11): error TS2304: Cannot find name '$require$'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(112,31): error TS2345: Argument of type 'any' is not assignable to parameter of type 'never'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(115,31): error TS2345: Argument of type 'any' is not assignable to parameter of type 'never'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(118,44): error TS2345: Argument of type 'any' is not assignable to parameter of type 'never'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(174,10): error TS2304: Cannot find name 'hotDownloadManifest'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(196,26): error TS2304: Cannot find name 'chunkId'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(230,4): error TS2304: Cannot find name 'hotDownloadUpdateChunk'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(289,20): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(290,17): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(291,14): error TS2304: Cannot find name 'installedModules'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(309,19): error TS2304: Cannot find name 'installedModules'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(378,16): error TS2339: Property 'chain' does not exist on type '{ [x: string]: any; type: string; chain: any[]; moduleId: any; parentId?: undefined; outdatedModu...'.
-  Property 'chain' does not exist on type '{ type: string; moduleId: string; }'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(379,52): error TS2339: Property 'chain' does not exist on type '{ [x: string]: any; type: string; chain: any[]; moduleId: any; parentId?: undefined; outdatedModu...'.
-  Property 'chain' does not exist on type '{ type: string; moduleId: string; }'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(385,8): error TS2322: Type 'Error' is not assignable to type 'boolean'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(394,8): error TS2322: Type 'Error' is not assignable to type 'boolean'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(398,17): error TS2339: Property 'parentId' does not exist on type '{ [x: string]: any; type: string; chain: any[]; moduleId: any; parentId?: undefined; outdatedModu...'.
-  Property 'parentId' does not exist on type '{ type: string; moduleId: string; }'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(405,8): error TS2322: Type 'Error' is not assignable to type 'boolean'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(426,42): error TS2339: Property 'outdatedModules' does not exist on type '{ [x: string]: any; type: string; chain: any[]; moduleId: any; parentId?: undefined; outdatedModu...'.
-  Property 'outdatedModules' does not exist on type '{ type: string; moduleId: string; }'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(427,30): error TS2339: Property 'outdatedDependencies' does not exist on type '{ [x: string]: any; type: string; chain: any[]; moduleId: any; parentId?: undefined; outdatedModu...'.
-  Property 'outdatedDependencies' does not exist on type '{ type: string; moduleId: string; }'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(430,16): error TS2339: Property 'outdatedDependencies' does not exist on type '{ [x: string]: any; type: string; chain: any[]; moduleId: any; parentId?: undefined; outdatedModu...'.
-  Property 'outdatedDependencies' does not exist on type '{ type: string; moduleId: string; }'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(438,16): error TS2339: Property 'outdatedDependencies' does not exist on type '{ [x: string]: any; type: string; chain: any[]; moduleId: any; parentId?: undefined; outdatedModu...'.
-  Property 'outdatedDependencies' does not exist on type '{ type: string; moduleId: string; }'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(455,5): error TS2304: Cannot find name 'installedModules'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(456,5): error TS2304: Cannot find name 'installedModules'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(460,20): error TS2304: Cannot find name 'installedModules'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(468,5): error TS2304: Cannot find name 'hotDisposeChunk'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(476,13): error TS2304: Cannot find name 'installedModules'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(493,11): error TS2304: Cannot find name 'installedModules'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(500,17): error TS2304: Cannot find name 'installedModules'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(516,14): error TS2304: Cannot find name 'installedModules'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(536,5): error TS2304: Cannot find name 'modules'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(546,14): error TS2304: Cannot find name 'installedModules'.
-node_modules/webpack/lib/HotModuleReplacement.runtime.js(586,5): error TS2304: Cannot find name '$require$'.
-node_modules/webpack/lib/HotModuleReplacementPlugin.js(7,34): error TS2307: Cannot find module 'tapable'.
-node_modules/webpack/lib/HotModuleReplacementPlugin.js(8,31): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/HotModuleReplacementPlugin.js(149,8): error TS2322: Type 'string | number' is not assignable to type 'string'.
-  Type 'number' is not assignable to type 'string'.
-node_modules/webpack/lib/HotUpdateChunkTemplate.js(9,58): error TS2307: Cannot find module 'tapable'.
-node_modules/webpack/lib/HotUpdateChunkTemplate.js(47,18): error TS2551: Property 'removedModules' does not exist on type 'Chunk'. Did you mean 'removeModule'?
-node_modules/webpack/lib/JavascriptGenerator.js(7,46): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/JavascriptModulesPlugin.js(9,34): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/JsonGenerator.js(7,34): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/LibManifestPlugin.js(8,26): error TS2307: Cannot find module 'neo-async'.
-node_modules/webpack/lib/LibManifestPlugin.js(57,14): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/LibManifestPlugin.js(57,28): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/LoaderOptionsPlugin.js(9,33): error TS2307: Cannot find module 'schema-utils'.
-node_modules/webpack/lib/LoaderOptionsPlugin.js(10,24): error TS2307: Cannot find module '../schemas/plugins/LoaderOptionsPlugin.json'.
-node_modules/webpack/lib/MainTemplate.js(12,13): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/MainTemplate.js(18,13): error TS2307: Cannot find module 'tapable'.
-node_modules/webpack/lib/MemoryOutputFileSystem.js(5,26): error TS2307: Cannot find module 'memory-fs'.
-node_modules/webpack/lib/ModuleTemplate.js(7,58): error TS2307: Cannot find module 'tapable'.
-node_modules/webpack/lib/MultiCompiler.js(7,50): error TS2307: Cannot find module 'tapable'.
-node_modules/webpack/lib/MultiCompiler.js(8,26): error TS2307: Cannot find module 'neo-async'.
-node_modules/webpack/lib/MultiModule.js(9,31): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/MultiModule.js(11,7): error TS2415: Class 'MultiModule' incorrectly extends base class 'Module'.
-  Types of property 'built' are incompatible.
-    Type 'boolean | undefined' is not assignable to type 'boolean'.
-      Type 'undefined' is not assignable to type 'boolean'.
-node_modules/webpack/lib/MultiModuleFactory.js(7,29): error TS2307: Cannot find module 'tapable'.
-node_modules/webpack/lib/MultiStats.js(71,42): error TS2307: Cannot find module '../package.json'.
-node_modules/webpack/lib/MultiWatching.js(7,26): error TS2307: Cannot find module 'neo-async'.
-node_modules/webpack/lib/NormalModule.js(16,13): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/NormalModule.js(17,44): error TS2307: Cannot find module 'loader-runner'.
-node_modules/webpack/lib/NormalModule.js(64,7): error TS2415: Class 'NormalModule' incorrectly extends base class 'Module'.
-  Types of property 'built' are incompatible.
-    Type 'boolean | undefined' is not assignable to type 'boolean'.
-      Type 'undefined' is not assignable to type 'boolean'.
-node_modules/webpack/lib/NormalModule.js(157,47): error TS2345: Argument of type 'this' is not assignable to parameter of type 'Module | undefined'.
-  Type 'NormalModule' is not assignable to type 'Module | undefined'.
-    Type 'NormalModule' is not assignable to type 'Module'.
-      Type 'this' is not assignable to type 'Module'.
-        Type 'NormalModule' is not assignable to type 'Module'.
-          Property 'exports' is missing in type 'NormalModule'.
-node_modules/webpack/lib/NormalModule.js(158,33): error TS2339: Property '_nodeModulePaths' does not exist on type 'typeof Module'.
-node_modules/webpack/lib/NormalModule.js(167,10): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/NormalModule.js(167,33): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/NormalModule.js(168,5): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/NormalModule.js(234,6): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/NormalModule.js(235,6): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/NormalModule.js(236,6): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/NormalModule.js(432,8): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/NormalModule.js(437,22): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/NormalModule.js(440,21): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/NormalModule.js(442,22): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/NormalModule.js(445,21): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/NormalModuleFactory.js(7,26): error TS2307: Cannot find module 'neo-async'.
-node_modules/webpack/lib/NormalModuleFactory.js(15,13): error TS2307: Cannot find module 'tapable'.
-node_modules/webpack/lib/Parser.js(9,23): error TS2307: Cannot find module 'acorn-dynamic-import'.
-node_modules/webpack/lib/Parser.js(10,43): error TS2307: Cannot find module 'tapable'.
-node_modules/webpack/lib/RawModule.js(8,47): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/ResolverFactory.js(7,67): error TS2307: Cannot find module 'tapable'.
-node_modules/webpack/lib/ResolverFactory.js(8,25): error TS2307: Cannot find module 'enhanced-resolve'.
-node_modules/webpack/lib/RuntimeTemplate.js(62,26): error TS2345: Argument of type '{ request: any; }' is not assignable to parameter of type '{ request: any; chunkName: any; chunkReason: any; message: any; exportName: any; }'.
-  Property 'chunkName' is missing in type '{ request: any; }'.
-node_modules/webpack/lib/RuntimeTemplate.js(109,32): error TS2345: Argument of type '{ request: any; }' is not assignable to parameter of type '{ request: any; chunkName: any; chunkReason: any; message: any; exportName: any; }'.
-  Property 'chunkName' is missing in type '{ request: any; }'.
-node_modules/webpack/lib/RuntimeTemplate.js(148,32): error TS2345: Argument of type '{ request: any; }' is not assignable to parameter of type '{ request: any; chunkName: any; chunkReason: any; message: any; exportName: any; }'.
-  Property 'chunkName' is missing in type '{ request: any; }'.
-node_modules/webpack/lib/RuntimeTemplate.js(233,33): error TS2345: Argument of type '{ message: any; }' is not assignable to parameter of type '{ request: any; chunkName: any; chunkReason: any; message: any; exportName: any; }'.
-  Property 'request' is missing in type '{ message: any; }'.
-node_modules/webpack/lib/RuntimeTemplate.js(241,32): error TS2345: Argument of type '{ message: any; chunkName: any; chunkReason: any; }' is not assignable to parameter of type '{ request: any; chunkName: any; chunkReason: any; message: any; exportName: any; }'.
-  Property 'request' is missing in type '{ message: any; chunkName: any; chunkReason: any; }'.
-node_modules/webpack/lib/SetVarMainTemplatePlugin.js(7,34): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/SourceMapDevToolPlugin.js(8,45): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/SourceMapDevToolPlugin.js(13,33): error TS2307: Cannot find module 'schema-utils'.
-node_modules/webpack/lib/SourceMapDevToolPlugin.js(14,24): error TS2307: Cannot find module '../schemas/plugins/SourceMapDevToolPlugin.json'.
-node_modules/webpack/lib/Stats.js(39,8): error TS2358: The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter.
-node_modules/webpack/lib/Stats.js(40,30): error TS2339: Property 'test' does not exist on type 'never'.
-node_modules/webpack/lib/Stats.js(328,26): error TS2307: Cannot find module '../package.json'.
-node_modules/webpack/lib/Stats.js(390,18): error TS2345: Argument of type 'any[]' is not assignable to parameter of type 'ConcatArray<never>'.
-  Types of property 'slice' are incompatible.
-    Type '(start?: number | undefined, end?: number | undefined) => any[]' is not assignable to type '(start?: number | undefined, end?: number | undefined) => never[]'.
-      Type 'any[]' is not assignable to type 'never[]'.
-        Type 'any' is not assignable to type 'never'.
-node_modules/webpack/lib/Stats.js(753,6): error TS2345: Argument of type '{ day: string; month: string; year: string; }' is not assignable to parameter of type 'string | string[] | undefined'.
-  Object literal may only specify known properties, and 'day' does not exist in type 'string | string[] | undefined'.
-node_modules/webpack/lib/Template.js(7,34): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/UmdMainTemplatePlugin.js(7,50): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/WatchIgnorePlugin.js(7,33): error TS2307: Cannot find module 'schema-utils'.
-node_modules/webpack/lib/WatchIgnorePlugin.js(8,24): error TS2307: Cannot find module '../schemas/plugins/WatchIgnorePlugin.json'.
-node_modules/webpack/lib/WebAssemblyParser.js(10,29): error TS2307: Cannot find module 'tapable'.
-node_modules/webpack/lib/WebAssemblyParser.js(30,14): error TS2304: Cannot find name 'WebAssembly'.
-node_modules/webpack/lib/WebAssemblyParser.js(31,4): error TS2304: Cannot find name 'WebAssembly'.
-node_modules/webpack/lib/WebAssemblyParser.js(33,47): error TS2304: Cannot find name 'WebAssembly'.
-node_modules/webpack/lib/WebAssemblyParser.js(36,24): error TS2304: Cannot find name 'WebAssembly'.
-node_modules/webpack/lib/WebpackError.js(9,29): error TS2339: Property 'details' does not exist on type 'WebpackError'.
-node_modules/webpack/lib/WebpackError.js(9,49): error TS2339: Property 'details' does not exist on type 'WebpackError'.
-node_modules/webpack/lib/WebpackOptionsDefaulter.js(276,37): error TS2307: Cannot find module 'uglifyjs-webpack-plugin'.
-node_modules/webpack/lib/WebpackOptionsValidationError.js(8,38): error TS2307: Cannot find module '../schemas/WebpackOptions.json'.
-node_modules/webpack/lib/WebpackOptionsValidationError.js(144,33): error TS2345: Argument of type '0' is not assignable to parameter of type '(string | number)[] | null | undefined'.
-node_modules/webpack/lib/WebpackOptionsValidationError.js(309,5): error TS2345: Argument of type '0' is not assignable to parameter of type '(string | number)[] | null | undefined'.
-node_modules/webpack/lib/debug/ProfilingPlugin.js(2,28): error TS2307: Cannot find module 'chrome-trace-event'.
-node_modules/webpack/lib/debug/ProfilingPlugin.js(3,33): error TS2307: Cannot find module 'schema-utils'.
-node_modules/webpack/lib/debug/ProfilingPlugin.js(4,24): error TS2307: Cannot find module '../../schemas/plugins/debug/ProfilingPlugin.json'.
-node_modules/webpack/lib/debug/ProfilingPlugin.js(326,56): error TS8024: JSDoc '@param' tag has name 'opts', but there is no parameter with that name.
-node_modules/webpack/lib/dependencies/AMDDefineDependencyParserPlugin.js(296,8): error TS2339: Property 'localModule' does not exist on type 'AMDDefineDependency'.
-node_modules/webpack/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js(226,5): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js(226,9): error TS2339: Property 'functionBindThis' does not exist on type 'AMDRequireDependenciesBlock'.
-node_modules/webpack/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js(231,6): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js(231,10): error TS2339: Property 'errorCallbackBindThis' does not exist on type 'AMDRequireDependenciesBlock'.
-node_modules/webpack/lib/dependencies/CommonJsRequireDependencyParserPlugin.js(68,9): error TS2339: Property 'critical' does not exist on type 'CommonJsRequireContextDependency'.
-node_modules/webpack/lib/dependencies/ContextDependency.js(24,2): error TS2416: Property 'getResourceIdentifier' in type 'ContextDependency' is not assignable to the same property in base type 'Dependency'.
-  Type '() => string' is not assignable to type '() => null'.
-    Type 'string' is not assignable to type 'null'.
-node_modules/webpack/lib/dependencies/ContextDependency.js(34,2): error TS2416: Property 'getWarnings' in type 'ContextDependency' is not assignable to the same property in base type 'Dependency'.
-  Type '() => any[]' is not assignable to type '() => null'.
-    Type 'any[]' is not assignable to type 'null'.
-node_modules/webpack/lib/dependencies/ContextDependency.js(36,12): error TS2339: Property 'critical' does not exist on type 'ContextDependency'.
-node_modules/webpack/lib/dependencies/ContextDependency.js(37,53): error TS2339: Property 'critical' does not exist on type 'ContextDependency'.
-node_modules/webpack/lib/dependencies/DelegatedExportsDependency.js(25,2): error TS2416: Property 'getExports' in type 'DelegatedExportsDependency' is not assignable to the same property in base type 'NullDependency'.
-  Type '() => { [x: string]: any; exports: any; dependencies: undefined; }' is not assignable to type '() => null'.
-    Type '{ [x: string]: any; exports: any; dependencies: undefined; }' is not assignable to type 'null'.
-node_modules/webpack/lib/dependencies/HarmonyAcceptImportDependency.js(8,7): error TS2417: Class static side 'typeof HarmonyAcceptImportDependency' incorrectly extends base class static side 'typeof HarmonyImportDependency'.
-  Types of property 'Template' are incompatible.
-    Type 'typeof HarmonyAcceptImportDependencyTemplate' is not assignable to type 'typeof HarmonyImportDependencyTemplate'.
-      Property 'isImportEmitted' is missing in type 'typeof HarmonyAcceptImportDependencyTemplate'.
-node_modules/webpack/lib/dependencies/HarmonyExportExpressionDependency.js(20,2): error TS2416: Property 'getExports' in type 'HarmonyExportExpressionDependency' is not assignable to the same property in base type 'NullDependency'.
-  Type '() => { [x: string]: any; exports: string[]; dependencies: undefined; }' is not assignable to type '() => null'.
-    Type '{ [x: string]: any; exports: string[]; dependencies: undefined; }' is not assignable to type 'null'.
-node_modules/webpack/lib/dependencies/HarmonyExportImportedSpecifierDependency.js(252,2): error TS2416: Property 'getExports' in type 'HarmonyExportImportedSpecifierDependency' is not assignable to the same property in base type 'HarmonyImportDependency'.
-  Type '() => { [x: string]: any; exports: any[]; dependencies: undefined; } | { [x: string]: any; export...' is not assignable to type '() => null'.
-    Type '{ [x: string]: any; exports: any[]; dependencies: undefined; } | { [x: string]: any; exports: nul...' is not assignable to type 'null'.
-      Type '{ [x: string]: any; exports: any[]; dependencies: undefined; }' is not assignable to type 'null'.
-node_modules/webpack/lib/dependencies/HarmonyExportImportedSpecifierDependency.js(292,2): error TS2416: Property 'getWarnings' in type 'HarmonyExportImportedSpecifierDependency' is not assignable to the same property in base type 'HarmonyImportDependency'.
-  Type '() => HarmonyLinkingError[] | undefined' is not assignable to type '() => null'.
-    Type 'HarmonyLinkingError[] | undefined' is not assignable to type 'null'.
-      Type 'undefined' is not assignable to type 'null'.
-node_modules/webpack/lib/dependencies/HarmonyExportImportedSpecifierDependency.js(302,2): error TS2416: Property 'getErrors' in type 'HarmonyExportImportedSpecifierDependency' is not assignable to the same property in base type 'HarmonyImportDependency'.
-  Type '() => HarmonyLinkingError[] | undefined' is not assignable to type '() => null'.
-    Type 'HarmonyLinkingError[] | undefined' is not assignable to type 'null'.
-      Type 'undefined' is not assignable to type 'null'.
-node_modules/webpack/lib/dependencies/HarmonyExportImportedSpecifierDependency.js(553,23): error TS2339: Property 'length' does not exist on type 'Set<any>'.
-node_modules/webpack/lib/dependencies/HarmonyExportImportedSpecifierDependency.js(556,36): error TS2339: Property 'concat' does not exist on type 'Set<any>'.
-node_modules/webpack/lib/dependencies/HarmonyExportSpecifierDependency.js(20,2): error TS2416: Property 'getExports' in type 'HarmonyExportSpecifierDependency' is not assignable to the same property in base type 'NullDependency'.
-  Type '() => { [x: string]: any; exports: any[]; dependencies: undefined; }' is not assignable to type '() => null'.
-    Type '{ [x: string]: any; exports: any[]; dependencies: undefined; }' is not assignable to type 'null'.
-node_modules/webpack/lib/dependencies/HarmonyImportDependencyParserPlugin.js(7,34): error TS2307: Cannot find module 'tapable'.
-node_modules/webpack/lib/dependencies/HarmonyImportDependencyParserPlugin.js(70,9): error TS2339: Property 'shorthand' does not exist on type 'HarmonyImportSpecifierDependency'.
-node_modules/webpack/lib/dependencies/HarmonyImportDependencyParserPlugin.js(92,9): error TS2339: Property 'shorthand' does not exist on type 'HarmonyImportSpecifierDependency'.
-node_modules/webpack/lib/dependencies/HarmonyImportDependencyParserPlugin.js(118,10): error TS2339: Property 'shorthand' does not exist on type 'HarmonyImportSpecifierDependency'.
-node_modules/webpack/lib/dependencies/HarmonyImportSpecifierDependency.js(46,2): error TS2416: Property 'getWarnings' in type 'HarmonyImportSpecifierDependency' is not assignable to the same property in base type 'HarmonyImportDependency'.
-  Type '() => HarmonyLinkingError[] | undefined' is not assignable to type '() => null'.
-    Type 'HarmonyLinkingError[] | undefined' is not assignable to type 'null'.
-      Type 'undefined' is not assignable to type 'null'.
-node_modules/webpack/lib/dependencies/HarmonyImportSpecifierDependency.js(56,2): error TS2416: Property 'getErrors' in type 'HarmonyImportSpecifierDependency' is not assignable to the same property in base type 'HarmonyImportDependency'.
-  Type '() => HarmonyLinkingError[] | undefined' is not assignable to type '() => null'.
-    Type 'HarmonyLinkingError[] | undefined' is not assignable to type 'null'.
-      Type 'undefined' is not assignable to type 'null'.
-node_modules/webpack/lib/dependencies/JsonExportsDependency.js(18,2): error TS2416: Property 'getExports' in type 'JsonExportsDependency' is not assignable to the same property in base type 'NullDependency'.
-  Type '() => { [x: string]: any; exports: any; dependencies: undefined; }' is not assignable to type '() => null'.
-    Type '{ [x: string]: any; exports: any; dependencies: undefined; }' is not assignable to type 'null'.
-node_modules/webpack/lib/dependencies/ModuleDependency.js(15,2): error TS2416: Property 'getResourceIdentifier' in type 'ModuleDependency' is not assignable to the same property in base type 'Dependency'.
-  Type '() => string' is not assignable to type '() => null'.
-    Type 'string' is not assignable to type 'null'.
-node_modules/webpack/lib/node/NodeChunkTemplatePlugin.js(8,34): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/node/NodeHotUpdateChunkTemplatePlugin.js(7,34): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/node/NodeMainTemplate.runtime.js(9,30): error TS2304: Cannot find name '$hotChunkFilename$'.
-node_modules/webpack/lib/node/NodeMainTemplate.runtime.js(10,3): error TS2304: Cannot find name 'hotAddUpdateChunk'.
-node_modules/webpack/lib/node/NodeMainTemplate.runtime.js(16,32): error TS2304: Cannot find name '$hotMainFilename$'.
-node_modules/webpack/lib/node/NodeMainTemplate.runtime.js(25,10): error TS2304: Cannot find name 'installedChunks'.
-node_modules/webpack/lib/node/NodeMainTemplateAsync.runtime.js(9,50): error TS2304: Cannot find name '$hotChunkFilename$'.
-node_modules/webpack/lib/node/NodeMainTemplateAsync.runtime.js(12,9): error TS2304: Cannot find name '$require$'.
-node_modules/webpack/lib/node/NodeMainTemplateAsync.runtime.js(12,35): error TS2304: Cannot find name '$require$'.
-node_modules/webpack/lib/node/NodeMainTemplateAsync.runtime.js(18,5): error TS2345: Argument of type 'string' is not assignable to parameter of type 'RunningScriptOptions | undefined'.
-node_modules/webpack/lib/node/NodeMainTemplateAsync.runtime.js(20,4): error TS2304: Cannot find name 'hotAddUpdateChunk'.
-node_modules/webpack/lib/node/NodeMainTemplateAsync.runtime.js(26,50): error TS2304: Cannot find name '$hotMainFilename$'.
-node_modules/webpack/lib/node/NodeMainTemplateAsync.runtime.js(42,10): error TS2304: Cannot find name 'installedChunks'.
-node_modules/webpack/lib/node/NodeSourcePlugin.js(8,33): error TS2307: Cannot find module 'node-libs-browser'.
-node_modules/webpack/lib/node/NodeTargetPlugin.js(10,20): error TS2339: Property 'builtinModules' does not exist on type 'typeof Module'.
-node_modules/webpack/lib/node/NodeTargetPlugin.js(10,58): error TS2339: Property 'binding' does not exist on type 'Process'.
-node_modules/webpack/lib/node/NodeWatchFileSystem.js(7,27): error TS2307: Cannot find module 'watchpack'.
-node_modules/webpack/lib/optimize/AggressiveSplittingPlugin.js(9,33): error TS2307: Cannot find module 'schema-utils'.
-node_modules/webpack/lib/optimize/AggressiveSplittingPlugin.js(10,24): error TS2307: Cannot find module '../../schemas/plugins/optimize/AggressiveSplittingPlugin.json'.
-node_modules/webpack/lib/optimize/ChunkModuleIdRangePlugin.js(14,24): error TS2339: Property 'chunks' does not exist on type 'ChunkModuleIdRangePlugin'.
-node_modules/webpack/lib/optimize/ConcatenatedModule.js(10,29): error TS2307: Cannot find module 'eslint-scope'.
-node_modules/webpack/lib/optimize/ConcatenatedModule.js(11,49): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/optimize/ConcatenatedModule.js(840,30): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/optimize/ConcatenatedModule.js(852,29): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/optimize/ConcatenatedModule.js(892,6): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/optimize/ConcatenatedModule.js(893,6): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/optimize/ConcatenatedModule.js(894,29): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/optimize/ConcatenatedModule.js(915,8): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/optimize/ConcatenatedModule.js(936,8): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/optimize/ConcatenatedModule.js(949,6): error TS2322: Type 'string' is not assignable to type 'undefined'.
-node_modules/webpack/lib/optimize/ConcatenatedModule.js(961,7): error TS2322: Type 'string' is not assignable to type 'undefined'.
-node_modules/webpack/lib/optimize/ConcatenatedModule.js(971,7): error TS2322: Type 'string' is not assignable to type 'undefined'.
-node_modules/webpack/lib/optimize/ConcatenatedModule.js(981,29): error TS2532: Object is possibly 'undefined'.
-node_modules/webpack/lib/optimize/ConcatenatedModule.js(1028,21): error TS2339: Property 'namespaceObjectSource' does not exist on type 'never'.
-node_modules/webpack/lib/optimize/LimitChunkCountPlugin.js(7,33): error TS2307: Cannot find module 'schema-utils'.
-node_modules/webpack/lib/optimize/LimitChunkCountPlugin.js(8,24): error TS2307: Cannot find module '../../schemas/plugins/optimize/LimitChunkCountPlugin.json'.
-node_modules/webpack/lib/optimize/MinChunkSizePlugin.js(7,33): error TS2307: Cannot find module 'schema-utils'.
-node_modules/webpack/lib/optimize/MinChunkSizePlugin.js(8,24): error TS2307: Cannot find module '../../schemas/plugins/optimize/MinChunkSizePlugin.json'.
-node_modules/webpack/lib/optimize/ModuleConcatenationPlugin.js(151,10): error TS2345: Argument of type 'any[][]' is not assignable to parameter of type 'Iterable<[any, any]>'.
-node_modules/webpack/lib/optimize/SideEffectsFlagPlugin.js(7,20): error TS2307: Cannot find module 'micromatch'.
-node_modules/webpack/lib/util/SortableSet.js(16,2): error TS2416: Property 'add' in type 'SortableSet' is not assignable to the same property in base type 'Set<any>'.
-  Type '(value: any) => SortableSet' is not assignable to type '(value: any) => this'.
-    Type 'SortableSet' is not assignable to type 'this'.
-node_modules/webpack/lib/util/SortableSet.js(46,45): error TS2345: Argument of type 'Function' is not assignable to parameter of type '((a: any, b: any) => number) | undefined'.
-  Type 'Function' is not assignable to type '(a: any, b: any) => number'.
-    Type 'Function' provides no match for the signature '(a: any, b: any): number'.
-node_modules/webpack/lib/util/StackedSetMap.js(99,18): error TS2345: Argument of type 'any[][]' is not assignable to parameter of type 'Iterable<[any, any]>'.
-  Types of property '[Symbol.iterator]' are incompatible.
-    Type '() => IterableIterator<any[]>' is not assignable to type '() => Iterator<[any, any]>'.
-      Type 'IterableIterator<any[]>' is not assignable to type 'Iterator<[any, any]>'.
-        Types of property 'next' are incompatible.
-          Type '{ (value?: any): IteratorResult<any[]>; (value?: any): IteratorResult<any[]>; }' is not assignable to type '{ (value?: any): IteratorResult<[any, any]>; (value?: any): IteratorResult<[any, any]>; }'.
-            Type 'IteratorResult<any[]>' is not assignable to type 'IteratorResult<[any, any]>'.
-              Type 'any[]' is not assignable to type '[any, any]'.
-                Property '0' is missing in type 'any[]'.
-node_modules/webpack/lib/util/cachedMerge.js(12,10): error TS2448: Block-scoped variable 'cachedMerge' used before its declaration.
-node_modules/webpack/lib/util/cachedMerge.js(12,29): error TS2448: Block-scoped variable 'cachedMerge' used before its declaration.
-node_modules/webpack/lib/util/objectToMap.js(9,17): error TS2345: Argument of type 'any[][]' is not assignable to parameter of type 'Iterable<[any, any]>'.
-node_modules/webpack/lib/validateSchema.js(7,21): error TS2307: Cannot find module 'ajv'.
-node_modules/webpack/lib/validateSchema.js(13,9): error TS2307: Cannot find module 'ajv-keywords'.
-node_modules/webpack/lib/wasm/WasmModuleTemplatePlugin.js(7,31): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/web/JsonpChunkTemplatePlugin.js(7,34): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/web/JsonpExportMainTemplatePlugin.js(7,34): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/web/JsonpHotUpdateChunkTemplatePlugin.js(7,34): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/web/JsonpMainTemplate.runtime.js(9,3): error TS2304: Cannot find name 'hotAddUpdateChunk'.
-node_modules/webpack/lib/web/JsonpMainTemplate.runtime.js(10,7): error TS2304: Cannot find name 'parentHotUpdateCallback'.
-node_modules/webpack/lib/web/JsonpMainTemplate.runtime.js(10,32): error TS2304: Cannot find name 'parentHotUpdateCallback'.
-node_modules/webpack/lib/web/JsonpMainTemplate.runtime.js(18,16): error TS2304: Cannot find name '$require$'.
-node_modules/webpack/lib/web/JsonpMainTemplate.runtime.js(18,30): error TS2304: Cannot find name '$hotChunkFilename$'.
-node_modules/webpack/lib/web/JsonpMainTemplate.runtime.js(19,3): error TS2304: Cannot find name '$crossOriginLoading$'.
-node_modules/webpack/lib/web/JsonpMainTemplate.runtime.js(31,23): error TS2304: Cannot find name '$require$'.
-node_modules/webpack/lib/web/JsonpMainTemplate.runtime.js(31,37): error TS2304: Cannot find name '$hotMainFilename$'.
-node_modules/webpack/lib/web/JsonpMainTemplatePlugin.js(7,39): error TS2307: Cannot find module 'tapable'.
-node_modules/webpack/lib/webpack.js(14,38): error TS2307: Cannot find module '../schemas/WebpackOptions.json'.
-node_modules/webpack/lib/webpack.js(16,25): error TS2307: Cannot find module '../package.json'.
-node_modules/webpack/lib/webpack.js(63,1): error TS2539: Cannot assign to '"/home/nathansa/ts/tests/cases/user/webpack/node_modules/webpack/lib/webpack"' because it is not a variable.
-node_modules/webpack/lib/webworker/WebWorkerChunkTemplatePlugin.js(7,34): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/webworker/WebWorkerHotUpdateChunkTemplatePlugin.js(6,34): error TS2307: Cannot find module 'webpack-sources'.
-node_modules/webpack/lib/webworker/WebWorkerMainTemplate.runtime.js(9,3): error TS2304: Cannot find name 'hotAddUpdateChunk'.
-node_modules/webpack/lib/webworker/WebWorkerMainTemplate.runtime.js(10,7): error TS2304: Cannot find name 'parentHotUpdateCallback'.
-node_modules/webpack/lib/webworker/WebWorkerMainTemplate.runtime.js(10,32): error TS2304: Cannot find name 'parentHotUpdateCallback'.
-node_modules/webpack/lib/webworker/WebWorkerMainTemplate.runtime.js(15,3): error TS2304: Cannot find name 'importScripts'.
-node_modules/webpack/lib/webworker/WebWorkerMainTemplate.runtime.js(15,17): error TS2304: Cannot find name '$require$'.
-node_modules/webpack/lib/webworker/WebWorkerMainTemplate.runtime.js(15,31): error TS2304: Cannot find name '$hotChunkFilename$'.
-node_modules/webpack/lib/webworker/WebWorkerMainTemplate.runtime.js(26,23): error TS2304: Cannot find name '$require$'.
-node_modules/webpack/lib/webworker/WebWorkerMainTemplate.runtime.js(26,37): error TS2304: Cannot find name '$hotMainFilename$'.
-node_modules/webpack/lib/webworker/WebWorkerMainTemplate.runtime.js(62,10): error TS2304: Cannot find name 'installedChunks'.
-
-
-
-Standard error:
diff --git a/tests/cases/compiler/aliasDoesNotDuplicateSignatures.ts b/tests/cases/compiler/aliasDoesNotDuplicateSignatures.ts
new file mode 100644
index 00000000000..fcae45f3dc1
--- /dev/null
+++ b/tests/cases/compiler/aliasDoesNotDuplicateSignatures.ts
@@ -0,0 +1,13 @@
+// @filename: demo.d.ts
+declare namespace demoNS {
+    function f(): void;
+}
+declare module 'demoModule' {
+    import alias = demoNS;
+    export = alias;
+}
+// @filename: user.ts
+import { f } from 'demoModule';
+// Assign an incorrect type here to see the type of 'f'.
+let x1: string = demoNS.f;
+let x2: string = f;
\ No newline at end of file
diff --git a/tests/cases/compiler/allowJscheckJsTypeParameterNoCrash.ts b/tests/cases/compiler/allowJscheckJsTypeParameterNoCrash.ts
new file mode 100644
index 00000000000..90f9869d94d
--- /dev/null
+++ b/tests/cases/compiler/allowJscheckJsTypeParameterNoCrash.ts
@@ -0,0 +1,21 @@
+// @checkJs: true
+// @allowJs: true
+// @outDir: ./dist
+// @filename: func.ts
+interface ComponentOptions<V> {
+    watch: Record<string, WatchHandler<any>>;
+}
+type WatchHandler<T> = (val: T) => void;
+declare function extend(options: ComponentOptions<{}>): void;
+export var vextend = extend;
+// @filename: app.js
+import {vextend} from './func';
+// hover on vextend
+export var a = vextend({
+  watch: {
+    data1(val) {
+      this.data2 = 1;
+    },
+    data2(val) { },
+  }
+});
\ No newline at end of file
diff --git a/tests/cases/compiler/checkJsTypeDefNoUnusedLocalMarked.ts b/tests/cases/compiler/checkJsTypeDefNoUnusedLocalMarked.ts
new file mode 100644
index 00000000000..559e0ee7254
--- /dev/null
+++ b/tests/cases/compiler/checkJsTypeDefNoUnusedLocalMarked.ts
@@ -0,0 +1,20 @@
+// @allowJs: true
+// @checkJs: true
+// @noEmit: true
+// @noUnusedLocals: true
+// @filename: file.ts
+class Foo {
+    x: number;
+}
+
+declare global {
+    var module: any; // Just here to remove unrelated error from test
+}
+
+export = Foo;
+// @filename: something.js
+/** @typedef {typeof import("./file")} Foo */
+
+/** @typedef {(foo: Foo) => string} FooFun */
+
+module.exports = /** @type {FooFun} */(void 0);
\ No newline at end of file
diff --git a/tests/cases/compiler/commonJsImportClassExpression.ts b/tests/cases/compiler/commonJsImportClassExpression.ts
new file mode 100644
index 00000000000..1cd856d4b1b
--- /dev/null
+++ b/tests/cases/compiler/commonJsImportClassExpression.ts
@@ -0,0 +1,9 @@
+// @Filename: mod1.ts
+export = class {
+    chunk = 1
+}
+
+// @Filename: use.ts
+import Chunk = require('./mod1')
+declare var c: Chunk;
+c.chunk;
diff --git a/tests/cases/compiler/deeplyNestedCheck.ts b/tests/cases/compiler/deeplyNestedCheck.ts
index e95233af985..366599be966 100644
--- a/tests/cases/compiler/deeplyNestedCheck.ts
+++ b/tests/cases/compiler/deeplyNestedCheck.ts
@@ -5,5 +5,5 @@ interface DataSnapshot<X = {}> {
 }
 
 interface Snapshot<T> extends DataSnapshot {
-  child<U extends keyof T>(path: U): Snapshot<T[U]>;
+  child<U extends Extract<keyof T, string>>(path: U): Snapshot<T[U]>;
 }
diff --git a/tests/cases/compiler/deferredLookupTypeResolution.ts b/tests/cases/compiler/deferredLookupTypeResolution.ts
index 6c9853266ad..2970540afbd 100644
--- a/tests/cases/compiler/deferredLookupTypeResolution.ts
+++ b/tests/cases/compiler/deferredLookupTypeResolution.ts
@@ -8,7 +8,7 @@ type StringContains<S extends string, L extends string> = (
     { [key: string]: 'false' }
   )[L]
 
-type ObjectHasKey<O, L extends string> = StringContains<keyof O, L>
+type ObjectHasKey<O, L extends string> = StringContains<Extract<keyof O, string>, L>
 
 type First<T> = ObjectHasKey<T, '0'>;  // Should be deferred
 
diff --git a/tests/cases/compiler/deferredLookupTypeResolution2.ts b/tests/cases/compiler/deferredLookupTypeResolution2.ts
index 4aa18c092ba..6b8a161e6df 100644
--- a/tests/cases/compiler/deferredLookupTypeResolution2.ts
+++ b/tests/cases/compiler/deferredLookupTypeResolution2.ts
@@ -5,7 +5,7 @@
 
 type StringContains<S extends string, L extends string> = ({ [K in S]: 'true' } & { [key: string]: 'false'})[L];
 
-type ObjectHasKey<O, L extends string> = StringContains<keyof O, L>;
+type ObjectHasKey<O, L extends string> = StringContains<Extract<keyof O, string>, L>;
 
 type A<T> = ObjectHasKey<T, '0'>;
 
diff --git a/tests/cases/compiler/destructuredLateBoundNameHasCorrectTypes.ts b/tests/cases/compiler/destructuredLateBoundNameHasCorrectTypes.ts
new file mode 100644
index 00000000000..b2e6538e49e
--- /dev/null
+++ b/tests/cases/compiler/destructuredLateBoundNameHasCorrectTypes.ts
@@ -0,0 +1,12 @@
+// @target: es6
+let { [Symbol.iterator]: destructured } = [];
+void destructured;
+
+const named = "prop";
+
+let { [named]: computed } = { prop: "b" };
+void computed;
+
+const notPresent = "prop2";
+
+let { [notPresent]: computed2 } = { prop: "b" };
diff --git a/tests/cases/compiler/importTypeResolutionJSDocEOF.ts b/tests/cases/compiler/importTypeResolutionJSDocEOF.ts
new file mode 100644
index 00000000000..a900669e592
--- /dev/null
+++ b/tests/cases/compiler/importTypeResolutionJSDocEOF.ts
@@ -0,0 +1,13 @@
+// @allowJs: true
+// @noEmit: true
+// @checkJs: true
+// @filename: interfaces.d.ts
+export interface Bar {
+    prop: string
+}
+
+// @filename: usage.js
+/** @type {Bar} */
+export let bar;
+
+/** @typedef {import('./interfaces').Bar} Bar */
\ No newline at end of file
diff --git a/tests/cases/compiler/indexedAccessRetainsIndexSignature.ts b/tests/cases/compiler/indexedAccessRetainsIndexSignature.ts
index d23cbe87ddf..11abf771edc 100644
--- a/tests/cases/compiler/indexedAccessRetainsIndexSignature.ts
+++ b/tests/cases/compiler/indexedAccessRetainsIndexSignature.ts
@@ -1,4 +1,4 @@
-type Diff<T extends string, U extends string> =
+type Diff<T extends keyof any, U extends keyof any> =
     ({ [P in T]: P } & { [P in U]: never } & { [x: string]: never })[T]
 type Omit<U, K extends keyof U> = Pick<U, Diff<keyof U, K>>
 type Omit1<U, K extends keyof U> = Pick<U, Diff<keyof U, K>>;
diff --git a/tests/cases/compiler/keyofDoesntContainSymbols.ts b/tests/cases/compiler/keyofDoesntContainSymbols.ts
index 5690d4c6b88..3c62d10b3fc 100644
--- a/tests/cases/compiler/keyofDoesntContainSymbols.ts
+++ b/tests/cases/compiler/keyofDoesntContainSymbols.ts
@@ -1,4 +1,6 @@
 // @lib: es6
+// @keyofStringsOnly: true
+
 const sym = Symbol();
 const num = 0;
 const obj = { num: 0, str: 's', [num]: num as 0, [sym]: sym };
diff --git a/tests/cases/compiler/lateBoundConstraintTypeChecksCorrectly.ts b/tests/cases/compiler/lateBoundConstraintTypeChecksCorrectly.ts
index 09aa9cfdd94..e756b4ef4e0 100644
--- a/tests/cases/compiler/lateBoundConstraintTypeChecksCorrectly.ts
+++ b/tests/cases/compiler/lateBoundConstraintTypeChecksCorrectly.ts
@@ -1,3 +1,5 @@
+// @keyofStringsOnly: true
+
 declare const fooProp: unique symbol;
 declare const barProp: unique symbol;
 
diff --git a/tests/cases/compiler/noCrashOnThisTypeUsage.ts b/tests/cases/compiler/noCrashOnThisTypeUsage.ts
new file mode 100644
index 00000000000..7f3832a70d7
--- /dev/null
+++ b/tests/cases/compiler/noCrashOnThisTypeUsage.ts
@@ -0,0 +1,26 @@
+// @strict: true
+
+interface IListenable {
+    changeListeners: Function[] | null
+    observe(handler: (change: any, oldValue?: any) => void, fireImmediately?: boolean): void
+}
+
+function notifyListeners<T>(listenable: IListenable, change: T) {
+}
+
+export class ObservableValue<T> {
+    constructor(
+        public value: T
+    ) {
+        const newValue: T = value;
+        const oldValue: any = null;
+        notifyListeners(this, {
+            type: "update",
+            object: this,
+            newValue,
+            oldValue
+        });
+    }
+    changeListeners: Function[] | null = [];
+    observe(handler: (change: any, oldValue?: any) => void, fireImmediately?: boolean) {}
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/recursiveTypeRelations.ts b/tests/cases/compiler/recursiveTypeRelations.ts
index 18545300f77..f9f71ae04b1 100644
--- a/tests/cases/compiler/recursiveTypeRelations.ts
+++ b/tests/cases/compiler/recursiveTypeRelations.ts
@@ -1,6 +1,6 @@
 // Repro from #14896
 
-type Attributes<Keys extends string> = {
+type Attributes<Keys extends keyof any> = {
     [Key in Keys]: string;
 }
 
diff --git a/tests/cases/compiler/tripleSlashInCommentNotParsed.ts b/tests/cases/compiler/tripleSlashInCommentNotParsed.ts
new file mode 100644
index 00000000000..34ab70ace3a
--- /dev/null
+++ b/tests/cases/compiler/tripleSlashInCommentNotParsed.ts
@@ -0,0 +1,4 @@
+/*
+/// <reference path="non-existing-file.d.ts" />
+*/
+void 0;
\ No newline at end of file
diff --git a/tests/cases/conformance/controlFlow/controlFlowIIFE.ts b/tests/cases/conformance/controlFlow/controlFlowIIFE.ts
index c72f038c1ec..8cd9047cb05 100644
--- a/tests/cases/conformance/controlFlow/controlFlowIIFE.ts
+++ b/tests/cases/conformance/controlFlow/controlFlowIIFE.ts
@@ -1,4 +1,5 @@
 // @strictNullChecks: true
+// @target: ES2017
 
 declare function getStringOrNumber(): string | number;
 
@@ -45,4 +46,31 @@ if (!test) {
 }
 (() => {
     test.slice(1); // No error
-})();
\ No newline at end of file
+})();
+
+// Repro from #23565
+
+function f4() {
+    let v: number;
+    (function() {
+        v = 1;
+    })();
+    v;
+}
+
+function f5() {
+    let v: number;
+    (function*() {
+        yield 1;
+        v = 1;
+    })();
+    v; // still undefined
+}
+
+function f6() {
+    let v: number;
+    (async function() {
+        v = await 1;
+    })();
+    v; // still undefined
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/enums/enumConstantMemberWithString.ts b/tests/cases/conformance/enums/enumConstantMemberWithString.ts
new file mode 100644
index 00000000000..0d2e3a207e2
--- /dev/null
+++ b/tests/cases/conformance/enums/enumConstantMemberWithString.ts
@@ -0,0 +1,32 @@
+enum T1 {
+    a = "1",
+    b = "1" + "2",
+    c = "1" + "2" + "3",
+    d = "a" - "a",
+    e = "a" + 1
+}
+
+enum T2 {
+    a = "1",
+    b = "1" + "2"
+}
+
+enum T3 {
+    a = "1",
+    b = "1" + "2",
+    c = 1,
+    d = 1 + 2
+}
+
+enum T4 {
+    a = "1"
+}
+
+enum T5 {
+    a = "1" + "2"
+}
+
+declare enum T6 {
+    a = "1",
+    b = "1" + "2"
+}
diff --git a/tests/cases/conformance/enums/enumConstantMemberWithStringEmitDeclaration.ts b/tests/cases/conformance/enums/enumConstantMemberWithStringEmitDeclaration.ts
new file mode 100644
index 00000000000..37667dca79c
--- /dev/null
+++ b/tests/cases/conformance/enums/enumConstantMemberWithStringEmitDeclaration.ts
@@ -0,0 +1,29 @@
+// @declaration: true
+enum T1 {
+    a = "1",
+    b = "1" + "2",
+    c = "1" + "2" + "3"
+}
+
+enum T2 {
+    a = "1",
+    b = "1" + "2"
+}
+
+enum T3 {
+    a = "1",
+    b = "1" + "2"
+}
+
+enum T4 {
+    a = "1"
+}
+
+enum T5 {
+    a = "1" + "2"
+}
+
+declare enum T6 {
+    a = "1",
+    b = "1" + "2"
+}
diff --git a/tests/cases/conformance/es6/modules/importEmptyFromModuleNotExisted.ts b/tests/cases/conformance/es6/modules/importEmptyFromModuleNotExisted.ts
new file mode 100644
index 00000000000..36bca3e9619
--- /dev/null
+++ b/tests/cases/conformance/es6/modules/importEmptyFromModuleNotExisted.ts
@@ -0,0 +1 @@
+import {} from 'module-not-existed'
diff --git a/tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments1.ts b/tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments1.ts
new file mode 100644
index 00000000000..2f3fc71e65d
--- /dev/null
+++ b/tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments1.ts
@@ -0,0 +1,47 @@
+// @target: esnext
+
+declare function f<T>(strs: TemplateStringsArray, ...callbacks: Array<(x: T) => any>): void;
+
+interface Stuff {
+    x: number;
+    y: string;
+    z: boolean;
+}
+
+export const a = f<Stuff> `
+    hello
+    ${stuff => stuff.x}
+    brave
+    ${stuff => stuff.y}
+    world
+    ${stuff => stuff.z}
+`;
+
+declare function g<Input, T, U, V>(
+    strs: TemplateStringsArray,
+    t: (i: Input) => T, u: (i: Input) => U, v: (i: Input) => V): T | U | V;
+
+export const b = g<Stuff, number, string, boolean> `
+    hello
+    ${stuff => stuff.x}
+    brave
+    ${stuff => stuff.y}
+    world
+    ${stuff => stuff.z}
+`;
+
+declare let obj: {
+    prop: <T>(strs: TemplateStringsArray, x: (input: T) => T) => {
+        returnedObjProp: T
+    }
+}
+
+export let c = obj["prop"]<Stuff> `${(input) => ({ ...input })}`
+c.returnedObjProp.x;
+c.returnedObjProp.y;
+c.returnedObjProp.z;
+
+c = obj.prop<Stuff> `${(input) => ({ ...input })}`
+c.returnedObjProp.x;
+c.returnedObjProp.y;
+c.returnedObjProp.z;
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments2.ts b/tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments2.ts
new file mode 100644
index 00000000000..a7a0044d93d
--- /dev/null
+++ b/tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments2.ts
@@ -0,0 +1,41 @@
+// @target: esnext
+// @strict: true
+
+export interface SomethingTaggable {
+    <T>(t: TemplateStringsArray, ...args: T[]): SomethingNewable;
+}
+
+export interface SomethingNewable {
+    new <T>(...args: T[]): any;
+}
+
+declare const tag: SomethingTaggable;
+
+const a = new tag `${100} ${200}`<string>("hello", "world");
+
+const b = new tag<number> `${"hello"} ${"world"}`(100, 200);
+
+const c = new tag<number> `${100} ${200}`<string>("hello", "world");
+
+const d = new tag<number> `${"hello"} ${"world"}`<string>(100, 200);
+
+/**
+ * Testing ASI. This should never parse as
+ *
+ * ```ts
+ * new tag<number>;
+ * `hello${369}`();
+ * ```
+ */
+const e = new tag<number>
+`hello`();
+
+class SomeBase<A, B, C> {
+    a!: A; b!: B; c!: C;
+}
+
+class SomeDerived<T> extends SomeBase<number, string, T> {
+    constructor() {
+        super<number, string, T> `hello world`;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/jsdoc/jsdocImportType.ts b/tests/cases/conformance/jsdoc/jsdocImportType.ts
new file mode 100644
index 00000000000..7b960601dc7
--- /dev/null
+++ b/tests/cases/conformance/jsdoc/jsdocImportType.ts
@@ -0,0 +1,27 @@
+// @allowJs: true
+// @checkJs: true
+// @noEmit: true
+// @Filename: types.d.ts
+declare function require(name: string): any;
+declare var exports: any;
+declare var module: { exports: any };
+// @Filename: mod1.js
+/// <reference path='./types.d.ts'/>
+class Chunk {
+    constructor() {
+        this.chunk = 1;
+    }
+}
+module.exports = Chunk;
+
+// @Filename: use.js
+/// <reference path='./types.d.ts'/>
+/** @typedef {import("./mod1")} C
+ * @type {C} */
+var c;
+c.chunk;
+
+const D = require("./mod1");
+/** @type {D} */
+var d;
+d.chunk;
diff --git a/tests/cases/conformance/jsdoc/jsdocImportType2.ts b/tests/cases/conformance/jsdoc/jsdocImportType2.ts
new file mode 100644
index 00000000000..98ffc506144
--- /dev/null
+++ b/tests/cases/conformance/jsdoc/jsdocImportType2.ts
@@ -0,0 +1,26 @@
+// @allowJs: true
+// @checkJs: true
+// @noEmit: true
+// @Filename: types.d.ts
+declare function require(name: string): any;
+declare var exports: any;
+declare var module: { exports: any };
+// @Filename: mod1.js
+/// <reference path='./types.d.ts'/>
+module.exports = class Chunk {
+    constructor() {
+        this.chunk = 1;
+    }
+}
+
+// @Filename: use.js
+/// <reference path='./types.d.ts'/>
+/** @typedef {import("./mod1")} C
+ * @type {C} */
+var c;
+c.chunk;
+
+const D = require("./mod1");
+/** @type {D} */
+var d;
+d.chunk;
diff --git a/tests/cases/conformance/jsdoc/jsdocParamTag2.ts b/tests/cases/conformance/jsdoc/jsdocParamTag2.ts
new file mode 100644
index 00000000000..e9ebbe050c8
--- /dev/null
+++ b/tests/cases/conformance/jsdoc/jsdocParamTag2.ts
@@ -0,0 +1,71 @@
+// @allowJS: true
+// @checkJS: true
+// @noEmit: true
+// @Filename: 0.js
+
+// Object literal syntax
+/**
+ * @param {{a: string, b: string}} obj
+ * @param {string} x
+ */
+function good1({a, b}, x) {}
+/**
+ * @param {{a: string, b: string}} obj
+ * @param {{c: number, d: number}} OBJECTION
+ */
+function good2({a, b}, {c, d}) {}
+/**
+ * @param {number} x
+ * @param {{a: string, b: string}} obj
+ * @param {string} y
+ */
+function good3(x, {a, b}, y) {}
+/**
+ * @param {{a: string, b: string}} obj
+ */
+function good4({a, b}) {}
+
+// nested object syntax
+/**
+ * @param {Object} obj
+ * @param {string} obj.a - this is like the saddest way to specify a type
+ * @param {string} obj.b - but it sure does allow a lot of documentation
+ * @param {string} x
+ */
+function good5({a, b}, x) {}
+/**
+ * @param {Object} obj
+ * @param {string} obj.a
+ * @param {string} obj.b - but it sure does allow a lot of documentation
+ * @param {Object} OBJECTION - documentation here too
+ * @param {string} OBJECTION.c
+ * @param {string} OBJECTION.d - meh
+ */
+function good6({a, b}, {c, d}) {}
+/**
+ * @param {number} x
+ * @param {Object} obj
+ * @param {string} obj.a
+ * @param {string} obj.b
+ * @param {string} y
+ */
+function good7(x, {a, b}, y) {}
+/**
+ * @param {Object} obj
+ * @param {string} obj.a
+ * @param {string} obj.b
+ */
+function good8({a, b}) {}
+
+/**
+ * @param {object} obj - this type gets ignored
+ * @param {string} obj.a
+ * @param {string} obj.b - and x's type gets used for both parameters
+ * @param {string} x
+ */
+function bad1(x, {a, b}) {}
+/**
+ * @param {string} y - here, y's type gets ignored but obj's is fine
+ * @param {{a: string, b: string}} obj
+ */
+function bad2(x, {a, b}) {}
diff --git a/tests/cases/conformance/jsdoc/jsdocTemplateClass.ts b/tests/cases/conformance/jsdoc/jsdocTemplateClass.ts
new file mode 100644
index 00000000000..5cd0cde89be
--- /dev/null
+++ b/tests/cases/conformance/jsdoc/jsdocTemplateClass.ts
@@ -0,0 +1,29 @@
+// @allowJs: true
+// @checkJs: true
+// @noEmit: true
+// @Filename: templateTagOnClasses.js
+
+/**
+ * @template {T}
+ * @typedef {(t: T) => T} Id
+ */
+class Foo {
+    /** @typedef {(t: T) => T} Id2 */
+    /** @param {T} x */
+    constructor (x) {
+        this.a = x
+    }
+    /**
+     * 
+     * @param {T} x 
+     * @param {Id} y
+     * @param {Id2} alpha
+     * @return {T}
+     */
+    foo(x, y, alpha) {
+        return alpha(y(x))
+    }
+}
+var f = new Foo(1)
+var g = new Foo(false)
+f.a = g.a
diff --git a/tests/cases/conformance/jsdoc/jsdocTemplateConstructorFunction.ts b/tests/cases/conformance/jsdoc/jsdocTemplateConstructorFunction.ts
new file mode 100644
index 00000000000..dc44afe040a
--- /dev/null
+++ b/tests/cases/conformance/jsdoc/jsdocTemplateConstructorFunction.ts
@@ -0,0 +1,26 @@
+// @allowJs: true
+// @checkJs: true
+// @noEmit: true
+// @Filename: templateTagOnConstructorFunctions.js
+
+/**
+ * @template {T}
+ * @typedef {(t: T) => T} Id
+ * @param {T} t
+ */
+function Zet(t) {
+    /** @type {T} */
+    this.u
+    this.t = t
+}
+/**
+ * @param {T} v
+ * @param {Id} id
+ */
+Zet.prototype.add = function(v, id) {
+    this.u = v || this.t
+    return id(this.u)
+}
+var z = new Zet(1)
+z.t = 2
+z.u = false
diff --git a/tests/cases/conformance/jsdoc/jsdocTemplateConstructorFunction2.ts b/tests/cases/conformance/jsdoc/jsdocTemplateConstructorFunction2.ts
new file mode 100644
index 00000000000..750126a05b9
--- /dev/null
+++ b/tests/cases/conformance/jsdoc/jsdocTemplateConstructorFunction2.ts
@@ -0,0 +1,26 @@
+// @allowJs: true
+// @checkJs: true
+// @noEmit: true
+// @Filename: templateTagWithNestedTypeLiteral.js
+
+/**
+ * @template {T}
+ * @param {T} t
+ */
+function Zet(t) {
+    /** @type {T} */
+    this.u
+    this.t = t
+}
+/**
+ * @param {T} v
+ * @param {object} o
+ * @param {T} o.nested
+ */
+Zet.prototype.add = function(v, o) {
+    this.u = v || o.nested
+    return this.u
+}
+var z = new Zet(1)
+z.t = 2
+z.u = false
diff --git a/tests/cases/conformance/jsdoc/jsdocTemplateTag.ts b/tests/cases/conformance/jsdoc/jsdocTemplateTag.ts
index 79dc083a952..e69756c0941 100644
--- a/tests/cases/conformance/jsdoc/jsdocTemplateTag.ts
+++ b/tests/cases/conformance/jsdoc/jsdocTemplateTag.ts
@@ -1,6 +1,7 @@
 // @allowJs: true
 // @checkJs: true
 // @noEmit: true
+// @lib: dom,esnext
 // @Filename: forgot.js
 /**
  * @param {T} a
@@ -20,3 +21,8 @@ function g(a) {
     return () => a
 }
 let s = g('hi')()
+
+/**
+ * @param {Array.<Object>} keyframes - Can't look up types on Element since it's a global in another file. (But it shouldn't crash).
+ */
+Element.prototype.animate = function(keyframes) {};
diff --git a/tests/cases/conformance/salsa/moduleExportAlias2.ts b/tests/cases/conformance/salsa/moduleExportAlias2.ts
new file mode 100644
index 00000000000..027cc83e6f1
--- /dev/null
+++ b/tests/cases/conformance/salsa/moduleExportAlias2.ts
@@ -0,0 +1,19 @@
+// @checkJs: true
+// @allowJS: true
+// @noEmit: true
+// @Filename: node.d.ts
+declare function require(name: string): any;
+declare var exports: any;
+declare var module: { exports: any };
+// @Filename: semver.js
+/// <reference path='node.d.ts' />
+exports = module.exports = C
+exports.f = n => n + 1
+function C() {
+    this.p = 1
+}
+// @filename: index.js
+/// <reference path='node.d.ts' />
+const C = require("./semver")
+var two = C.f(1)
+var c = new C
diff --git a/tests/cases/conformance/types/conditional/conditionalTypes1.ts b/tests/cases/conformance/types/conditional/conditionalTypes1.ts
index 638cf473e19..f5c67f678eb 100644
--- a/tests/cases/conformance/types/conditional/conditionalTypes1.ts
+++ b/tests/cases/conformance/types/conditional/conditionalTypes1.ts
@@ -303,7 +303,7 @@ function f50() {
 
 // Repro from #21862
 
-type OldDiff<T extends string, U extends string> = (
+type OldDiff<T extends keyof any, U extends keyof any> = (
     & { [P in T]: P; }
     & { [P in U]: never; }
     & { [x: string]: never; }
diff --git a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
index 9ec4e820f73..03d4ae01ea1 100644
--- a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
+++ b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
@@ -190,13 +190,13 @@ function f51<T, K extends keyof T>(k: K, s: string) {
     const x2 = k as string;
 }
 
-function f52<T>(obj: { [x: string]: boolean }, k: keyof T, s: string, n: number) {
+function f52<T>(obj: { [x: string]: boolean }, k: Exclude<keyof T, symbol>, s: string, n: number) {
     const x1 = obj[s];
     const x2 = obj[n];
     const x3 = obj[k];
 }
 
-function f53<T, K extends keyof T>(obj: { [x: string]: boolean }, k: K, s: string, n: number) {
+function f53<T, K extends Exclude<keyof T, symbol>>(obj: { [x: string]: boolean }, k: K, s: string, n: number) {
     const x1 = obj[s];
     const x2 = obj[n];
     const x3 = obj[k];
@@ -556,7 +556,7 @@ class AnotherSampleClass<T> extends SampleClass<T & Foo> {
 new AnotherSampleClass({});
 
 // Positive repro from #17166
-function f3<T, K extends keyof T>(t: T, k: K, tk: T[K]): void {
+function f3<T, K extends Extract<keyof T, string>>(t: T, k: K, tk: T[K]): void {
     for (let key in t) {
         key = k // ok, K ==> keyof T
         t[key] = tk; // ok, T[K] ==> T[keyof T]
@@ -567,3 +567,21 @@ function f3<T, K extends keyof T>(t: T, k: K, tk: T[K]): void {
 type Predicates<TaggedRecord> = {
   [T in keyof TaggedRecord]: (variant: TaggedRecord[keyof TaggedRecord]) => variant is TaggedRecord[T]
 }
+
+// Repro from #23618
+
+type DBBoolTable<K extends string> = { [k in K]: 0 | 1 } 
+enum Flag {
+    FLAG_1 = "flag_1",
+    FLAG_2 = "flag_2"
+}
+
+type SimpleDBRecord<Flag extends string> = { staticField: number } & DBBoolTable<Flag>
+function getFlagsFromSimpleRecord<Flag extends string>(record: SimpleDBRecord<Flag>, flags: Flag[]) {
+    return record[flags[0]];
+}
+
+type DynamicDBRecord<Flag extends string> = ({ dynamicField: number } | { dynamicField: string }) & DBBoolTable<Flag>
+function getFlagsFromDynamicRecord<Flag extends string>(record: DynamicDBRecord<Flag>, flags: Flag[]) {
+    return record[flags[0]];
+}
diff --git a/tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts b/tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts
index f96bcdb6234..bb2b9d95117 100644
--- a/tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts
+++ b/tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts
@@ -67,19 +67,36 @@ function f10(shape: Shape) {
     setProperty(shape, cond ? "name" : "size", 10);  // Error
 }
 
-function f20<T, U>(k1: keyof (T | U), k2: keyof (T & U), o1: T | U, o2: T & U) {
-    o1[k1];
-    o1[k2];   // Error
-    o2[k1];
-    o2[k2];
-    o1 = o2;
-    o2 = o1;  // Error
-    k1 = k2;  // Error
+function f20<T, U>(x: T | U, y: T & U, k1: keyof (T | U), k2: keyof T & keyof U, k3: keyof (T & U), k4: keyof T | keyof U) {
+    x[k1];
+    x[k2];
+    x[k3];  // Error
+    x[k4];  // Error
+
+    y[k1];
+    y[k2];
+    y[k3];
+    y[k4];
+
+    k1 = k2;
+    k1 = k3;  // Error
+    k1 = k4;  // Error
+
     k2 = k1;
+    k2 = k3;  // Error
+    k2 = k4;  // Error
+
+    k3 = k1;
+    k3 = k2;
+    k3 = k4;
+
+    k4 = k1;
+    k4 = k2;
+    k4 = k3;
 }
 
 // Repro from #17166
-function f3<T, K extends keyof T, U extends T, J extends K>(
+function f3<T, K extends Extract<keyof T, string>, U extends T, J extends K>(
     t: T, k: K, tk: T[K], u: U, j: J, uk: U[K], tj: T[J], uj: U[J]): void {
     for (let key in t) {
         key = k // ok, K ==> keyof T
diff --git a/tests/cases/fourslash/codeFixClassExprClassImplementClassFunctionVoidInferred.ts b/tests/cases/fourslash/codeFixClassExprClassImplementClassFunctionVoidInferred.ts
index 9fa45fde8dc..cc72b9ccbeb 100644
--- a/tests/cases/fourslash/codeFixClassExprClassImplementClassFunctionVoidInferred.ts
+++ b/tests/cases/fourslash/codeFixClassExprClassImplementClassFunctionVoidInferred.ts
@@ -7,7 +7,6 @@
 
 verify.codeFix({
     description: "Implement interface 'A'",
-    // TODO: GH#18795
     newFileContent:
 `class A {
     f() {}
diff --git a/tests/cases/fourslash/codeFixClassExprExtendsAbstractExpressionWithTypeArgs.ts b/tests/cases/fourslash/codeFixClassExprExtendsAbstractExpressionWithTypeArgs.ts
index 24a97c70e65..a2bcd3a8ce7 100644
--- a/tests/cases/fourslash/codeFixClassExprExtendsAbstractExpressionWithTypeArgs.ts
+++ b/tests/cases/fourslash/codeFixClassExprExtendsAbstractExpressionWithTypeArgs.ts
@@ -12,7 +12,6 @@
 
 verify.codeFix({
     description: "Implement inherited abstract class",
-    // TODO: GH#18795
     newFileContent:
 `function foo<T>(a: T) {
     a;
diff --git a/tests/cases/fourslash/codeFixClassExtendAbstractExpressionWithTypeArgs.ts b/tests/cases/fourslash/codeFixClassExtendAbstractExpressionWithTypeArgs.ts
index f78cf2a3d6f..8964c167014 100644
--- a/tests/cases/fourslash/codeFixClassExtendAbstractExpressionWithTypeArgs.ts
+++ b/tests/cases/fourslash/codeFixClassExtendAbstractExpressionWithTypeArgs.ts
@@ -12,7 +12,6 @@
 
 verify.codeFix({
     description: "Implement inherited abstract class",
-    // TODO: GH#18795
     newFileContent:
 `function foo<T>(a: T) {
     a;
diff --git a/tests/cases/fourslash/codeFixClassExtendAbstractGetterSetter.ts b/tests/cases/fourslash/codeFixClassExtendAbstractGetterSetter.ts
index 75ccc956521..0a66f445cc7 100644
--- a/tests/cases/fourslash/codeFixClassExtendAbstractGetterSetter.ts
+++ b/tests/cases/fourslash/codeFixClassExtendAbstractGetterSetter.ts
@@ -20,7 +20,6 @@
 
 verify.codeFix({
     description: "Implement inherited abstract class",
-    // TODO: GH#18795
     newFileContent:
 `abstract class A {
     abstract get a(): number | string;
diff --git a/tests/cases/fourslash/codeFixClassExtendAbstractMethod.ts b/tests/cases/fourslash/codeFixClassExtendAbstractMethod.ts
index 7098af8bc27..abb3f4a5703 100644
--- a/tests/cases/fourslash/codeFixClassExtendAbstractMethod.ts
+++ b/tests/cases/fourslash/codeFixClassExtendAbstractMethod.ts
@@ -12,7 +12,6 @@
 
 verify.codeFix({
     description: "Implement inherited abstract class",
-    // TODO: GH#18795
     newFileContent:
 `abstract class A {
     abstract f(a: number, b: string): boolean;
diff --git a/tests/cases/fourslash/codeFixClassExtendAbstractMethodThis.ts b/tests/cases/fourslash/codeFixClassExtendAbstractMethodThis.ts
index f0bb90c9443..d634570448b 100644
--- a/tests/cases/fourslash/codeFixClassExtendAbstractMethodThis.ts
+++ b/tests/cases/fourslash/codeFixClassExtendAbstractMethodThis.ts
@@ -8,7 +8,6 @@
 
 verify.codeFix({
     description: "Implement inherited abstract class",
-    // TODO: GH#18795
     newFileContent:
 `abstract class A {
     abstract f(): this;
diff --git a/tests/cases/fourslash/codeFixClassExtendAbstractMethodTypeParamsInstantiateNumber.ts b/tests/cases/fourslash/codeFixClassExtendAbstractMethodTypeParamsInstantiateNumber.ts
index fdbbda75113..788e955d900 100644
--- a/tests/cases/fourslash/codeFixClassExtendAbstractMethodTypeParamsInstantiateNumber.ts
+++ b/tests/cases/fourslash/codeFixClassExtendAbstractMethodTypeParamsInstantiateNumber.ts
@@ -8,7 +8,6 @@
 
 verify.codeFix({
     description: "Implement inherited abstract class",
-    // TODO: GH#18795
     newFileContent:
 `abstract class A<T> {
     abstract f(x: T): T;
diff --git a/tests/cases/fourslash/codeFixClassExtendAbstractMethodTypeParamsInstantiateU.ts b/tests/cases/fourslash/codeFixClassExtendAbstractMethodTypeParamsInstantiateU.ts
index 41fe94ae634..005cde757da 100644
--- a/tests/cases/fourslash/codeFixClassExtendAbstractMethodTypeParamsInstantiateU.ts
+++ b/tests/cases/fourslash/codeFixClassExtendAbstractMethodTypeParamsInstantiateU.ts
@@ -8,7 +8,6 @@
 
 verify.codeFix({
     description: "Implement inherited abstract class",
-    // TODO: GH#18795
     newFileContent:
 `abstract class A<T> {
     abstract f(x: T): T;
diff --git a/tests/cases/fourslash/codeFixClassExtendAbstractProperty.ts b/tests/cases/fourslash/codeFixClassExtendAbstractProperty.ts
index e5811016e8c..3525bf220e9 100644
--- a/tests/cases/fourslash/codeFixClassExtendAbstractProperty.ts
+++ b/tests/cases/fourslash/codeFixClassExtendAbstractProperty.ts
@@ -10,7 +10,6 @@
 
 verify.codeFix({
     description: "Implement inherited abstract class",
-    // TODO: GH#18795
     newFileContent:
 `abstract class A {
     abstract x: number;
diff --git a/tests/cases/fourslash/codeFixClassImplementInterfaceComments.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceComments.ts
index 793ad944732..2dd4a5edb72 100644
--- a/tests/cases/fourslash/codeFixClassImplementInterfaceComments.ts
+++ b/tests/cases/fourslash/codeFixClassImplementInterfaceComments.ts
@@ -36,9 +36,9 @@ verify.codeFix({
         /**close-brace prefix*/ }
 /**close-brace prefix*/ }
 class C implements N.I {
-    /** property prefix */ a /** colon prefix */: N.E.a;
-    /** property prefix */ b /** colon prefix */: N.E;
-    /**method signature prefix */ foo /**open angle prefix */<X>(a: X): string {
+    a: N.E.a;
+    b: N.E;
+    foo<X>(a: X): string {
         throw new Error("Method not implemented.");
     }
 }`,
diff --git a/tests/cases/fourslash/codeFixClassImplementInterfaceMemberOrdering.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceMemberOrdering.ts
index 9c5bd172e8f..4b1c04f461c 100644
--- a/tests/cases/fourslash/codeFixClassImplementInterfaceMemberOrdering.ts
+++ b/tests/cases/fourslash/codeFixClassImplementInterfaceMemberOrdering.ts
@@ -84,7 +84,6 @@ class C implements I {
     20: any;
     21: any;
     22: any;
-    /** a nice safe prime */
     23: any;
 }`,
 });
diff --git a/tests/cases/fourslash/codeFixForgottenThisPropertyAccess_all.ts b/tests/cases/fourslash/codeFixForgottenThisPropertyAccess_all.ts
index ab95f6b3355..65d44dd8fdb 100644
--- a/tests/cases/fourslash/codeFixForgottenThisPropertyAccess_all.ts
+++ b/tests/cases/fourslash/codeFixForgottenThisPropertyAccess_all.ts
@@ -10,7 +10,7 @@
 
 verify.codeFixAll({
     fixId: "forgottenThisPropertyAccess",
-    fixAllDescription: "Add 'this.' to all unresolved variables matching a member name",
+    fixAllDescription: "Add qualifier to all unresolved variables matching a member name",
     newFileContent:
 `class C {
     foo: number;
diff --git a/tests/cases/fourslash/codeFixForgottenThisPropertyAccess_static.ts b/tests/cases/fourslash/codeFixForgottenThisPropertyAccess_static.ts
new file mode 100644
index 00000000000..cc6f8032a51
--- /dev/null
+++ b/tests/cases/fourslash/codeFixForgottenThisPropertyAccess_static.ts
@@ -0,0 +1,25 @@
+/// <reference path='fourslash.ts' />
+
+////class C {
+////    static m() { m(); }
+////    n() { m(); }
+////}
+
+verify.codeFix({
+    description: "Add 'C.' to unresolved variable",
+    index: 0,
+    newFileContent:
+`class C {
+    static m() { C.m(); }
+    n() { m(); }
+}`
+});
+
+verify.codeFix({
+    description: "Add 'C.' to unresolved variable",
+    newFileContent:
+`class C {
+    static m() { C.m(); }
+    n() { C.m(); }
+}`
+});
diff --git a/tests/cases/fourslash/commentsVariables.ts b/tests/cases/fourslash/commentsVariables.ts
index 4d5682ef401..bf7e13ee51c 100644
--- a/tests/cases/fourslash/commentsVariables.ts
+++ b/tests/cases/fourslash/commentsVariables.ts
@@ -59,8 +59,8 @@ verify.currentSignatureHelpDocCommentIs("foos comment");
 verify.quickInfoAt("5q", "function foo(): void", "foos comment");
 
 goTo.marker('6');
-verify.currentSignatureHelpDocCommentIs("");
-verify.quickInfoAt("6q", "var fooVar: () => void");
+verify.currentSignatureHelpDocCommentIs("fooVar comment");
+verify.quickInfoAt("6q", "var fooVar: () => void", "fooVar comment");
 
 goTo.marker('7');
 verify.completionListContains("foo", "function foo(): void", "foos comment");
@@ -71,9 +71,9 @@ verify.currentSignatureHelpDocCommentIs("foos comment");
 verify.quickInfoAt("8q", "function foo(): void", "foos comment");
 
 goTo.marker('9');
-verify.currentSignatureHelpDocCommentIs("");
+verify.currentSignatureHelpDocCommentIs("fooVar comment");
 verify.quickInfos({
-    "9q": "var fooVar: () => void",
+    "9q": ["var fooVar: () => void", "fooVar comment"],
     "9aq": ["var fooVar: () => void", "fooVar comment"]
 });
 
diff --git a/tests/cases/fourslash/completionsImport_details_withMisspelledName.ts b/tests/cases/fourslash/completionsImport_details_withMisspelledName.ts
new file mode 100644
index 00000000000..098f2e5d46e
--- /dev/null
+++ b/tests/cases/fourslash/completionsImport_details_withMisspelledName.ts
@@ -0,0 +1,17 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: /a.ts
+////export const abc = 0;
+
+// @Filename: /b.ts
+////acb/**/;
+
+goTo.marker("");
+verify.applyCodeActionFromCompletion("", {
+    name: "abc",
+    source: "/a",
+    description: `Import 'abc' from module "./a"`,
+    newFileContent: `import { abc } from "./a";
+
+acb;`,
+});
diff --git a/tests/cases/fourslash/completionsImport_notFromIndex.ts b/tests/cases/fourslash/completionsImport_notFromIndex.ts
new file mode 100644
index 00000000000..c42c768d23d
--- /dev/null
+++ b/tests/cases/fourslash/completionsImport_notFromIndex.ts
@@ -0,0 +1,27 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: /src/a.ts
+////export const x = 0;
+
+// @Filename: /src/index.ts
+////export { x } from "./a";
+
+// @Filename: /0.ts
+////x/*0*/
+
+// @Filename: /src/1.ts
+////x/*1*/
+
+// @Filename: /src/inner/2.ts
+////x/*2*/
+
+for (const [marker, sourceDisplay] of [["0", "./src"], ["1", "./a"], ["2", "../a"]]) {
+    goTo.marker(marker);
+    verify.completionListContains({ name: "x", source: "/src/a" }, "const x: 0", "", "const", /*spanIndex*/ undefined, /*hasAction*/ true, { includeCompletionsForModuleExports: true, sourceDisplay });
+    verify.applyCodeActionFromCompletion(marker, {
+        name: "x",
+        source: "/src/a",
+        description: `Import 'x' from module "${sourceDisplay}"`,
+        newFileContent: `import { x } from "${sourceDisplay}";\n\nx`,
+    });
+}
diff --git a/tests/cases/fourslash/completionsImport_ofAlias.ts b/tests/cases/fourslash/completionsImport_ofAlias.ts
index 903f724722e..e81f66ed2aa 100644
--- a/tests/cases/fourslash/completionsImport_ofAlias.ts
+++ b/tests/cases/fourslash/completionsImport_ofAlias.ts
@@ -21,9 +21,7 @@
 
 goTo.marker("");
 const options = { includeExternalModuleExports: true, sourceDisplay: "./a" };
-// TODO: https://github.com/Microsoft/TypeScript/issues/14003
-//TODO: verify that there's only one!
-verify.completionListContains({ name: "foo", source: "/a" }, "(alias) const foo: 0\nimport foo", "", "alias", /*spanIndex*/ undefined, /*hasAction*/ true, options);
+verify.completionListContains({ name: "foo", source: "/a" }, "(alias) const foo: 0\nexport foo", "", "alias", /*spanIndex*/ undefined, /*hasAction*/ true, options);
 verify.not.completionListContains({ name: "foo", source: "/a_reexport" }, undefined, undefined, undefined, undefined, undefined, options);
 verify.not.completionListContains({ name: "foo", source: "/a_reexport_2" }, undefined, undefined, undefined, undefined, undefined, options);
 
diff --git a/tests/cases/fourslash/completionsTriggerCharacter.ts b/tests/cases/fourslash/completionsTriggerCharacter.ts
new file mode 100644
index 00000000000..06e2a123c52
--- /dev/null
+++ b/tests/cases/fourslash/completionsTriggerCharacter.ts
@@ -0,0 +1,39 @@
+/// <reference path="fourslash.ts" />
+
+// @jsx: preserve
+
+////const x: "a" | "b" = "/*openQuote*/"/*closeQuote*/;
+////const y: 'a' | 'b' = '/*openSingleQuote*/'/*closeSingleQuote*/;
+////const z: 'a' | 'b' = `/*openTemplate*/`/*closeTemplate*/;
+////const q: "`a`" | "`b`" = "`/*openTemplateInQuote*/a`/*closeTemplateInQuote*/";
+
+////// "/*quoteInComment*/ </*lessInComment*/
+
+// @Filename: /a.tsx
+////declare namespace JSX {
+////    interface Element {}
+////    interface IntrinsicElements {
+////        div: {};
+////    }
+////}
+////const ctr = </*openTag*/
+////const less = 1 </*lessThan*/
+
+verify.completionsAt("openQuote", ["a", "b"], { triggerCharacter: '"' });
+verify.completionsAt("closeQuote", undefined, { triggerCharacter: '"' });
+
+verify.completionsAt("openSingleQuote", ["a", "b"], { triggerCharacter: "'" });
+verify.completionsAt("closeSingleQuote", undefined, { triggerCharacter: "'" });
+
+verify.completionsAt("openTemplate", ["a", "b"], { triggerCharacter: "`" });
+verify.completionsAt("closeTemplate", undefined, { triggerCharacter: "`" });
+
+verify.completionsAt("openTemplateInQuote", undefined, { triggerCharacter: '`' });
+verify.completionsAt("closeTemplateInQuote", undefined, { triggerCharacter: '`' });
+
+verify.completionsAt("quoteInComment", undefined, { triggerCharacter: '"' });
+verify.completionsAt("lessInComment", undefined, { triggerCharacter: "<" });
+
+goTo.marker("openTag");
+verify.completionListContains("div", undefined, undefined, undefined, undefined, undefined, { triggerCharacter: "<" });
+verify.completionsAt("lessThan", undefined, { triggerCharacter: "<" });
diff --git a/tests/cases/fourslash/convertFunctionToEs6ClassNoSemicolon.ts b/tests/cases/fourslash/convertFunctionToEs6ClassNoSemicolon.ts
new file mode 100644
index 00000000000..7aac7e7d42a
--- /dev/null
+++ b/tests/cases/fourslash/convertFunctionToEs6ClassNoSemicolon.ts
@@ -0,0 +1,16 @@
+/// <reference path='fourslash.ts' />
+
+// @allowJs: true
+
+// @Filename: /a.js
+////var C = function() { this.x = 0; }
+////0;
+
+verify.codeFix({
+    description: "Convert function to an ES2015 class",
+    newFileContent:
+`class C {
+    constructor() { this.x = 0; }
+}
+0;`,
+});
diff --git a/tests/cases/fourslash/convertFunctionToEs6Class_commentOnVariableDeclaration.ts b/tests/cases/fourslash/convertFunctionToEs6Class_commentOnVariableDeclaration.ts
new file mode 100644
index 00000000000..417bf0bc905
--- /dev/null
+++ b/tests/cases/fourslash/convertFunctionToEs6Class_commentOnVariableDeclaration.ts
@@ -0,0 +1,16 @@
+/// <reference path='fourslash.ts' />
+
+// @allowJs: true
+// @Filename: /a.js
+/////** Doc */
+////const C = function() { this.x = 0; }
+
+verify.codeFix({
+    description: "Convert function to an ES2015 class",
+    newFileContent:
+`/** Doc */
+class C {
+    constructor() { this.x = 0; }
+}
+`,
+});
diff --git a/tests/cases/fourslash/documentHighlights_windowsPath.ts b/tests/cases/fourslash/documentHighlights_windowsPath.ts
new file mode 100644
index 00000000000..594f175745b
--- /dev/null
+++ b/tests/cases/fourslash/documentHighlights_windowsPath.ts
@@ -0,0 +1,7 @@
+/// <reference path='fourslash.ts' />
+
+//@Filename: C:\a\b\c.ts
+////var /*1*/[|x|] = 1;
+
+const range = test.ranges()[0];
+verify.documentHighlightsOf(range, [range], { filesToSearch: [range.fileName] });
\ No newline at end of file
diff --git a/tests/cases/fourslash/duplicatePackageServices.ts b/tests/cases/fourslash/duplicatePackageServices.ts
index 48dfdf8aa83..2ececda4e06 100644
--- a/tests/cases/fourslash/duplicatePackageServices.ts
+++ b/tests/cases/fourslash/duplicatePackageServices.ts
@@ -23,7 +23,7 @@
 ////}
 
 // @Filename: /node_modules/b/node_modules/x/package.json
-////{ "name": "x", "version": "1.2./*bVersionPatch*/3" }
+////{ "name": "x", "version": "1.2.3" }
 
 // @Filename: /src/a.ts
 ////import { a } from "a";
@@ -40,7 +40,5 @@ const aImport = { definition: "(alias) class X\nimport X", ranges: [r0, r1] };
 const def = { definition: "class X", ranges: [r2] };
 const bImport = { definition: "(alias) class X\nimport X", ranges: [r3, r4] };
 verify.referenceGroups([r0, r1], [aImport, def, bImport]);
-verify.referenceGroups([r2], [def, aImport, bImport]);
+verify.referenceGroups([r2, r5], [def, aImport, bImport]);
 verify.referenceGroups([r3, r4], [bImport, def, aImport]);
-
-verify.referenceGroups(r5, [def, aImport, bImport]);
diff --git a/tests/cases/fourslash/findAllReferencesDynamicImport3.ts b/tests/cases/fourslash/findAllReferencesDynamicImport3.ts
index 21d2e1097db..636e640ceb3 100644
--- a/tests/cases/fourslash/findAllReferencesDynamicImport3.ts
+++ b/tests/cases/fourslash/findAllReferencesDynamicImport3.ts
@@ -1,13 +1,13 @@
 /// <reference path='fourslash.ts' />
 
 // @Filename: foo.ts
-//// export function [|bar|]() { return "bar"; }
-
-//// import('./foo').then(({ [|bar|] }) => undefined);
+////export function [|{| "isWriteAccess": true, "isDefinition": true |}bar|]() { return "bar"; }
+////import('./foo').then(({ [|{| "isWriteAccess": true, "isDefinition": true |}bar|] }) => undefined);
 
 const [r0, r1]  = test.ranges();
-// This is because bindingElement at r1 are both name and value
-verify.referencesOf(r0, [r1, r0, r1, r0]);
-verify.referencesOf(r1, [r0, r1, r1, r0]);
-verify.renameLocations(r0, [r0, r1]);
-verify.renameLocations(r1, [r1, r0, r0, r1]);
\ No newline at end of file
+verify.referenceGroups(r0, [{ definition: "function bar(): string", ranges: [r0, r1] }]);
+verify.referenceGroups(r1, [
+    { definition: "function bar(): string", ranges: [r0] },
+    { definition: "var bar: () => string", ranges: [r1] },
+]);
+verify.rangesAreRenameLocations();
diff --git a/tests/cases/fourslash/findAllRefsClassExpression0.ts b/tests/cases/fourslash/findAllRefsClassExpression0.ts
index 50abfae0230..e8d4aa671a3 100644
--- a/tests/cases/fourslash/findAllRefsClassExpression0.ts
+++ b/tests/cases/fourslash/findAllRefsClassExpression0.ts
@@ -11,6 +11,6 @@
 
 const [r0, r1, r2, r3] = test.ranges();
 const defs = { definition: "(local class) A", ranges: [r0, r1] };
-const imports = { definition: 'import A = require("./a")', ranges: [r2, r3] };
+const imports = { definition: '(alias) (local class) A\nimport A = require("./a")', ranges: [r2, r3] };
 verify.referenceGroups([r0, r1], [defs, imports]);
 verify.referenceGroups([r2, r3], [imports, defs]);
diff --git a/tests/cases/fourslash/findAllRefsClassExpression1.ts b/tests/cases/fourslash/findAllRefsClassExpression1.ts
index bd581871842..64aad512a5e 100644
--- a/tests/cases/fourslash/findAllRefsClassExpression1.ts
+++ b/tests/cases/fourslash/findAllRefsClassExpression1.ts
@@ -11,7 +11,7 @@
 
 const [r0, r1, r2] = test.ranges();
 const defs = { definition: "(local class) A", ranges: [r0] };
-const imports = { definition: 'import A = require("./a")', ranges: [r1, r2] };
+const imports = { definition: '(alias) (local class) A\nimport A = require("./a")', ranges: [r1, r2] };
 verify.referenceGroups([r0], [defs, imports]);
 verify.referenceGroups([r1, r2], [imports, defs]);
 
diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport_reExport.ts b/tests/cases/fourslash/findAllRefsForDefaultExport_reExport.ts
index 2154087d81a..2abd33b7d6e 100644
--- a/tests/cases/fourslash/findAllRefsForDefaultExport_reExport.ts
+++ b/tests/cases/fourslash/findAllRefsForDefaultExport_reExport.ts
@@ -13,16 +13,16 @@
 const [r0, r1, r2, r3] = test.ranges();
 verify.referenceGroups([r0, r1], [
     { definition: "const foo: 1", ranges: [r0, r1] },
-    { definition: "(alias) const foo: 1\nimport default", ranges: [r2], },
+    { definition: "(alias) const foo: 1\nexport default", ranges: [r2], },
     { definition: "(alias) const fooDefault: 1\nimport fooDefault", ranges: [r3] },
 ]);
 verify.referenceGroups(r2, [
-    { definition: "(alias) const foo: 1\nimport default", ranges: [r2] },
+    { definition: "(alias) const foo: 1\nexport default", ranges: [r2] },
     { definition: "(alias) const fooDefault: 1\nimport fooDefault", ranges: [r3] },
     { definition: "const foo: 1", ranges: [r0, r1] },
 ]);
 verify.referenceGroups(r3, [
     { definition: "(alias) const fooDefault: 1\nimport fooDefault", ranges: [r3] },
-    { definition: "(alias) const foo: 1\nimport default", ranges: [r2] },
+    { definition: "(alias) const foo: 1\nexport default", ranges: [r2] },
     { definition: "const foo: 1", ranges: [r0, r1] },
 ]);
diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport_reExport_allowSyntheticDefaultImports.ts b/tests/cases/fourslash/findAllRefsForDefaultExport_reExport_allowSyntheticDefaultImports.ts
index 41377a41aca..386eca5eae0 100644
--- a/tests/cases/fourslash/findAllRefsForDefaultExport_reExport_allowSyntheticDefaultImports.ts
+++ b/tests/cases/fourslash/findAllRefsForDefaultExport_reExport_allowSyntheticDefaultImports.ts
@@ -17,16 +17,16 @@ verify.noErrors();
 const [r0, r1, r2, r3] = test.ranges();
 verify.referenceGroups([r0, r1], [
     { definition: "const foo: 1", ranges: [r0, r1] },
-    { definition: "(alias) const foo: 1\nimport default", ranges: [r2], },
+    { definition: "(alias) const foo: 1\nexport default", ranges: [r2], },
     { definition: "(alias) const fooDefault: 1\nimport fooDefault", ranges: [r3] },
 ]);
 verify.referenceGroups(r2, [
-    { definition: "(alias) const foo: 1\nimport default", ranges: [r2] },
+    { definition: "(alias) const foo: 1\nexport default", ranges: [r2] },
     { definition: "(alias) const fooDefault: 1\nimport fooDefault", ranges: [r3] },
     { definition: "const foo: 1", ranges: [r0, r1] },
 ]);
 verify.referenceGroups(r3, [
     { definition: "(alias) const fooDefault: 1\nimport fooDefault", ranges: [r3] },
-    { definition: "(alias) const foo: 1\nimport default", ranges: [r2] },
+    { definition: "(alias) const foo: 1\nexport default", ranges: [r2] },
     { definition: "const foo: 1", ranges: [r0, r1] },
 ]);
diff --git a/tests/cases/fourslash/findAllRefsForObjectSpread.ts b/tests/cases/fourslash/findAllRefsForObjectSpread.ts
index 970806922ed..c6f111672c8 100644
--- a/tests/cases/fourslash/findAllRefsForObjectSpread.ts
+++ b/tests/cases/fourslash/findAllRefsForObjectSpread.ts
@@ -12,12 +12,12 @@ const [r0, r1, r2, r3] = ranges;
 
 // members of spread types only refer to themselves and the resulting property
 verify.referenceGroups(r0, [{ definition: "(property) A1.a: string", ranges: [r0, r2, r3] }]);
-verify.referenceGroups(r1, [{ definition: "(property) A2.a: number", ranges: [r1, r2] }]);
+verify.referenceGroups(r1, [{ definition: "(property) A2.a?: number", ranges: [r1, r2] }]);
 
 // but the resulting property refers to everything
 verify.referenceGroups(r2, [
     { definition: "(property) A1.a: string", ranges: [r0, r2, r3] },
-    { definition: "(property) A2.a: number", ranges: [r1] },
+    { definition: "(property) A2.a?: number", ranges: [r1] },
 ]);
 
 verify.referenceGroups(r3, [{ definition: "(property) A1.a: string", ranges: [r0, r2, r3] }]);
diff --git a/tests/cases/fourslash/findAllRefsJsDocTemplateTag_class_js.ts b/tests/cases/fourslash/findAllRefsJsDocTemplateTag_class_js.ts
index 6577cfce15d..8ec2e86fadb 100644
--- a/tests/cases/fourslash/findAllRefsJsDocTemplateTag_class_js.ts
+++ b/tests/cases/fourslash/findAllRefsJsDocTemplateTag_class_js.ts
@@ -3,15 +3,14 @@
 // @allowJs: true
 // @Filename: /a.js
 
-// TODO: https://github.com/Microsoft/TypeScript/issues/16411
 // Both uses of T should be referenced.
 
 /////** @template [|{| "isWriteAccess": true, "isDefinition": true |}T|] */
 ////class C {
 ////    constructor() {
-////        /** @type {T} */
+////        /** @type {[|T|]} */
 ////        this.x = null;
 ////    }
 ////}
 
-verify.singleReferenceGroup("(type parameter) T in C");
+verify.singleReferenceGroup("(type parameter) T in C<T>", test.ranges());
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts
index 1c79d326dbc..500ca7fe3cf 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts
@@ -8,4 +8,4 @@
 ////function f ({ [|next|]: { [|next|]: x} }: Recursive) {
 ////}
 
-verify.singleReferenceGroup("(property) Recursive.next: Recursive");
+verify.singleReferenceGroup("(property) Recursive.next?: Recursive");
diff --git a/tests/cases/fourslash/findAllRefsOnImportAliases.ts b/tests/cases/fourslash/findAllRefsOnImportAliases.ts
index 6bec755bce3..17f947ffdc3 100644
--- a/tests/cases/fourslash/findAllRefsOnImportAliases.ts
+++ b/tests/cases/fourslash/findAllRefsOnImportAliases.ts
@@ -16,6 +16,6 @@ const ranges = test.ranges();
 const [r0, r1, r2, r3] = ranges;
 const classes = { definition: "class Class", ranges: [r0] };
 const imports = { definition: "(alias) class Class\nimport Class", ranges: [r1, r2] };
-const reExports = { definition: "(alias) class Class\nimport Class", ranges: [r3] };
+const reExports = { definition: "(alias) class Class\nexport Class", ranges: [r3] };
 verify.referenceGroups(r0, [classes, imports, reExports]);
 verify.referenceGroups([r1, r2], [imports, classes, reExports]);
diff --git a/tests/cases/fourslash/findAllRefsOnImportAliases2.ts b/tests/cases/fourslash/findAllRefsOnImportAliases2.ts
index 21dabf5b6e2..7be887c6af2 100644
--- a/tests/cases/fourslash/findAllRefsOnImportAliases2.ts
+++ b/tests/cases/fourslash/findAllRefsOnImportAliases2.ts
@@ -18,7 +18,7 @@ const [c2_0, c2_1] = c2Ranges;
 const c3Ranges = ranges.get("C3");
 const classes = { definition: "class Class", ranges: classRanges };
 const c2s =  { definition: "(alias) class C2\nimport C2", ranges: c2Ranges };
-const c3s = { definition: "(alias) class C3\nimport C3", ranges: c3Ranges };
+const c3s = { definition: "(alias) class C3\nexport C3", ranges: c3Ranges };
 
 verify.referenceGroups(classRanges, [classes, c2s, c3s]);
 
diff --git a/tests/cases/fourslash/findAllRefsReExportLocal.ts b/tests/cases/fourslash/findAllRefsReExportLocal.ts
index f57cc8480f0..ed1d0b105b6 100644
--- a/tests/cases/fourslash/findAllRefsReExportLocal.ts
+++ b/tests/cases/fourslash/findAllRefsReExportLocal.ts
@@ -19,7 +19,7 @@ const bxRanges = [bx0, bx1];
 const byRanges = [by0, by1];
 const axGroup = { definition: "var x: any", ranges: axRanges };
 const bxGroup = { definition: "(alias) var x: any\nimport x", ranges: bxRanges };
-const ayGroup = { definition: "(alias) var y: any\nimport y", ranges: [ay] }
+const ayGroup = { definition: "(alias) var y: any\nexport y", ranges: [ay] }
 const byGroup = { definition: "(alias) var y: any\nimport y", ranges: byRanges }
 
 verify.referenceGroups(axRanges, [axGroup, bxGroup, ayGroup, byGroup]);
diff --git a/tests/cases/fourslash/findAllRefsReExportRightNameWrongSymbol.ts b/tests/cases/fourslash/findAllRefsReExportRightNameWrongSymbol.ts
index 12305381fe8..8f4f61a90c3 100644
--- a/tests/cases/fourslash/findAllRefsReExportRightNameWrongSymbol.ts
+++ b/tests/cases/fourslash/findAllRefsReExportRightNameWrongSymbol.ts
@@ -24,7 +24,7 @@ const cFromAGroup = { definition: "(alias) const x: 0\nimport x", ranges: cFromA
 verify.referenceGroups(a, [aGroup, cFromAGroup]);
 
 const bGroup = { definition: "const x: 0", ranges: [b] };
-const cFromBGroup = { definition: "(alias) const x: 0\nimport x", ranges: [cFromB] };
+const cFromBGroup = { definition: "(alias) const x: 0\nexport x", ranges: [cFromB] };
 const dGroup = { definition: "(alias) const x: 0\nimport x", ranges: [d] };
 verify.referenceGroups(b, [bGroup, cFromBGroup, dGroup]);
 
diff --git a/tests/cases/fourslash/findAllRefsReExport_broken.ts b/tests/cases/fourslash/findAllRefsReExport_broken.ts
index 7c42d9e2b6c..92e4fcaa57c 100644
--- a/tests/cases/fourslash/findAllRefsReExport_broken.ts
+++ b/tests/cases/fourslash/findAllRefsReExport_broken.ts
@@ -3,4 +3,4 @@
 // @Filename: /a.ts
 ////export { [|{| "isWriteAccess": true, "isDefinition": true |}x|] };
 
-verify.singleReferenceGroup("import x");
+verify.singleReferenceGroup("export x");
diff --git a/tests/cases/fourslash/findAllRefsReExport_broken2.ts b/tests/cases/fourslash/findAllRefsReExport_broken2.ts
index 4f8a3ea5f45..1a6649465fb 100644
--- a/tests/cases/fourslash/findAllRefsReExport_broken2.ts
+++ b/tests/cases/fourslash/findAllRefsReExport_broken2.ts
@@ -3,4 +3,4 @@
 // @Filename: /a.ts
 ////export { [|{| "isWriteAccess": true, "isDefinition": true |}x|] } from "nonsense";
 
-verify.singleReferenceGroup("import x");
+verify.singleReferenceGroup("export x");
diff --git a/tests/cases/fourslash/findAllRefsReExports.ts b/tests/cases/fourslash/findAllRefsReExports.ts
index af2588de455..aafb13e3f5f 100644
--- a/tests/cases/fourslash/findAllRefsReExports.ts
+++ b/tests/cases/fourslash/findAllRefsReExports.ts
@@ -22,9 +22,9 @@
 verify.noErrors();
 const [foo0, foo1, bar0, foo2, defaultC, defaultD, bar1, baz0, defaultE, bang0, boom0, bar2, baz1, bang1, boom1] = test.ranges();
 const a = { definition: "function foo(): void", ranges: [foo0, foo1, foo2] };
-const b = { definition: "(alias) function bar(): void\nimport bar", ranges: [bar0] };
-const c = { definition: "(alias) function foo(): void\nimport default", ranges: [defaultC, defaultE] };
-const d = { definition: "(alias) function foo(): void\nimport default", ranges: [defaultD] };
+const b = { definition: "(alias) function bar(): void\nexport bar", ranges: [bar0] };
+const c = { definition: "(alias) function foo(): void\nexport default", ranges: [defaultC, defaultE] };
+const d = { definition: "(alias) function foo(): void\nexport default", ranges: [defaultD] };
 const eBar = { definition: "(alias) function bar(): void\nimport bar", ranges: [bar1, bar2] };
 const eBaz = { definition: "(alias) function baz(): void\nimport baz", ranges: [baz0, baz1] };
 const eBang = { definition: "(alias) function bang(): void\nimport bang", ranges: [bang0, bang1] };
diff --git a/tests/cases/fourslash/findAllRefsRenameImportWithSameName.ts b/tests/cases/fourslash/findAllRefsRenameImportWithSameName.ts
index 62b1c19c5ed..38c3aaf9398 100644
--- a/tests/cases/fourslash/findAllRefsRenameImportWithSameName.ts
+++ b/tests/cases/fourslash/findAllRefsRenameImportWithSameName.ts
@@ -16,5 +16,6 @@ const bGroup =  { definition: "(alias) const x: 0\nimport x", ranges: bRanges };
 verify.referenceGroups(aRanges, [aGroup, bGroup]);
 verify.referenceGroups(bRanges, [bGroup]);
 
-verify.rangesAreRenameLocations(aRanges);
-verify.rangesAreRenameLocations(aRanges);
+verify.renameLocations(r0, [r0, r1, r2, r3]);
+verify.renameLocations(r1, [r0, r1, r2, r3]);
+verify.rangesAreRenameLocations([r2, r3]);
diff --git a/tests/cases/fourslash/findAllRefsTypeofImport.ts b/tests/cases/fourslash/findAllRefsTypeofImport.ts
new file mode 100644
index 00000000000..77bd2d51a8c
--- /dev/null
+++ b/tests/cases/fourslash/findAllRefsTypeofImport.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+// @Filename: /a.ts
+////export const [|{| "isWriteAccess": true, "isDefinition": true |}x|] = 0;
+////declare const a: typeof import("./a");
+////a.[|x|];
+
+verify.singleReferenceGroup("const x: 0");
diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts
index e756bd22fae..42dee74bb03 100644
--- a/tests/cases/fourslash/fourslash.ts
+++ b/tests/cases/fourslash/fourslash.ts
@@ -157,6 +157,7 @@ declare namespace FourSlashInterface {
             spanIndex?: number,
             hasAction?: boolean,
             options?: UserPreferences & {
+                triggerCharacter?: string,
                 sourceDisplay?: string,
                 isRecommended?: true,
                 insertText?: string,
@@ -338,12 +339,17 @@ declare namespace FourSlashInterface {
         verifyQuickInfoDisplayParts(kind: string, kindModifiers: string, textSpan: {
             start: number;
             length: number;
-        }, displayParts: ts.SymbolDisplayPart[], documentation: ts.SymbolDisplayPart[], tags: ts.JSDocTagInfo[]): void;
+        }, displayParts: ts.SymbolDisplayPart[], documentation: ts.SymbolDisplayPart[], tags: { name: string, text?: string }[]): void;
         getSyntacticDiagnostics(expected: ReadonlyArray<Diagnostic>): void;
         getSemanticDiagnostics(expected: ReadonlyArray<Diagnostic>): void;
         getSuggestionDiagnostics(expected: ReadonlyArray<Diagnostic>): void;
         ProjectInfo(expected: string[]): void;
         allRangesAppearInImplementationList(markerName: string): void;
+        getEditsForFileRename(options: {
+            oldPath: string;
+            newPath: string;
+            newFileContents: { [fileName: string]: string };
+        });
     }
     class edit {
         backspace(count?: number): void;
@@ -530,6 +536,7 @@ declare namespace FourSlashInterface {
         importModuleSpecifierPreference?: "relative" | "non-relative";
     }
     interface CompletionsAtOptions extends UserPreferences {
+        triggerCharacter?: string;
         isNewIdentifierLocation?: boolean;
     }
 }
diff --git a/tests/cases/fourslash/getEditsForFileRename.ts b/tests/cases/fourslash/getEditsForFileRename.ts
new file mode 100644
index 00000000000..f2694818d1d
--- /dev/null
+++ b/tests/cases/fourslash/getEditsForFileRename.ts
@@ -0,0 +1,27 @@
+/// <reference path='fourslash.ts' />
+
+// @Filename: /a.ts
+/////// <reference path="./src/old.ts" />
+////import old from "./src/old";
+
+// @Filename: /src/a.ts
+/////// <reference path="./old.ts" />
+////import old from "./old";
+
+// @Filename: /src/foo/a.ts
+/////// <reference path="../old.ts" />
+////import old from "../old";
+
+// @Filename: /tsconfig.json
+////{ "files": ["/a.ts", "/src/a.ts", "/src/foo/a.ts", "/src/old.ts"] }
+
+verify.getEditsForFileRename({
+    oldPath: "/src/old.ts",
+    newPath: "/src/new.ts",
+    newFileContents: {
+        "/a.ts": '/// <reference path="./src/new.ts" />\nimport old from "./src/new";',
+        "/src/a.ts": '/// <reference path="./new.ts" />\nimport old from "./new";',
+        "/src/foo/a.ts": '/// <reference path="../new.ts" />\nimport old from "../new";',
+        "/tsconfig.json": '{ "files": ["/a.ts", "/src/a.ts", "/src/foo/a.ts", "/src/new.ts"] }',
+    },
+});
diff --git a/tests/cases/fourslash/getOutliningSpansDepthElseIf.ts b/tests/cases/fourslash/getOutliningSpansDepthElseIf.ts
new file mode 100644
index 00000000000..1e349e5b190
--- /dev/null
+++ b/tests/cases/fourslash/getOutliningSpansDepthElseIf.ts
@@ -0,0 +1,89 @@
+/// <reference path="fourslash.ts"/>
+
+// Tests that each 'else if' does not count towards a higher nesting depth.
+
+////if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else if (1)[| {
+////    1;
+////}|] else[| {
+////    1;
+////}|]
+
+verify.outliningSpansInCurrentFile(test.ranges());
diff --git a/tests/cases/fourslash/goToDefinitionNewExpressionTargetNotClass.ts b/tests/cases/fourslash/goToDefinitionNewExpressionTargetNotClass.ts
index 02a6dca9d52..00f83323a0b 100644
--- a/tests/cases/fourslash/goToDefinitionNewExpressionTargetNotClass.ts
+++ b/tests/cases/fourslash/goToDefinitionNewExpressionTargetNotClass.ts
@@ -2,7 +2,7 @@
 
 ////class C2 {
 ////}
-////let I: {
+////let /*I*/I: {
 ////    /*constructSignature*/new(): C2;
 ////};
 ////new [|/*invokeExpression1*/I|]();
@@ -11,6 +11,6 @@
 ////new [|/*invokeExpression2*/I2|]();
 
 verify.goToDefinition({
-    invokeExpression1: "constructSignature",
+    invokeExpression1: ["constructSignature", "I"],
     invokeExpression2: "symbolDeclaration"
 });
diff --git a/tests/cases/fourslash/goToDefinitionSignatureAlias.ts b/tests/cases/fourslash/goToDefinitionSignatureAlias.ts
new file mode 100644
index 00000000000..07a5678f5d2
--- /dev/null
+++ b/tests/cases/fourslash/goToDefinitionSignatureAlias.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts'/>
+
+////function /*f*/f() {}
+////const /*g*/g = f;
+////const /*h*/h = g;
+
+////[|/*useF*/f|]();
+////[|/*useG*/g|]();
+////[|/*useH*/h|]();
+
+verify.goToDefinition({
+    useF: "f",
+    useG: ["f", "g"],
+    useH: ["f", "h"],
+});
diff --git a/tests/cases/fourslash/goToDefinition_super.ts b/tests/cases/fourslash/goToDefinition_super.ts
index 22f00aff7dc..edc7a40c376 100644
--- a/tests/cases/fourslash/goToDefinition_super.ts
+++ b/tests/cases/fourslash/goToDefinition_super.ts
@@ -22,7 +22,7 @@
 
 verify.goToDefinition({
     // Super in call position goes to constructor.
-    super: "ctr",
+    super: ["ctr", "B"],
     // Super in any other position goes to the superclass.
     superExpression: "B",
     superBroken: []
diff --git a/tests/cases/fourslash/importNameCodeFix_order.ts b/tests/cases/fourslash/importNameCodeFix_order.ts
new file mode 100644
index 00000000000..888b440e928
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFix_order.ts
@@ -0,0 +1,21 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: /a.ts
+////export const foo: number;
+
+// @Filename: /b.ts
+////export const foo: number;
+////export const bar: number;
+
+// @Filename: /c.ts
+////[|import { bar } from "./b";
+////foo;|]
+
+goTo.file("/c.ts");
+verify.importFixAtPosition([
+`import { bar, foo } from "./b";
+foo;`,
+`import { bar } from "./b";
+import { foo } from "./a";
+foo;`,
+]);
diff --git a/tests/cases/fourslash/importNameCodeFix_typeUsedAsValue.ts b/tests/cases/fourslash/importNameCodeFix_typeUsedAsValue.ts
new file mode 100644
index 00000000000..ec0fa115d0b
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFix_typeUsedAsValue.ts
@@ -0,0 +1,14 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: /a.ts
+////export class ReadonlyArray<T> {}
+
+// @Filename: /b.ts
+////[|new ReadonlyArray<string>();|]
+
+goTo.file("/b.ts");
+verify.importFixAtPosition([
+`import { ReadonlyArray } from "./a";
+
+new ReadonlyArray<string>();`,
+]);
diff --git a/tests/cases/fourslash/importNameCodeFix_types_classic.ts b/tests/cases/fourslash/importNameCodeFix_types_classic.ts
new file mode 100644
index 00000000000..b9ba463fada
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFix_types_classic.ts
@@ -0,0 +1,16 @@
+/// <reference path="fourslash.ts" />
+
+// @moduleResolution: classic
+
+// @Filename: /node_modules/@types/foo/index.d.ts
+////export const xyz: number;
+
+// @Filename: /a.ts
+////[|xyz|]
+
+goTo.file("/a.ts");
+verify.importFixAtPosition([
+`import { xyz } from "foo";
+
+xyz`
+]);
diff --git a/tests/cases/fourslash/quickInfoAlias.ts b/tests/cases/fourslash/quickInfoAlias.ts
new file mode 100644
index 00000000000..cfbe8ed3692
--- /dev/null
+++ b/tests/cases/fourslash/quickInfoAlias.ts
@@ -0,0 +1,51 @@
+/// <reference path='fourslash.ts'/>
+
+// @Filename: /a.ts
+/////**
+//// * Doc
+//// * @tag Tag text
+//// */
+////export const x = 0;
+
+// @Filename: /b.ts
+////import { x } from "./a";
+////x/*b*/;
+
+// @Filename: /c.ts
+/////**
+//// * Doc 2
+//// * @tag Tag text 2
+//// */
+////import {
+////    /**
+////     * Doc 3
+////     * @tag Tag text 3
+////     */
+////    x
+////} from "./a";
+////x/*c*/;
+
+goTo.eachMarker((_, index) => {
+    verify.verifyQuickInfoDisplayParts(
+        "alias",
+        "",
+        { start: index === 0 ? 25 : 117, length: 1 },
+        [
+            { text:"(",kind:"punctuation" },
+            { text:"alias",kind:"text" },
+            { text:")",kind:"punctuation" },
+            { text:" ",kind:"space" },
+            { text:"const",kind:"keyword" },
+            { text:" ",kind:"space" },
+            { text:"x",kind:"aliasName" },
+            { text:":",kind:"punctuation" },
+            { text:" ",kind:"space" },
+            { text:"0",kind:"stringLiteral" },
+            { text:"\n",kind:"lineBreak" },
+            { text:"import",kind:"keyword" },
+            { text:" ",kind:"space" },
+            { text:"x",kind:"aliasName" },
+        ],
+        [{ text: "Doc", kind: "text" }],
+        [{ name: "tag", text: "Tag text" }]);
+});
diff --git a/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName03.ts b/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName03.ts
index c29a7265eab..9378c99126c 100644
--- a/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName03.ts
+++ b/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName03.ts
@@ -9,5 +9,5 @@
 ////}
 
 for (const marker of test.markerNames()) {
-    verify.quickInfoAt(marker, "(property) Recursive.next: Recursive");
+    verify.quickInfoAt(marker, "(property) Recursive.next?: Recursive");
 }
\ No newline at end of file
diff --git a/tests/cases/fourslash/quickInfoImportedTypesWithMergedMeanings.ts b/tests/cases/fourslash/quickInfoImportedTypesWithMergedMeanings.ts
index 8ffce0bbb28..d904fb59b9b 100644
--- a/tests/cases/fourslash/quickInfoImportedTypesWithMergedMeanings.ts
+++ b/tests/cases/fourslash/quickInfoImportedTypesWithMergedMeanings.ts
@@ -17,7 +17,7 @@ verify.quickInfoAt("1", [
     "(alias) function Original(): void",
     "(alias) type Original<T> = () => T",
     "(alias) namespace Original",
-    "import Original",
+    "export Original",
 ].join("\n"), "some docs ");
 
 verify.quickInfoAt("2", [
diff --git a/tests/cases/fourslash/server/quickInfoMappedSpreadTypes.ts b/tests/cases/fourslash/quickInfoMappedSpreadTypes.ts
similarity index 89%
rename from tests/cases/fourslash/server/quickInfoMappedSpreadTypes.ts
rename to tests/cases/fourslash/quickInfoMappedSpreadTypes.ts
index 2a0c1668763..c1e34f49bfc 100644
--- a/tests/cases/fourslash/server/quickInfoMappedSpreadTypes.ts
+++ b/tests/cases/fourslash/quickInfoMappedSpreadTypes.ts
@@ -1,4 +1,4 @@
-/// <reference path="../fourslash.ts"/>
+/// <reference path="./fourslash.ts"/>
 
 ////interface Foo {
 ////    /** Doc */
diff --git a/tests/cases/fourslash/quickInfoMappedType.ts b/tests/cases/fourslash/quickInfoMappedType.ts
new file mode 100644
index 00000000000..c4afb444155
--- /dev/null
+++ b/tests/cases/fourslash/quickInfoMappedType.ts
@@ -0,0 +1,11 @@
+/// <reference path="./fourslash.ts"/>
+
+////interface I { m(): void; }
+////declare const o: { [K in keyof I]: number };
+////o.m/*0*/;
+////
+////declare const p: { [K in keyof I]: I[K] };
+////p.m/*1*/;
+
+verify.quickInfoAt("0", "(property) m: number");
+verify.quickInfoAt("1", "(method) m(): void");
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_alias.ts b/tests/cases/fourslash/refactorConvertToEs6Module_export_alias.ts
index 73cd606adf9..56fe9d0808c 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_export_alias.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_export_alias.ts
@@ -1,6 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.js
 ////const exportsAlias = exports;
@@ -10,6 +11,6 @@
 verify.codeFix({
     description: "Convert to ES6 module",
     newFileContent: `
-export function f() { }
+export function f() {}
 `,
 });
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_dotDefault.ts b/tests/cases/fourslash/refactorConvertToEs6Module_export_dotDefault.ts
index 1283b0053a8..8bd74041dec 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_export_dotDefault.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_export_dotDefault.ts
@@ -3,6 +3,7 @@
 // Test that we leave it alone if the name is a keyword.
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.js
 ////exports.default = 0;
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_invalidName.ts b/tests/cases/fourslash/refactorConvertToEs6Module_export_invalidName.ts
index 83a831effb0..bec40f756ad 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_export_invalidName.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_export_invalidName.ts
@@ -3,6 +3,7 @@
 // Test that we leave it alone if the name is a keyword.
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.js
 ////exports.class = 0;
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_moduleDotExports.ts b/tests/cases/fourslash/refactorConvertToEs6Module_export_moduleDotExports.ts
index 3382228babb..327f7b480a9 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_export_moduleDotExports.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_export_moduleDotExports.ts
@@ -1,6 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.js
 ////module.exports = function() {}
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_moduleDotExportsEqualsRequire.ts b/tests/cases/fourslash/refactorConvertToEs6Module_export_moduleDotExportsEqualsRequire.ts
index 81877c8a98b..8dd77f06e1d 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_export_moduleDotExportsEqualsRequire.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_export_moduleDotExportsEqualsRequire.ts
@@ -1,6 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.d.ts
 ////export const x: number;
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_moduleDotExports_changesImports.ts b/tests/cases/fourslash/refactorConvertToEs6Module_export_moduleDotExports_changesImports.ts
index 84f081d24b3..277525e10fe 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_export_moduleDotExports_changesImports.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_export_moduleDotExports_changesImports.ts
@@ -1,6 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.js
 ////module.exports = 0;
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_named.ts b/tests/cases/fourslash/refactorConvertToEs6Module_export_named.ts
index 6f4c3ecbde4..e7ee2908580 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_export_named.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_export_named.ts
@@ -1,11 +1,16 @@
 /// <reference path='fourslash.ts' />
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.js
-////[|exports.f = function() {}|];
+////[|exports.f|] = function() {};
 ////exports.C = class {};
 ////exports.x = 0;
+////exports.a1 = () => {};
+////exports.a2 = () => 0;
+////exports.a3 = x => { x; };
+////exports.a4 = x => x;
 
 verify.getSuggestionDiagnostics([{
     message: "File is a CommonJS module; it may be converted to an ES6 module.",
@@ -15,8 +20,11 @@ verify.getSuggestionDiagnostics([{
 verify.codeFix({
     description: "Convert to ES6 module",
     newFileContent:
-`export function f() { }
-export class C {
-}
-export const x = 0;`,
+`export function f() {}
+export class C {}
+export const x = 0;
+export function a1() {}
+export function a2() { return 0; }
+export function a3(x) { x; }
+export function a4(x) { return x; }`,
 });
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_namedClassExpression.ts b/tests/cases/fourslash/refactorConvertToEs6Module_export_namedClassExpression.ts
new file mode 100644
index 00000000000..e1cb86e8d68
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_export_namedClassExpression.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts' />
+
+// @allowJs: true
+// @target: esnext
+
+// @Filename: /a.js
+////exports.C = class E { static instance = new E(); }
+////exports.D = class D { static instance = new D(); }
+
+verify.codeFix({
+    description: "Convert to ES6 module",
+    newFileContent:
+`export const C = class E { static instance = new E(); }
+export class D { static instance = new D(); }`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_namedFunctionExpression.ts b/tests/cases/fourslash/refactorConvertToEs6Module_export_namedFunctionExpression.ts
index dbd4e6a0a4c..c4468a1a189 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_export_namedFunctionExpression.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_export_namedFunctionExpression.ts
@@ -1,6 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.js
 ////exports.f = function g() { g(); }
@@ -9,6 +10,6 @@
 verify.codeFix({
     description: "Convert to ES6 module",
     newFileContent:
-`export const f = function g() { g(); };
+`export const f = function g() { g(); }
 export function h() { h(); }`,
 });
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_object.ts b/tests/cases/fourslash/refactorConvertToEs6Module_export_object.ts
index 61c46c98b3c..5b9107f275c 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_export_object.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_export_object.ts
@@ -1,6 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.js
 ////module.exports = {
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_object_shorthand.ts b/tests/cases/fourslash/refactorConvertToEs6Module_export_object_shorthand.ts
index f6fe1048820..62588f6a531 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_export_object_shorthand.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_export_object_shorthand.ts
@@ -3,6 +3,7 @@
 // TODO: Maybe we could transform this to `export function f() {}`.
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.js
 ////function f() {}
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_referenced.ts b/tests/cases/fourslash/refactorConvertToEs6Module_export_referenced.ts
index e4b4c34f86a..7a5b94b0a98 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_export_referenced.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_export_referenced.ts
@@ -1,6 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.js
 ////exports.x = 0;
@@ -12,11 +13,9 @@
 ////
 ////exports.z = 2;
 ////exports.f = function(z) {
-////    z;
+////    exports.z; z;
 ////}
 
-// TODO: GH#22492 Should be a able access `exports.z` inside `exports.f`
-
 verify.codeFix({
     description: "Convert to ES6 module",
     newFileContent:
@@ -28,8 +27,9 @@ const _y = y;
 export { _y as y };
 _y;
 
-export const z = 2;
+const _z = 2;
+export { _z as z };
 export function f(z) {
-    z;
+    _z; z;
 }`,
 });
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_expressionToDeclaration.ts b/tests/cases/fourslash/refactorConvertToEs6Module_expressionToDeclaration.ts
index 0525a2b881c..47ff26f459e 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_expressionToDeclaration.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_expressionToDeclaration.ts
@@ -1,6 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.js
 ////exports.f = async function* f(p) { p; }
@@ -10,7 +11,5 @@ verify.codeFix({
     description: "Convert to ES6 module",
     newFileContent:
 `export async function* f(p) { p; }
-export class C extends D {
-    m() { }
-}`,
+export class C extends D { m() {} }`,
 });
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_arrayBindingPattern.ts b/tests/cases/fourslash/refactorConvertToEs6Module_import_arrayBindingPattern.ts
index 2c53f48a6eb..f373f00dfe7 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_import_arrayBindingPattern.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_import_arrayBindingPattern.ts
@@ -1,6 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.js
 ////const [x, y] = /*a*/require/*b*/("x");
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_includeDefaultUses.ts b/tests/cases/fourslash/refactorConvertToEs6Module_import_includeDefaultUses.ts
index 0e69f9519ee..a75854595f3 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_import_includeDefaultUses.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_import_includeDefaultUses.ts
@@ -1,6 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.js
 ////const x = /*a*/require/*b*/("x");
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_multipleUniqueIdentifiers.ts b/tests/cases/fourslash/refactorConvertToEs6Module_import_multipleUniqueIdentifiers.ts
index 44750b76e6e..faf8ec5eb69 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_import_multipleUniqueIdentifiers.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_import_multipleUniqueIdentifiers.ts
@@ -1,6 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.js
 ////const x = require("x");
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_multipleVariableDeclarations.ts b/tests/cases/fourslash/refactorConvertToEs6Module_import_multipleVariableDeclarations.ts
index ae387c060c7..33f31299f8b 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_import_multipleVariableDeclarations.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_import_multipleVariableDeclarations.ts
@@ -3,6 +3,7 @@
 // Test that we leave it alone if the name is a keyword.
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.js
 ////const x = require("x"), y = 0, { z } = require("z");
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_nameFromModuleSpecifier.ts b/tests/cases/fourslash/refactorConvertToEs6Module_import_nameFromModuleSpecifier.ts
index 510b610315a..3427e62fb9c 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_import_nameFromModuleSpecifier.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_import_nameFromModuleSpecifier.ts
@@ -1,6 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.js
 ////const [] = require("a-b");
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_objectBindingPattern_complex.ts b/tests/cases/fourslash/refactorConvertToEs6Module_import_objectBindingPattern_complex.ts
index f1397e46207..74071ba55fb 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_import_objectBindingPattern_complex.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_import_objectBindingPattern_complex.ts
@@ -1,6 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.js
 ////const { x: { a, b } } = require("x");
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_objectBindingPattern_plain.ts b/tests/cases/fourslash/refactorConvertToEs6Module_import_objectBindingPattern_plain.ts
index 52cb72783b1..31b9cb41f62 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_import_objectBindingPattern_plain.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_import_objectBindingPattern_plain.ts
@@ -1,6 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.js
 ////const { x, y: z } = require("x");
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_onlyNamedImports.ts b/tests/cases/fourslash/refactorConvertToEs6Module_import_onlyNamedImports.ts
index 7f66b67685e..2b40e1ade36 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_import_onlyNamedImports.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_import_onlyNamedImports.ts
@@ -1,6 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.js
 ////const x = require("x");
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_propertyAccess.ts b/tests/cases/fourslash/refactorConvertToEs6Module_import_propertyAccess.ts
index 8d299d4f0ec..dea48380597 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_import_propertyAccess.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_import_propertyAccess.ts
@@ -1,6 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.js
 ////const x = require("x").default;
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_shadowing.ts b/tests/cases/fourslash/refactorConvertToEs6Module_import_shadowing.ts
index dec87859901..f506f970085 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_import_shadowing.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_import_shadowing.ts
@@ -1,6 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.js
 ////const mod = require("mod");
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_sideEffect.ts b/tests/cases/fourslash/refactorConvertToEs6Module_import_sideEffect.ts
index 28caeaf2411..e8023ac414a 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_import_sideEffect.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_import_sideEffect.ts
@@ -3,6 +3,7 @@
 // Test that we leave it alone if the name is a keyword.
 
 // @allowJs: true
+// @target: esnext
 
 // @Filename: /a.js
 ////require("foo");
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_missingInitializer.ts b/tests/cases/fourslash/refactorConvertToEs6Module_missingInitializer.ts
new file mode 100644
index 00000000000..90a256c2480
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_missingInitializer.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts' />
+
+// @allowJs: true
+// @target: esnext
+
+// @Filename: /a.js
+////require("m");
+////let x; x;
+
+verify.codeFix({
+    description: "Convert to ES6 module",
+    newFileContent:
+`import "m";
+let x; x;`
+});
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_notInCommonjsProject.ts b/tests/cases/fourslash/refactorConvertToEs6Module_notInCommonjsProject.ts
new file mode 100644
index 00000000000..5286091bce9
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_notInCommonjsProject.ts
@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts' />
+
+// @allowJs: true
+
+// @Filename: /a.js
+////exports.x = 0;
+
+// No suggestion to convert to an ES6 module,
+// since there are no es6 modules in this project and we don't have a high enough target.
+verify.getSuggestionDiagnostics([]);
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_notInCommonjsProject_yesIfSomeEs6Module.ts b/tests/cases/fourslash/refactorConvertToEs6Module_notInCommonjsProject_yesIfSomeEs6Module.ts
new file mode 100644
index 00000000000..491b61a0bc2
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_notInCommonjsProject_yesIfSomeEs6Module.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts' />
+
+// @allowJs: true
+
+// @Filename: /a.js
+////exports.x = 0;
+
+// @Filename: /b.js
+////export const y = 0;
+
+verify.codeFix({
+    description: "Convert to ES6 module",
+    newFileContent: "export const x = 0;",
+});
diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_preserveQuotes.ts b/tests/cases/fourslash/refactorConvertToEs6Module_preserveQuotes.ts
index 8aa81538887..d8c48d0e971 100644
--- a/tests/cases/fourslash/refactorConvertToEs6Module_preserveQuotes.ts
+++ b/tests/cases/fourslash/refactorConvertToEs6Module_preserveQuotes.ts
@@ -1,6 +1,8 @@
 /// <reference path='fourslash.ts' />
 
 // @allowJs: true
+// @target: esnext
+
 // @Filename: /a.js
 ////const a = require('a'); a;
 
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess1.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess1.ts
new file mode 100644
index 00000000000..93b4db47d50
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess1.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     /*a*/public a: string;/*b*/
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private /*RENAME*/_a: string;
+    public get a(): string {
+        return this._a;
+    }
+    public set a(value: string) {
+        this._a = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess10.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess10.ts
new file mode 100644
index 00000000000..7161dd18d7c
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess10.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     /*a*/public a?: string = "foo";/*b*/
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private /*RENAME*/_a?: string = "foo";
+    public get a(): string {
+        return this._a;
+    }
+    public set a(value: string) {
+        this._a = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess11.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess11.ts
new file mode 100644
index 00000000000..51b5cc35b34
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess11.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     /*a*/public a!: string = "foo";/*b*/
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private /*RENAME*/_a!: string = "foo";
+    public get a(): string {
+        return this._a;
+    }
+    public set a(value: string) {
+        this._a = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess12.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess12.ts
new file mode 100644
index 00000000000..0e552e83ab3
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess12.ts
@@ -0,0 +1,20 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     /*a*/public get a/*b*/ () { return 1; }
+////     /*c*/public set a/*d*/ (v) { }
+////     /*e*/public ['b']/*f*/ () { }
+////     /*g*/public ['c'] = 1;/*h*/
+//// }
+
+goTo.select("a", "b");
+verify.not.refactorAvailable("Generate 'get' and 'set' accessors");
+
+goTo.select("c", "d");
+verify.not.refactorAvailable("Generate 'get' and 'set' accessors");
+
+goTo.select("e", "f");
+verify.not.refactorAvailable("Generate 'get' and 'set' accessors");
+
+goTo.select("g", "h");
+verify.not.refactorAvailable("Generate 'get' and 'set' accessors");
\ No newline at end of file
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess13.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess13.ts
new file mode 100644
index 00000000000..6b66cfb0433
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess13.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     /*a*/public static a: string = "foo";/*b*/
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private static /*RENAME*/_a: string = "foo";
+    public static get a(): string {
+        return A._a;
+    }
+    public static set a(value: string) {
+        A._a = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess14.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess14.ts
new file mode 100644
index 00000000000..36789b29826
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess14.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     /*a*/public readonly a: string = "foo";/*b*/
+//// }
+
+goTo.select("a", "b");
+verify.not.refactorAvailable("Generate 'get' and 'set' accessors");
\ No newline at end of file
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess15.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess15.ts
new file mode 100644
index 00000000000..172842ef271
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess15.ts
@@ -0,0 +1,46 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     /*a*/public _a: number = 1;/*b*/
+////     /*c*/public a: string = "foo";/*d*/
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private /*RENAME*/__a: number = 1;
+    public get _a(): number {
+        return this.__a;
+    }
+    public set _a(value: number) {
+        this.__a = value;
+    }
+    public a: string = "foo";
+}`,
+});
+
+goTo.select("c", "d");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private __a: number = 1;
+    public get _a(): number {
+        return this.__a;
+    }
+    public set _a(value: number) {
+        this.__a = value;
+    }
+    private /*RENAME*/_a_1: string = "foo";
+    public get a(): string {
+        return this._a_1;
+    }
+    public set a(value: string) {
+        this._a_1 = value;
+    }
+}`,
+});
\ No newline at end of file
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess16.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess16.ts
new file mode 100644
index 00000000000..dd2cc4cf848
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess16.ts
@@ -0,0 +1,22 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     constructor(public /*a*/a/*b*/: string) { }
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private /*RENAME*/_a: string;
+    public get a(): string {
+        return this._a;
+    }
+    public set a(value: string) {
+        this._a = value;
+    }
+    constructor() { }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess17.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess17.ts
new file mode 100644
index 00000000000..ee212b63502
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess17.ts
@@ -0,0 +1,22 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     constructor(protected /*a*/a/*b*/: string) { }
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private /*RENAME*/_a: string;
+    protected get a(): string {
+        return this._a;
+    }
+    protected set a(value: string) {
+        this._a = value;
+    }
+    constructor() { }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess18.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess18.ts
new file mode 100644
index 00000000000..37676a8a047
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess18.ts
@@ -0,0 +1,22 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     constructor(private /*a*/a/*b*/: string) { }
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private /*RENAME*/_a: string;
+    public get a(): string {
+        return this._a;
+    }
+    public set a(value: string) {
+        this._a = value;
+    }
+    constructor() { }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess19.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess19.ts
new file mode 100644
index 00000000000..76779b45950
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess19.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     constructor(/*a*/a/*b*/: string) { }
+//// }
+
+goTo.select("a", "b");
+verify.not.refactorAvailable("Generate 'get' and 'set' accessors");
\ No newline at end of file
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess2.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess2.ts
new file mode 100644
index 00000000000..3776b347240
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess2.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     /*a*/protected a: string;/*b*/
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private /*RENAME*/_a: string;
+    protected get a(): string {
+        return this._a;
+    }
+    protected set a(value: string) {
+        this._a = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess20.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess20.ts
new file mode 100644
index 00000000000..221fd54504c
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess20.ts
@@ -0,0 +1,23 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     public a_1: number;
+////     /*a*/public a: string;/*b*/
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    public a_1: number;
+    private /*RENAME*/_a: string;
+    public get a(): string {
+        return this._a;
+    }
+    public set a(value: string) {
+        this._a = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess21.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess21.ts
new file mode 100644
index 00000000000..ecd570783b8
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess21.ts
@@ -0,0 +1,23 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     public a_2: number;
+////     /*a*/public a_1: string;/*b*/
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    public a_2: number;
+    private /*RENAME*/_a_1: string;
+    public get a_1(): string {
+        return this._a_1;
+    }
+    public set a_1(value: string) {
+        this._a_1 = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess22.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess22.ts
new file mode 100644
index 00000000000..0c6cd0f9844
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess22.ts
@@ -0,0 +1,25 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     public a_1: number;
+////     constructor(public /*a*/a/*b*/: string) { }
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private /*RENAME*/_a: string;
+    public get a(): string {
+        return this._a;
+    }
+    public set a(value: string) {
+        this._a = value;
+    }
+    public a_1: number;
+    constructor() { }
+}`,
+});
+
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess23.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess23.ts
new file mode 100644
index 00000000000..6be97053987
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess23.ts
@@ -0,0 +1,46 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     /*a*/public _a: number = 1;/*b*/
+////     /*c*/public a: string = "foo";/*d*/
+//// }
+
+goTo.select("c", "d");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    public _a: number = 1;
+    private /*RENAME*/_a_1: string = "foo";
+    public get a(): string {
+        return this._a_1;
+    }
+    public set a(value: string) {
+        this._a_1 = value;
+    }
+}`,
+});
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private /*RENAME*/__a: number = 1;
+    public get _a(): number {
+        return this.__a;
+    }
+    public set _a(value: number) {
+        this.__a = value;
+    }
+    private _a_1: string = "foo";
+    public get a(): string {
+        return this._a_1;
+    }
+    public set a(value: string) {
+        this._a_1 = value;
+    }
+}`,
+});
\ No newline at end of file
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess24.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess24.ts
new file mode 100644
index 00000000000..3cb8f65cb35
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess24.ts
@@ -0,0 +1,27 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     /*a*/public a: number = 1;/*b*/
+////     public _a: string = "foo";
+////     public _a_1: string = "bar";
+////     public _a_2: string = "baz";
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private /*RENAME*/_a_3: number = 1;
+    public get a(): number {
+        return this._a_3;
+    }
+    public set a(value: number) {
+        this._a_3 = value;
+    }
+    public _a: string = "foo";
+    public _a_1: string = "bar";
+    public _a_2: string = "baz";
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess25.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess25.ts
new file mode 100644
index 00000000000..295b9e32827
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess25.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     public /*a*/"a"/*b*/: number = 1;
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private /*RENAME*/"_a": number = 1;
+    public get "a"(): number {
+        return this["_a"];
+    }
+    public set "a"(value: number) {
+        this["_a"] = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess26.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess26.ts
new file mode 100644
index 00000000000..fd2936bd658
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess26.ts
@@ -0,0 +1,23 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     public _a: string = "";
+////     /*a*/public "a": number = 1;/*b*/
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    public _a: string = "";
+    private /*RENAME*/"_a_1": number = 1;
+    public get "a"(): number {
+        return this["_a_1"];
+    }
+    public set "a"(value: number) {
+        this["_a_1"] = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess27.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess27.ts
new file mode 100644
index 00000000000..9538be381ca
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess27.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     /*a*/public "a-b": number = 1;/*b*/
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private /*RENAME*/"_a-b": number = 1;
+    public get "a-b"(): number {
+        return this["_a-b"];
+    }
+    public set "a-b"(value: number) {
+        this["_a-b"] = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess28.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess28.ts
new file mode 100644
index 00000000000..17a401b63ac
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess28.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     /*a*/public static "a": number = 1;/*b*/
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private static /*RENAME*/"_a": number = 1;
+    public static get "a"(): number {
+        return A["_a"];
+    }
+    public static set "a"(value: number) {
+        A["_a"] = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess29.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess29.ts
new file mode 100644
index 00000000000..63e4c44d4ba
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess29.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts' />
+
+//// const A = {
+////     /*a*/a/*b*/: 1
+//// };
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `const A = {
+    /*RENAME*/_a: 1,
+    get a() {
+        return this._a;
+    },
+    set a(value) {
+        this._a = value;
+    },
+};`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess3.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess3.ts
new file mode 100644
index 00000000000..4ff6877270d
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess3.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     /*a*/private a: string;/*b*/
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private /*RENAME*/_a: string;
+    public get a(): string {
+        return this._a;
+    }
+    public set a(value: string) {
+        this._a = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess30.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess30.ts
new file mode 100644
index 00000000000..dd45b7c0cd1
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess30.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts' />
+
+//// const A = {
+////     /*a*/'a'/*b*/: 1
+//// };
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `const A = {
+    /*RENAME*/"_a": 1,
+    get "a"() {
+        return this["_a"];
+    },
+    set "a"(value) {
+        this["_a"] = value;
+    },
+};`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess31.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess31.ts
new file mode 100644
index 00000000000..67e8b461aff
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess31.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     public /*a*/a/*b*/ = 1;
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private /*RENAME*/_a = 1;
+    public get a() {
+        return this._a;
+    }
+    public set a(value) {
+        this._a = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess32.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess32.ts
new file mode 100644
index 00000000000..2cb131e685e
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess32.ts
@@ -0,0 +1,25 @@
+/// <reference path='fourslash.ts' />
+
+//// /** Class comment */
+//// class A {
+////     // Field comment
+////     public /*a*/a/*b*/: number = 1;
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `/** Class comment */
+class A {
+    // Field comment
+    private /*RENAME*/_a: number = 1;
+    public get a(): number {
+        return this._a;
+    }
+    public set a(value: number) {
+        this._a = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess4.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess4.ts
new file mode 100644
index 00000000000..2b6ccbeaa1a
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess4.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     /*a*/private _a: string;/*b*/
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private /*RENAME*/__a: string;
+    public get _a(): string {
+        return this.__a;
+    }
+    public set _a(value: string) {
+        this.__a = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess5.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess5.ts
new file mode 100644
index 00000000000..6299cc01429
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess5.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     /*a*/_a: string;/*b*/
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private /*RENAME*/__a: string;
+    public get _a(): string {
+        return this.__a;
+    }
+    public set _a(value: string) {
+        this.__a = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess6.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess6.ts
new file mode 100644
index 00000000000..5f713df203c
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess6.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     /*a*/public _a: string;/*b*/
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private /*RENAME*/__a: string;
+    public get _a(): string {
+        return this.__a;
+    }
+    public set _a(value: string) {
+        this.__a = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess7.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess7.ts
new file mode 100644
index 00000000000..4fc5641d657
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess7.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     /*a*/protected _a: string;/*b*/
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private /*RENAME*/__a: string;
+    protected get _a(): string {
+        return this.__a;
+    }
+    protected set _a(value: string) {
+        this.__a = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess8.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess8.ts
new file mode 100644
index 00000000000..cfbcd9fd762
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess8.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     /*a*/public a: string = "foo";/*b*/
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    private /*RENAME*/_a: string = "foo";
+    public get a(): string {
+        return this._a;
+    }
+    public set a(value: string) {
+        this._a = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess9.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess9.ts
new file mode 100644
index 00000000000..a5a402b99c0
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess9.ts
@@ -0,0 +1,23 @@
+/// <reference path='fourslash.ts' />
+
+//// class A {
+////     @foo
+////     /*a*/public a: string = "foo";/*b*/
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    @foo
+    private /*RENAME*/_a: string = "foo";
+    public get a(): string {
+        return this._a;
+    }
+    public set a(value: string) {
+        this._a = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_1.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_1.ts
new file mode 100644
index 00000000000..7293afd9219
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_1.ts
@@ -0,0 +1,22 @@
+/// <reference path='fourslash.ts' />
+// @allowJs: true
+// @Filename: a.js
+//// const A = {
+////     /*a*/"a"/*b*/: 1
+//// };
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `const A = {
+    /*RENAME*/"_a": 1,
+    get "a"() {
+        return this["_a"];
+    },
+    set "a"(value) {
+        this["_a"] = value;
+    },
+};`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_2.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_2.ts
new file mode 100644
index 00000000000..19b2ef109a7
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_2.ts
@@ -0,0 +1,22 @@
+/// <reference path='fourslash.ts' />
+// @allowJs: true
+// @Filename: a.js
+//// const A = {
+////     /*a*/a/*b*/: 1
+//// };
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `const A = {
+    /*RENAME*/_a: 1,
+    get a() {
+        return this._a;
+    },
+    set a(value) {
+        this._a = value;
+    },
+};`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_3.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_3.ts
new file mode 100644
index 00000000000..683f92d39ab
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_3.ts
@@ -0,0 +1,22 @@
+/// <reference path='fourslash.ts' />
+// @allowJs: true
+// @Filename: a.js
+//// class A {
+////     /*a*/a/*b*/ = 1;
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    /*RENAME*/_a = 1;
+    get a() {
+        return this._a;
+    }
+    set a(value) {
+        this._a = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_4.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_4.ts
new file mode 100644
index 00000000000..43abee5f7a3
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_4.ts
@@ -0,0 +1,22 @@
+/// <reference path='fourslash.ts' />
+// @allowJs: true
+// @Filename: a.js
+//// class A {
+////     /*a*/"a"/*b*/ = 1;
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    /*RENAME*/"_a" = 1;
+    get "a"() {
+        return this["_a"];
+    }
+    set "a"(value) {
+        this["_a"] = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_5.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_5.ts
new file mode 100644
index 00000000000..8c7ccde7e55
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_5.ts
@@ -0,0 +1,24 @@
+/// <reference path='fourslash.ts' />
+// @allowJs: true
+// @Filename: a.js
+//// class A {
+////     _a = 2;
+////     /*a*/"a"/*b*/ = 1;
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    _a = 2;
+    /*RENAME*/"_a_1" = 1;
+    get "a"() {
+        return this["_a_1"];
+    }
+    set "a"(value) {
+        this["_a_1"] = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_6.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_6.ts
new file mode 100644
index 00000000000..0c521ee43b1
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_6.ts
@@ -0,0 +1,24 @@
+/// <reference path='fourslash.ts' />
+// @allowJs: true
+// @Filename: a.js
+//// class A {
+////     "_a" = 2;
+////     /*a*/"a"/*b*/ = 1;
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    "_a" = 2;
+    /*RENAME*/"_a_1" = 1;
+    get "a"() {
+        return this["_a_1"];
+    }
+    set "a"(value) {
+        this["_a_1"] = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_7.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_7.ts
new file mode 100644
index 00000000000..ca135132a81
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_7.ts
@@ -0,0 +1,24 @@
+/// <reference path='fourslash.ts' />
+// @allowJs: true
+// @Filename: a.js
+//// const A = {
+////     _a: 2,
+////     /*a*/a/*b*/: 1
+//// };
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `const A = {
+    _a: 2,
+    /*RENAME*/_a_1: 1,
+    get a() {
+        return this._a_1;
+    },
+    set a(value) {
+        this._a_1 = value;
+    },
+};`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_8.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_8.ts
new file mode 100644
index 00000000000..e2ba5941fcb
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_8.ts
@@ -0,0 +1,26 @@
+/// <reference path='fourslash.ts' />
+// @allowJs: true
+// @Filename: a.js
+//// /** Class comment */
+//// class A {
+////     // Field comment
+////     /*a*/a/*b*/ = 1;
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `/** Class comment */
+class A {
+    // Field comment
+    /*RENAME*/_a = 1;
+    get a() {
+        return this._a;
+    }
+    set a(value) {
+        this._a = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_9.ts b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_9.ts
new file mode 100644
index 00000000000..4a80fe1af9f
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertToGetAccessAndSetAccess_js_9.ts
@@ -0,0 +1,22 @@
+/// <reference path='fourslash.ts' />
+// @allowJs: true
+// @Filename: a.js
+//// class A {
+////     static /*a*/a/*b*/ = 1;
+//// }
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Generate 'get' and 'set' accessors",
+    actionName: "Generate 'get' and 'set' accessors",
+    actionDescription: "Generate 'get' and 'set' accessors",
+    newContent: `class A {
+    static /*RENAME*/_a = 1;
+    static get a() {
+        return A._a;
+    }
+    static set a(value) {
+        A._a = value;
+    }
+}`,
+});
diff --git a/tests/cases/fourslash/renameImportOfExportEquals2.ts b/tests/cases/fourslash/renameImportOfExportEquals2.ts
index 83ff1794bde..dfb472caab8 100644
--- a/tests/cases/fourslash/renameImportOfExportEquals2.ts
+++ b/tests/cases/fourslash/renameImportOfExportEquals2.ts
@@ -25,7 +25,7 @@ const qRanges = [Q0, Q1];
 
 const ns = { definition: "namespace N", ranges: nRanges };
 const os = { definition: "(alias) namespace O\nimport O", ranges: oRanges };
-const ps = { definition: "(alias) namespace P\nimport P", ranges: pRanges };
+const ps = { definition: "(alias) namespace P\nexport P", ranges: pRanges };
 const qs = { definition: "(alias) namespace Q\nimport Q", ranges: qRanges };
 
 verify.referenceGroups(nRanges, [ns, os, ps, qs]);
diff --git a/tests/cases/fourslash/renameImportOfReExport.ts b/tests/cases/fourslash/renameImportOfReExport.ts
index 6afb953ad53..2c684fde193 100644
--- a/tests/cases/fourslash/renameImportOfReExport.ts
+++ b/tests/cases/fourslash/renameImportOfReExport.ts
@@ -20,7 +20,7 @@ const ranges = test.ranges();
 const [r0, r1, r2, r3] = ranges;
 const importRanges = [r2, r3];
 const classes = { definition: "class C", ranges: [r0] };
-const bs = { definition: "(alias) class C\nimport C", ranges: [r1] };
+const bs = { definition: "(alias) class C\nexport C", ranges: [r1] };
 const imports = { definition: "(alias) class C\nimport C", ranges: importRanges };
 verify.referenceGroups(r0, [classes, bs, imports]);
 verify.referenceGroups(r1, [bs, imports, classes]);
diff --git a/tests/cases/fourslash/renameImportOfReExport2.ts b/tests/cases/fourslash/renameImportOfReExport2.ts
index bcaa0e41c8a..81b62249441 100644
--- a/tests/cases/fourslash/renameImportOfReExport2.ts
+++ b/tests/cases/fourslash/renameImportOfReExport2.ts
@@ -18,7 +18,7 @@ const cRanges = ranges.get("C");
 const [d0, d1, d2] = ranges.get("D");
 
 const classes = { definition: "class C", ranges: cRanges };
-const bImports = { definition: "(alias) class D\nimport D", ranges: [d0] };
+const bImports = { definition: "(alias) class D\nexport D", ranges: [d0] };
 const cImports = { definition: "(alias) class D\nimport D", ranges: [d1, d2] };
 verify.referenceGroups(cRanges, [classes, bImports, cImports]);
 
diff --git a/tests/cases/fourslash/renameReExportDefault.ts b/tests/cases/fourslash/renameReExportDefault.ts
new file mode 100644
index 00000000000..0eb5b81d209
--- /dev/null
+++ b/tests/cases/fourslash/renameReExportDefault.ts
@@ -0,0 +1,19 @@
+/// <reference path='fourslash.ts' />
+
+// @Filename: /a.ts
+////export { default } from "./b";
+////export { default as [|b|] } from "./b";
+////export { default as bee } from "./b";
+////import { default as [|b|] } from "./b";
+////import { default as bee } from "./b";
+////import [|b|] from "./b";
+
+// @Filename: /b.ts
+////const [|b|] = 0;
+////export default [|b|];
+
+const [r0, r1, r2, r3, r4] = test.ranges();
+verify.renameLocations(r0, [r0]);
+verify.renameLocations(r1, [r1]);
+verify.renameLocations(r2, [r2]);
+verify.renameLocations([r3, r4], [r0, r1, r2, r3, r4]);
diff --git a/tests/cases/fourslash/transitiveExportImports3.ts b/tests/cases/fourslash/transitiveExportImports3.ts
index abb7b2a2983..aeac07476e4 100644
--- a/tests/cases/fourslash/transitiveExportImports3.ts
+++ b/tests/cases/fourslash/transitiveExportImports3.ts
@@ -13,7 +13,7 @@ verify.noErrors();
 const [f0, f1, g0, f2, g1] = test.ranges();
 
 const af = { definition: "function f(): void", ranges: [f0, f1] };
-const g0Group = { definition: "(alias) function g(): void\nimport g", ranges: [g0] };
+const g0Group = { definition: "(alias) function g(): void\nexport g", ranges: [g0] };
 const g1Group = { definition: "(alias) function g(): void\nimport g", ranges: [g1] };
 const bf = { definition: "(alias) function f(): void\nimport f", ranges: [f2] };
 
diff --git a/tests/cases/fourslash/tsxGoToDefinitionUnionElementType1.ts b/tests/cases/fourslash/tsxGoToDefinitionUnionElementType1.ts
index d6b5dfab709..0e899c71d2b 100644
--- a/tests/cases/fourslash/tsxGoToDefinitionUnionElementType1.ts
+++ b/tests/cases/fourslash/tsxGoToDefinitionUnionElementType1.ts
@@ -18,9 +18,9 @@
 ////     return <h1>World </h1>;
 //// }
 
-//// var SFCComp = SFC1 || SFC2;
+//// var /*def*/SFCComp = SFC1 || SFC2;
 //// <[|SFC/*one*/Comp|] x />
 
 verify.goToDefinition({
-    "one": "pt1"
-})
\ No newline at end of file
+    "one": ["pt1", "def"],
+});
diff --git a/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter b/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
index ed149eb0c78..40bdb4eadab 160000
--- a/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
+++ b/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
@@ -1 +1 @@
-Subproject commit ed149eb0c787b1195a95b44105822c64bb6eb636
+Subproject commit 40bdb4eadabc9fbed7d83e3f26817a931c0763b6
diff --git a/tests/cases/user/axios-src/axios-src b/tests/cases/user/axios-src/axios-src
new file mode 160000
index 00000000000..0b3db5d87a6
--- /dev/null
+++ b/tests/cases/user/axios-src/axios-src
@@ -0,0 +1 @@
+Subproject commit 0b3db5d87a60a1ad8b0dce9669dbc10483ec33da
diff --git a/tests/cases/user/axios-src/test.json b/tests/cases/user/axios-src/test.json
new file mode 100644
index 00000000000..b6495a1b80b
--- /dev/null
+++ b/tests/cases/user/axios-src/test.json
@@ -0,0 +1,3 @@
+{
+    "types": ["node"]
+}
diff --git a/tests/cases/user/webpack/tsconfig.json b/tests/cases/user/axios-src/tsconfig.json
similarity index 73%
rename from tests/cases/user/webpack/tsconfig.json
rename to tests/cases/user/axios-src/tsconfig.json
index 562639f48fe..ef3f63dc126 100644
--- a/tests/cases/user/webpack/tsconfig.json
+++ b/tests/cases/user/axios-src/tsconfig.json
@@ -7,10 +7,8 @@
         "noEmit": true,
         "allowJs": true,
         "checkJs": true,
-        "downlevelIteration": true,
-        "target": "esnext",
         "types": ["node"],
         "lib": ["esnext", "dom"],
     },
-    "include": ["node_modules/webpack"]
+    "include": ["axios-src/lib"]
 }
diff --git a/tests/cases/user/bcryptjs/tsconfig.json b/tests/cases/user/bcryptjs/tsconfig.json
index 4fcf3f61bc6..032e5b5655e 100644
--- a/tests/cases/user/bcryptjs/tsconfig.json
+++ b/tests/cases/user/bcryptjs/tsconfig.json
@@ -10,5 +10,9 @@
         "types": ["node"],
         "lib": ["esnext", "dom"],
     },
-    "include": ["node_modules/bcryptjs"]
+    "include": [
+        "node_modules/bcryptjs/scripts",
+        "node_modules/bcryptjs/src",
+        "node_modules/bcryptjs/tests"
+    ]
 }
diff --git a/tests/cases/user/bluebird/tsconfig.json b/tests/cases/user/bluebird/tsconfig.json
index 3461d0802dc..b54158015a1 100644
--- a/tests/cases/user/bluebird/tsconfig.json
+++ b/tests/cases/user/bluebird/tsconfig.json
@@ -10,5 +10,5 @@
         "types": ["node"],
         "lib": ["esnext", "dom"],
     },
-    "include": ["node_modules/bluebird"]
+    "include": ["node_modules/bluebird/js/release"]
 }
diff --git a/tests/cases/user/chrome-devtools-frontend/tsconfig.json b/tests/cases/user/chrome-devtools-frontend/tsconfig.json
index 58ae61fbda3..75fca170884 100644
--- a/tests/cases/user/chrome-devtools-frontend/tsconfig.json
+++ b/tests/cases/user/chrome-devtools-frontend/tsconfig.json
@@ -4,6 +4,7 @@
         "allowJs": true,
         "checkJs": true,
         "lib": ["esnext", "dom"],
+        "target": "esnext",
         "types": []
     },
     "include": [
diff --git a/tests/cases/user/create-react-app/chalk-override.d.ts b/tests/cases/user/create-react-app/chalk-override.d.ts
new file mode 100644
index 00000000000..5adfd6d3cfb
--- /dev/null
+++ b/tests/cases/user/create-react-app/chalk-override.d.ts
@@ -0,0 +1 @@
+declare module 'chalk';
diff --git a/tests/cases/user/create-react-app/create-react-app b/tests/cases/user/create-react-app/create-react-app
new file mode 160000
index 00000000000..1d4fdc2dd49
--- /dev/null
+++ b/tests/cases/user/create-react-app/create-react-app
@@ -0,0 +1 @@
+Subproject commit 1d4fdc2dd4950011beacf1883900bf5d8da7079e
diff --git a/tests/cases/user/create-react-app/test.json b/tests/cases/user/create-react-app/test.json
new file mode 100644
index 00000000000..e0d4d26bdca
--- /dev/null
+++ b/tests/cases/user/create-react-app/test.json
@@ -0,0 +1,3 @@
+{
+    "types": []
+}
diff --git a/tests/cases/user/create-react-app/tsconfig.json b/tests/cases/user/create-react-app/tsconfig.json
new file mode 100644
index 00000000000..0bb5948b878
--- /dev/null
+++ b/tests/cases/user/create-react-app/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "noImplicitAny": false,
+        "noImplicitThis": false,
+        "maxNodeModuleJsDepth": 0,
+        "strict": true,
+        "noEmit": true,
+        "allowJs": true,
+        "checkJs": true,
+        "types": ["node"],
+        "lib": ["esnext", "dom"],
+        "baseUrl": "./",
+        "paths": {
+            "chalk": ["chalk-override"]
+        }
+    },
+    "include": ["create-react-app"],
+    "exclude": ["create-react-app/packages/react-error-overlay",
+                "create-react-app/packages/react-scripts"]
+}
diff --git a/tests/cases/user/enhanced-resolve/tsconfig.json b/tests/cases/user/enhanced-resolve/tsconfig.json
index 785c4c8ac97..74226d5a6be 100644
--- a/tests/cases/user/enhanced-resolve/tsconfig.json
+++ b/tests/cases/user/enhanced-resolve/tsconfig.json
@@ -9,6 +9,8 @@
         "checkJs": true,
         "types": ["node"],
         "lib": ["esnext", "dom"],
+        "module": "CommonJS",
+        "target": "esnext",
     },
     "include": ["node_modules/enhanced-resolve"]
 }
diff --git a/tests/cases/user/lodash/tsconfig.json b/tests/cases/user/lodash/tsconfig.json
index 4e130b37493..a50a9a85374 100644
--- a/tests/cases/user/lodash/tsconfig.json
+++ b/tests/cases/user/lodash/tsconfig.json
@@ -10,5 +10,6 @@
         "types": ["node"],
         "lib": ["esnext", "dom"],
     },
-    "include": ["node_modules/lodash"]
+    "include": ["node_modules/lodash"],
+    "exclude": ["node_modules/lodash/lodash.js"]
 }
diff --git a/tests/cases/user/npm/tsconfig.json b/tests/cases/user/npm/tsconfig.json
index ab3eaf8cec7..a57d3622164 100644
--- a/tests/cases/user/npm/tsconfig.json
+++ b/tests/cases/user/npm/tsconfig.json
@@ -8,7 +8,7 @@
         "allowJs": true,
         "checkJs": true,
         "types": ["node"],
-        "lib": ["esnext", "dom"],
+        "lib": ["esnext", "dom", "scripthost"],
     },
     "include": ["node_modules/npm"]
 }
diff --git a/tests/cases/user/puppeteer/puppeteer b/tests/cases/user/puppeteer/puppeteer
new file mode 160000
index 00000000000..98bb2615adb
--- /dev/null
+++ b/tests/cases/user/puppeteer/puppeteer
@@ -0,0 +1 @@
+Subproject commit 98bb2615adb6815c91efcc59593b49e2ec8c3935
diff --git a/tests/cases/user/puppeteer/test.json b/tests/cases/user/puppeteer/test.json
new file mode 100644
index 00000000000..e0d4d26bdca
--- /dev/null
+++ b/tests/cases/user/puppeteer/test.json
@@ -0,0 +1,3 @@
+{
+    "types": []
+}
diff --git a/tests/cases/user/url-search-params/tsconfig.json b/tests/cases/user/url-search-params/tsconfig.json
index 1ca26f34001..113a87b9e4a 100644
--- a/tests/cases/user/url-search-params/tsconfig.json
+++ b/tests/cases/user/url-search-params/tsconfig.json
@@ -10,5 +10,5 @@
         "types": ["node"],
         "lib": ["esnext", "dom"],
     },
-    "include": ["node_modules/url-search-params"]
+    "include": ["node_modules/url-search-params/build/url-search-params.node.js"]
 }
diff --git a/tests/cases/user/webpack/package.json b/tests/cases/user/webpack/package.json
deleted file mode 100644
index 56cac18b9f4..00000000000
--- a/tests/cases/user/webpack/package.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "name": "webpack-test",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "author": "",
-  "license": "Apache-2.0",
-  "dependencies": {
-    "webpack": "^4.1.1"
-  }
-}
diff --git a/tests/cases/user/webpack/test.json b/tests/cases/user/webpack/test.json
new file mode 100644
index 00000000000..e0d4d26bdca
--- /dev/null
+++ b/tests/cases/user/webpack/test.json
@@ -0,0 +1,3 @@
+{
+    "types": []
+}
diff --git a/tests/cases/user/webpack/webpack b/tests/cases/user/webpack/webpack
new file mode 160000
index 00000000000..10282ea2064
--- /dev/null
+++ b/tests/cases/user/webpack/webpack
@@ -0,0 +1 @@
+Subproject commit 10282ea20648b465caec6448849f24fc34e1ba3e