Merge branch 'main' into fix21732

# Conflicts: # src/compiler/checker.ts
microsoft · Sep 7, 2022 · d178ea4 · d178ea4
2 parents 335d7c8 + 3c3820b
commit d178ea4
Show file tree

Hide file tree

Showing 451 changed files with 15,662 additions and 14,699 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -3,7 +3,20 @@
 /tests/**
 /lib/**
 /src/lib/*.generated.d.ts
+# Ignore all compiled script outputs
 /scripts/*.js
+# But, not the ones that are hand-written.
+# TODO: remove once scripts are pure JS
+!/scripts/browserIntegrationTest.js
+!/scripts/createPlaygroundBuild.js
+!/scripts/failed-tests.js
+!/scripts/find-unused-diagnostic-messages.js
+!/scripts/lint-hooks.js
+!/scripts/perf-result-post.js
+!/scripts/post-vsts-artifact-comment.js
+!/scripts/regenerate-unicode-identifier-parts.js
+!/scripts/run-sequence.js
+!/scripts/update-experimental-branches.js
 /scripts/eslint/built/**
 /internal/**
 /coverage/**
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -22,7 +22,7 @@
         //
         // ESLint in VS Code will lint any opened file (so long as it's not eslintignore'd), so
         // that will work regardless of the below.
-        { "files": ["*.ts"] }
+        { "files": ["*.ts", "*.mts", "*.cts", "*.mjs", "*.cjs"] }
     ],
     "rules": {
         "@typescript-eslint/adjacent-overload-signatures": "error",

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -46,7 +46,7 @@ jobs:
     - run:  npm ci
 
     - name: Linter
-      run:  npm run lint:ci
+      run:  npm run lint
 
   browser-integration:
     runs-on: ubuntu-latest

diff --git a/Gulpfile.js b/Gulpfile.js
@@ -372,9 +372,6 @@ const lint = eslint(".");
 lint.displayName = "lint";
 task("lint", lint);
 task("lint").description = "Runs eslint on the compiler and scripts sources.";
-task("lint").flags = {
-    "   --ci": "Runs eslint additional rules",
-};
 
 const buildCancellationToken = () => buildProject("src/cancellationToken");
 const cleanCancellationToken = () => cleanProject("src/cancellationToken");

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -90,7 +90,6 @@
         "mocha-fivemat-progress-reporter": "latest",
         "ms": "^2.1.3",
         "node-fetch": "^2.6.7",
-        "prex": "^0.4.7",
         "source-map-support": "latest",
         "typescript": "^4.8.2",
         "vinyl": "latest",
@@ -110,7 +109,6 @@
         "clean": "gulp clean",
         "gulp": "gulp",
         "lint": "gulp lint",
-        "lint:ci": "gulp lint --ci",
         "setup-hooks": "node scripts/link-hooks.js"
     },
     "browser": {

diff --git a/scripts/build/options.js b/scripts/build/options.js
@@ -2,9 +2,11 @@
 const minimist = require("minimist");
 const os = require("os");
 
+const ci = ["1", "true"].includes(process.env.CI);
+
 /** @type {CommandLineOptions} */
 module.exports = minimist(process.argv.slice(2), {
-    boolean: ["dirty", "light", "colors", "lint", "lkg", "soft", "fix", "failed", "keepFailed", "force", "built"],
+    boolean: ["dirty", "light", "colors", "lint", "lkg", "soft", "fix", "failed", "keepFailed", "force", "built", "ci"],
     string: ["browser", "tests", "break", "host", "reporter", "stackTraceLimit", "timeout", "shards", "shardId"],
     alias: {
         /* eslint-disable quote-props */
@@ -33,12 +35,13 @@ module.exports = minimist(process.argv.slice(2), {
         reporter: process.env.reporter || process.env.r,
         lint: process.env.lint || true,
         fix: process.env.fix || process.env.f,
-        workers: process.env.workerCount || ((os.cpus().length - (process.env.CI ? 0 : 1)) || 1),
+        workers: process.env.workerCount || ((os.cpus().length - (ci ? 0 : 1)) || 1),
         failed: false,
         keepFailed: false,
         lkg: true,
         dirty: false,
-        built: false
+        built: false,
+        ci,
     }
 });
 
@@ -67,6 +70,7 @@ if (module.exports.built) {
  * @property {string|number} timeout
  * @property {boolean} failed
  * @property {boolean} keepFailed
+ * @property {boolean} ci
  *
  * @typedef {import("minimist").ParsedArgs & TypedOptions} CommandLineOptions
  */

diff --git a/scripts/build/tests.js b/scripts/build/tests.js
@@ -6,7 +6,6 @@ const path = require("path");
 const mkdirP = require("mkdirp");
 const log = require("fancy-log");
 const cmdLineOptions = require("./options");
-const { CancellationToken } = require("prex");
 const { exec } = require("./utils");
 const { findUpFile } = require("./findUpDir");
 
@@ -22,9 +21,8 @@ exports.localTest262Baseline = "internal/baselines/test262/local";
  * @param {string} defaultReporter
  * @param {boolean} runInParallel
  * @param {boolean} watchMode
- * @param {import("prex").CancellationToken} [cancelToken]
  */
-async function runConsoleTests(runJs, defaultReporter, runInParallel, watchMode, cancelToken = CancellationToken.none) {
+async function runConsoleTests(runJs, defaultReporter, runInParallel, watchMode) {
     let testTimeout = cmdLineOptions.timeout;
     const tests = cmdLineOptions.tests;
     const inspect = cmdLineOptions.break || cmdLineOptions.inspect;
@@ -38,7 +36,6 @@ async function runConsoleTests(runJs, defaultReporter, runInParallel, watchMode,
     const shardId = +cmdLineOptions.shardId || undefined;
     if (!cmdLineOptions.dirty) {
         await cleanTestDirs();
-        cancelToken.throwIfCancellationRequested();
     }
 
     if (fs.existsSync(testConfigFile)) {
@@ -121,19 +118,17 @@ async function runConsoleTests(runJs, defaultReporter, runInParallel, watchMode,
 
     try {
         setNodeEnvToDevelopment();
-        const { exitCode } = await exec(process.execPath, args, {
-            cancelToken,
-        });
+        const { exitCode } = await exec(process.execPath, args);
         if (exitCode !== 0) {
             errorStatus = exitCode;
             error = new Error(`Process exited with status code ${errorStatus}.`);
         }
-        else if (process.env.CI === "true") {
+        else if (cmdLineOptions.ci) {
             // finally, do a sanity check and build the compiler with the built version of itself
             log.info("Starting sanity check build...");
             // Cleanup everything except lint rules (we'll need those later and would rather not waste time rebuilding them)
-            await exec("gulp", ["clean-tsc", "clean-services", "clean-tsserver", "clean-lssl", "clean-tests"], { cancelToken });
-            const { exitCode } = await exec("gulp", ["local", "--lkg=false"], { cancelToken });
+            await exec("gulp", ["clean-tsc", "clean-services", "clean-tsserver", "clean-lssl", "clean-tests"]);
+            const { exitCode } = await exec("gulp", ["local", "--lkg=false"]);
             if (exitCode !== 0) {
                 errorStatus = exitCode;
                 error = new Error(`Sanity check build process exited with status code ${errorStatus}.`);

diff --git a/scripts/build/utils.js b/scripts/build/utils.js
@@ -14,7 +14,6 @@ const ts = require("../../lib/typescript");
 const chalk = require("chalk");
 const which = require("which");
 const { spawn } = require("child_process");
-const { CancellationToken, CancelError, Deferred } = require("prex");
 const { Readable, Duplex } = require("stream");
 
 /**
@@ -25,26 +24,17 @@ const { Readable, Duplex } = require("stream");
  *
  * @typedef ExecOptions
  * @property {boolean} [ignoreExitCode]
- * @property {import("prex").CancellationToken} [cancelToken]
  * @property {boolean} [hidePrompt]
  * @property {boolean} [waitForExit=true]
  */
 async function exec(cmd, args, options = {}) {
     return /**@type {Promise<{exitCode: number}>}*/(new Promise((resolve, reject) => {
-        const { ignoreExitCode, cancelToken = CancellationToken.none, waitForExit = true } = options;
-        cancelToken.throwIfCancellationRequested();
+        const { ignoreExitCode, waitForExit = true } = options;
 
         if (!options.hidePrompt) log(`> ${chalk.green(cmd)} ${args.join(" ")}`);
         const proc = spawn(which.sync(cmd), args, { stdio: waitForExit ? "inherit" : "ignore" });
-        const registration = cancelToken.register(() => {
-            log(`${chalk.red("killing")} '${chalk.green(cmd)} ${args.join(" ")}'...`);
-            proc.kill("SIGINT");
-            proc.kill("SIGTERM");
-            reject(new CancelError());
-        });
         if (waitForExit) {
             proc.on("exit", exitCode => {
-                registration.unregister();
                 if (exitCode === 0 || ignoreExitCode) {
                     resolve({ exitCode });
                 }
@@ -53,7 +43,6 @@ async function exec(cmd, args, options = {}) {
                 }
             });
             proc.on("error", error => {
-                registration.unregister();
                 reject(error);
             });
         }
@@ -395,6 +384,15 @@ function rm(dest, opts) {
 }
 exports.rm = rm;
 
+class Deferred {
+    constructor() {
+        this.promise = new Promise((resolve, reject) => {
+            this.resolve = resolve;
+            this.reject = reject;
+        });
+    }
+}
+
 class Debouncer {
     /**
      * @param {number} timeout

diff --git a/scripts/failed-tests.js b/scripts/failed-tests.js
@@ -45,7 +45,7 @@ class FailedTestsReporter extends Mocha.reporters.Base {
                 }
             }
 
-            const newOptions = Object.assign({}, options, { reporterOptions: reporterOptions.reporterOptions || {} });
+            const newOptions = { ...options, reporterOptions: reporterOptions.reporterOptions || {} };
             if (reporterOptions.reporter === "xunit") {
                 newOptions.reporterOptions.output = "TEST-results.xml";
             }
@@ -142,4 +142,4 @@ class FailedTestsReporter extends Mocha.reporters.Base {
     }
 }
 
-module.exports = FailedTestsReporter;
+module.exports = FailedTestsReporter;
diff --git a/scripts/find-unused-diganostic-messages.mjs b/scripts/find-unused-diganostic-messages.mjs
@@ -17,7 +17,8 @@ startOfDiags.split(EOL).forEach(line => {
     try {
         execSync(`grep -rnw 'src' -e 'Diagnostics.${diagName}'`).toString();
         process.stdout.write(".");
-    } catch (error) {
+    }
+    catch (error) {
         missingNames.push(diagName);
         process.stdout.write("x");
     }

diff --git a/scripts/post-vsts-artifact-comment.js b/scripts/post-vsts-artifact-comment.js
@@ -48,7 +48,7 @@ and then running \`npm install\`.
 
     // Temporarily disable until we get access controls set up right
     // Send a ping to https://github.com/microsoft/typescript-make-monaco-builds#pull-request-builds
-    await gh.request("POST /repos/microsoft/typescript-make-monaco-builds/dispatches", { event_type: process.env.SOURCE_ISSUE, headers: { Accept: "application/vnd.github.everest-preview+json" }});
+    await gh.request("POST /repos/microsoft/typescript-make-monaco-builds/dispatches", { event_type: process.env.SOURCE_ISSUE, headers: { Accept: "application/vnd.github.everest-preview+json" } });
 }
 
 main().catch(async e => {

diff --git a/scripts/run-sequence.js b/scripts/run-sequence.js
@@ -1,7 +1,6 @@
 // @ts-check
 const cp = require("child_process");
 /**
- * 
  * @param {[string, string[]][]} tasks
  * @param {cp.SpawnSyncOptions} opts
  */
@@ -17,4 +16,4 @@ function runSequence(tasks, opts = { timeout: 100000, shell: true }) {
     return lastResult && lastResult.stdout && lastResult.stdout.toString();
 }
 
-exports.runSequence = runSequence;
+exports.runSequence = runSequence;
diff --git a/scripts/update-experimental-branches.js b/scripts/update-experimental-branches.js
@@ -10,7 +10,7 @@ const triggeredPR = process.env.SOURCE_ISSUE || process.env.SYSTEM_PULLREQUEST_P
  * This program should be invoked as `node ./scripts/update-experimental-branches <GithubAccessToken>`
  * TODO: the following is racey - if two experiment-enlisted PRs trigger simultaneously and witness one another in an unupdated state, they'll both produce
  * a new experimental branch, but each will be missing a change from the other. There's no _great_ way to fix this beyond setting the maximum concurrency
- * of this task to 1 (so only one job is allowed to update experiments at a time). 
+ * of this task to 1 (so only one job is allowed to update experiments at a time).
  */
 async function main() {
     const gh = new Octokit({

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -25101,7 +25101,7 @@ namespace ts {
                 const narrowedPropType = narrowType(propType);
                 return filterType(type, t => {
                     const discriminantType = getTypeOfPropertyOrIndexSignature(t, propName);
-                    return !(narrowedPropType.flags & TypeFlags.Never) && isTypeComparableTo(narrowedPropType, discriminantType);
+                    return !(narrowedPropType.flags & TypeFlags.Never) && areTypesComparable(narrowedPropType, discriminantType);
                 });
             }
 
@@ -25301,14 +25301,19 @@ namespace ts {
                     assumeTrue = !assumeTrue;
                 }
                 const valueType = getTypeOfExpression(value);
-                if ((type.flags & TypeFlags.Unknown) && assumeTrue && (operator === SyntaxKind.EqualsEqualsEqualsToken || operator === SyntaxKind.ExclamationEqualsEqualsToken)) {
+                if (((type.flags & TypeFlags.Unknown) || isEmptyAnonymousObjectType(type) && !(valueType.flags & TypeFlags.Nullable)) &&
+                    assumeTrue &&
+                    (operator === SyntaxKind.EqualsEqualsEqualsToken || operator === SyntaxKind.ExclamationEqualsEqualsToken)
+                ) {
                     if (valueType.flags & (TypeFlags.Primitive | TypeFlags.NonPrimitive)) {
                         return valueType;
                     }
                     if (valueType.flags & TypeFlags.Object) {
                         return nonPrimitiveType;
                     }
-                    return type;
+                    if (type.flags & TypeFlags.Unknown) {
+                        return type;
+                    }
                 }
                 if (valueType.flags & TypeFlags.Nullable) {
                     if (!strictNullChecks) {
@@ -28388,6 +28393,7 @@ namespace ts {
          */
         function createJsxAttributesTypeFromAttributesProperty(openingLikeElement: JsxOpeningLikeElement, checkMode: CheckMode | undefined) {
             const attributes = openingLikeElement.attributes;
+            const attributesType = getContextualType(attributes, ContextFlags.None);
             const allAttributesTable = strictNullChecks ? createSymbolTable() : undefined;
             let attributesTable = createSymbolTable();
             let spread: Type = emptyJsxObjectType;
@@ -28416,6 +28422,12 @@ namespace ts {
                     if (attributeDecl.name.escapedText === jsxChildrenPropertyName) {
                         explicitlySpecifyChildrenAttribute = true;
                     }
+                    if (attributesType) {
+                        const prop = getPropertyOfType(attributesType, member.escapedName);
+                        if (prop && prop.declarations && isDeprecatedSymbol(prop)) {
+                            addDeprecatedSuggestion(attributeDecl.name, prop.declarations, attributeDecl.name.escapedText as string);
+                        }
+                    }
                 }
                 else {
                     Debug.assert(attributeDecl.kind === SyntaxKind.JsxSpreadAttribute);

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -3535,11 +3535,12 @@ namespace ts {
                     createDiagnosticForOptionName(Diagnostics.Option_preserveConstEnums_cannot_be_disabled_when_isolatedModules_is_enabled, "preserveConstEnums", "isolatedModules");
                 }
 
-                const firstNonExternalModuleSourceFile = find(files, f => !isExternalModule(f) && !isSourceFileJS(f) && !f.isDeclarationFile && f.scriptKind !== ScriptKind.JSON);
-                if (firstNonExternalModuleSourceFile) {
-                    const span = getErrorSpanForNode(firstNonExternalModuleSourceFile, firstNonExternalModuleSourceFile);
-                    programDiagnostics.add(createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length,
-                        Diagnostics._0_cannot_be_compiled_under_isolatedModules_because_it_is_considered_a_global_script_file_Add_an_import_export_or_an_empty_export_statement_to_make_it_a_module, getBaseFileName(firstNonExternalModuleSourceFile.fileName)));
+                for (const file of files) {
+                    if (!isExternalModule(file) && !isSourceFileJS(file) && !file.isDeclarationFile && file.scriptKind !== ScriptKind.JSON) {
+                        const span = getErrorSpanForNode(file, file);
+                        programDiagnostics.add(createFileDiagnostic(file, span.start, span.length,
+                            Diagnostics._0_cannot_be_compiled_under_isolatedModules_because_it_is_considered_a_global_script_file_Add_an_import_export_or_an_empty_export_statement_to_make_it_a_module, getBaseFileName(file.fileName)));
+                    }
                 }
             }
             else if (firstNonAmbientExternalModuleSourceFile && languageVersion < ScriptTarget.ES2015 && options.module === ModuleKind.None) {