typescript 4.8.2 → 4.8.4

package/lib/tsserver.js

@@ -109,7 +109,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "4.8.2";
+    ts.version = "4.8.4";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -8875,7 +8875,7 @@ var ts;
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_save_dev_types_Slashnode_and_then_add_node_to_the_types_field_in_your_tsconfig: diag(2591, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_save_dev_types_Slashno_2591", "Cannot find name '{0}'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node` and then add 'node' to the types field in your tsconfig."),
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_save_dev_types_Slashjquery_and_then_add_jquery_to_the_types_field_in_your_tsconfig: diag(2592, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_save_dev_types_Slash_2592", "Cannot find name '{0}'. Do you need to install type definitions for jQuery? Try `npm i --save-dev @types/jquery` and then add 'jquery' to the types field in your tsconfig."),
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_save_dev_types_Slashjest_or_npm_i_save_dev_types_Slashmocha_and_then_add_jest_or_mocha_to_the_types_field_in_your_tsconfig: diag(2593, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_save_dev_type_2593", "Cannot find name '{0}'. Do you need to install type definitions for a test runner? Try `npm i --save-dev @types/jest` or `npm i --save-dev @types/mocha` and then add 'jest' or 'mocha' to the types field in your tsconfig."),
-        This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag: diag(2594, ts.DiagnosticCategory.Error, "This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the__2594", "This module is declared with using 'export =', and can only be used with a default import when using the '{0}' flag."),
+        This_module_is_declared_with_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag: diag(2594, ts.DiagnosticCategory.Error, "This_module_is_declared_with_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag_2594", "This module is declared with 'export =', and can only be used with a default import when using the '{0}' flag."),
         _0_can_only_be_imported_by_using_a_default_import: diag(2595, ts.DiagnosticCategory.Error, "_0_can_only_be_imported_by_using_a_default_import_2595", "'{0}' can only be imported by using a default import."),
         _0_can_only_be_imported_by_turning_on_the_esModuleInterop_flag_and_using_a_default_import: diag(2596, ts.DiagnosticCategory.Error, "_0_can_only_be_imported_by_turning_on_the_esModuleInterop_flag_and_using_a_default_import_2596", "'{0}' can only be imported by turning on the 'esModuleInterop' flag and using a default import."),
         _0_can_only_be_imported_by_using_a_require_call_or_by_using_a_default_import: diag(2597, ts.DiagnosticCategory.Error, "_0_can_only_be_imported_by_using_a_require_call_or_by_using_a_default_import_2597", "'{0}' can only be imported by using a 'require' call or by using a default import."),
@@ -31516,6 +31516,7 @@ var ts;
             case 335 /* SyntaxKind.JSDocProtectedTag */:
             case 336 /* SyntaxKind.JSDocReadonlyTag */:
             case 331 /* SyntaxKind.JSDocDeprecatedTag */:
+            case 337 /* SyntaxKind.JSDocOverrideTag */:
                 return visitNode(cbNode, node.tagName)
                     || (typeof node.comment === "string" ? undefined : visitNodes(cbNode, cbNodes, node.comment));
             case 350 /* SyntaxKind.PartiallyEmittedExpression */:
@@ -42804,7 +42805,7 @@ var ts;
     function withPackageId(packageInfo, r) {
         var packageId;
         if (r && packageInfo) {
-            var packageJsonContent = packageInfo.packageJsonContent;
+            var packageJsonContent = packageInfo.contents.packageJsonContent;
             if (typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string") {
                 packageId = {
                     name: packageJsonContent.name,
@@ -44123,16 +44124,16 @@ var ts;
     function loadNodeModuleFromDirectory(extensions, candidate, onlyRecordFailures, state, considerPackageJson) {
         if (considerPackageJson === void 0) { considerPackageJson = true; }
         var packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, onlyRecordFailures, state) : undefined;
-        var packageJsonContent = packageInfo && packageInfo.packageJsonContent;
-        var versionPaths = packageInfo && packageInfo.versionPaths;
+        var packageJsonContent = packageInfo && packageInfo.contents.packageJsonContent;
+        var versionPaths = packageInfo && packageInfo.contents.versionPaths;
         return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
     }
     /* @internal */
     function getEntrypointsFromPackageJsonInfo(packageJsonInfo, options, host, cache, resolveJs) {
-        if (!resolveJs && packageJsonInfo.resolvedEntrypoints !== undefined) {
+        if (!resolveJs && packageJsonInfo.contents.resolvedEntrypoints !== undefined) {
             // Cached value excludes resolutions to JS files - those could be
             // cached separately, but they're used rarely.
-            return packageJsonInfo.resolvedEntrypoints;
+            return packageJsonInfo.contents.resolvedEntrypoints;
         }
         var entrypoints;
         var extensions = resolveJs ? Extensions.JavaScript : Extensions.TypeScript;
@@ -44141,13 +44142,13 @@ var ts;
         requireState.conditions = ["node", "require", "types"];
         requireState.requestContainingDirectory = packageJsonInfo.packageDirectory;
         var requireResolution = loadNodeModuleFromDirectoryWorker(extensions, packageJsonInfo.packageDirectory, 
-        /*onlyRecordFailures*/ false, requireState, packageJsonInfo.packageJsonContent, packageJsonInfo.versionPaths);
+        /*onlyRecordFailures*/ false, requireState, packageJsonInfo.contents.packageJsonContent, packageJsonInfo.contents.versionPaths);
         entrypoints = ts.append(entrypoints, requireResolution === null || requireResolution === void 0 ? void 0 : requireResolution.path);
-        if (features & NodeResolutionFeatures.Exports && packageJsonInfo.packageJsonContent.exports) {
+        if (features & NodeResolutionFeatures.Exports && packageJsonInfo.contents.packageJsonContent.exports) {
             for (var _i = 0, _a = [["node", "import", "types"], ["node", "require", "types"]]; _i < _a.length; _i++) {
                 var conditions = _a[_i];
                 var exportState = __assign(__assign({}, requireState), { failedLookupLocations: [], conditions: conditions });
-                var exportResolutions = loadEntrypointsFromExportMap(packageJsonInfo, packageJsonInfo.packageJsonContent.exports, exportState, extensions);
+                var exportResolutions = loadEntrypointsFromExportMap(packageJsonInfo, packageJsonInfo.contents.packageJsonContent.exports, exportState, extensions);
                 if (exportResolutions) {
                     for (var _b = 0, exportResolutions_1 = exportResolutions; _b < exportResolutions_1.length; _b++) {
                         var resolution = exportResolutions_1[_b];
@@ -44156,7 +44157,7 @@ var ts;
                 }
             }
         }
-        return packageJsonInfo.resolvedEntrypoints = entrypoints || false;
+        return packageJsonInfo.contents.resolvedEntrypoints = entrypoints || false;
     }
     ts.getEntrypointsFromPackageJsonInfo = getEntrypointsFromPackageJsonInfo;
     function loadEntrypointsFromExportMap(scope, exports, state, extensions) {
@@ -44260,7 +44261,9 @@ var ts;
                 if (traceEnabled)
                     trace(host, ts.Diagnostics.File_0_exists_according_to_earlier_cached_lookups, packageJsonPath);
                 state.affectingLocations.push(packageJsonPath);
-                return existing;
+                return existing.packageDirectory === packageDirectory ?
+                    existing :
+                    { packageDirectory: packageDirectory, contents: existing.contents };
             }
             else {
                 if (existing && traceEnabled)
@@ -44276,7 +44279,7 @@ var ts;
                 trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
             }
             var versionPaths = readPackageJsonTypesVersionPaths(packageJsonContent, state);
-            var result = { packageDirectory: packageDirectory, packageJsonContent: packageJsonContent, versionPaths: versionPaths, resolvedEntrypoints: undefined };
+            var result = { packageDirectory: packageDirectory, contents: { packageJsonContent: packageJsonContent, versionPaths: versionPaths, resolvedEntrypoints: undefined } };
             (_b = state.packageJsonInfoCache) === null || _b === void 0 ? void 0 : _b.setPackageJsonInfo(packageJsonPath, result);
             state.affectingLocations.push(packageJsonPath);
             return result;
@@ -44401,17 +44404,16 @@ var ts;
     }
     function loadModuleFromSelfNameReference(extensions, moduleName, directory, state, cache, redirectedReference) {
         var _a, _b;
-        var useCaseSensitiveFileNames = typeof state.host.useCaseSensitiveFileNames === "function" ? state.host.useCaseSensitiveFileNames() : state.host.useCaseSensitiveFileNames;
-        var directoryPath = ts.toPath(ts.combinePaths(directory, "dummy"), (_b = (_a = state.host).getCurrentDirectory) === null || _b === void 0 ? void 0 : _b.call(_a), ts.createGetCanonicalFileName(useCaseSensitiveFileNames === undefined ? true : useCaseSensitiveFileNames));
+        var directoryPath = ts.getNormalizedAbsolutePath(ts.combinePaths(directory, "dummy"), (_b = (_a = state.host).getCurrentDirectory) === null || _b === void 0 ? void 0 : _b.call(_a));
         var scope = getPackageScopeForPath(directoryPath, state);
-        if (!scope || !scope.packageJsonContent.exports) {
+        if (!scope || !scope.contents.packageJsonContent.exports) {
             return undefined;
         }
-        if (typeof scope.packageJsonContent.name !== "string") {
+        if (typeof scope.contents.packageJsonContent.name !== "string") {
             return undefined;
         }
         var parts = ts.getPathComponents(moduleName); // unrooted paths should have `""` as their 0th entry
-        var nameParts = ts.getPathComponents(scope.packageJsonContent.name);
+        var nameParts = ts.getPathComponents(scope.contents.packageJsonContent.name);
         if (!ts.every(nameParts, function (p, i) { return parts[i] === p; })) {
             return undefined;
         }
@@ -44419,30 +44421,30 @@ var ts;
         return loadModuleFromExports(scope, extensions, !ts.length(trailingParts) ? "." : ".".concat(ts.directorySeparator).concat(trailingParts.join(ts.directorySeparator)), state, cache, redirectedReference);
     }
     function loadModuleFromExports(scope, extensions, subpath, state, cache, redirectedReference) {
-        if (!scope.packageJsonContent.exports) {
+        if (!scope.contents.packageJsonContent.exports) {
             return undefined;
         }
         if (subpath === ".") {
             var mainExport = void 0;
-            if (typeof scope.packageJsonContent.exports === "string" || Array.isArray(scope.packageJsonContent.exports) || (typeof scope.packageJsonContent.exports === "object" && noKeyStartsWithDot(scope.packageJsonContent.exports))) {
-                mainExport = scope.packageJsonContent.exports;
+            if (typeof scope.contents.packageJsonContent.exports === "string" || Array.isArray(scope.contents.packageJsonContent.exports) || (typeof scope.contents.packageJsonContent.exports === "object" && noKeyStartsWithDot(scope.contents.packageJsonContent.exports))) {
+                mainExport = scope.contents.packageJsonContent.exports;
             }
-            else if (ts.hasProperty(scope.packageJsonContent.exports, ".")) {
-                mainExport = scope.packageJsonContent.exports["."];
+            else if (ts.hasProperty(scope.contents.packageJsonContent.exports, ".")) {
+                mainExport = scope.contents.packageJsonContent.exports["."];
             }
             if (mainExport) {
                 var loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, subpath, scope, /*isImports*/ false);
                 return loadModuleFromTargetImportOrExport(mainExport, "", /*pattern*/ false);
             }
         }
-        else if (allKeysStartWithDot(scope.packageJsonContent.exports)) {
-            if (typeof scope.packageJsonContent.exports !== "object") {
+        else if (allKeysStartWithDot(scope.contents.packageJsonContent.exports)) {
+            if (typeof scope.contents.packageJsonContent.exports !== "object") {
                 if (state.traceEnabled) {
                     trace(state.host, ts.Diagnostics.Export_specifier_0_does_not_exist_in_package_json_scope_at_path_1, subpath, scope.packageDirectory);
                 }
                 return toSearchResult(/*value*/ undefined);
             }
-            var result = loadModuleFromImportsOrExports(extensions, state, cache, redirectedReference, subpath, scope.packageJsonContent.exports, scope, /*isImports*/ false);
+            var result = loadModuleFromImportsOrExports(extensions, state, cache, redirectedReference, subpath, scope.contents.packageJsonContent.exports, scope, /*isImports*/ false);
             if (result) {
                 return result;
             }
@@ -44460,8 +44462,7 @@ var ts;
             }
             return toSearchResult(/*value*/ undefined);
         }
-        var useCaseSensitiveFileNames = typeof state.host.useCaseSensitiveFileNames === "function" ? state.host.useCaseSensitiveFileNames() : state.host.useCaseSensitiveFileNames;
-        var directoryPath = ts.toPath(ts.combinePaths(directory, "dummy"), (_b = (_a = state.host).getCurrentDirectory) === null || _b === void 0 ? void 0 : _b.call(_a), ts.createGetCanonicalFileName(useCaseSensitiveFileNames === undefined ? true : useCaseSensitiveFileNames));
+        var directoryPath = ts.getNormalizedAbsolutePath(ts.combinePaths(directory, "dummy"), (_b = (_a = state.host).getCurrentDirectory) === null || _b === void 0 ? void 0 : _b.call(_a));
         var scope = getPackageScopeForPath(directoryPath, state);
         if (!scope) {
             if (state.traceEnabled) {
@@ -44469,13 +44470,13 @@ var ts;
             }
             return toSearchResult(/*value*/ undefined);
         }
-        if (!scope.packageJsonContent.imports) {
+        if (!scope.contents.packageJsonContent.imports) {
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.package_json_scope_0_has_no_imports_defined, scope.packageDirectory);
             }
             return toSearchResult(/*value*/ undefined);
         }
-        var result = loadModuleFromImportsOrExports(extensions, state, cache, redirectedReference, moduleName, scope.packageJsonContent.imports, scope, /*isImports*/ true);
+        var result = loadModuleFromImportsOrExports(extensions, state, cache, redirectedReference, moduleName, scope.contents.packageJsonContent.imports, scope, /*isImports*/ true);
         if (result) {
             return result;
         }
@@ -44636,7 +44637,7 @@ var ts;
                 var _a, _b;
                 if (path === undefined)
                     return path;
-                return ts.hostGetCanonicalFileName({ useCaseSensitiveFileNames: useCaseSensitiveFileNames })(ts.getNormalizedAbsolutePath(path, (_b = (_a = state.host).getCurrentDirectory) === null || _b === void 0 ? void 0 : _b.call(_a)));
+                return ts.getNormalizedAbsolutePath(path, (_b = (_a = state.host).getCurrentDirectory) === null || _b === void 0 ? void 0 : _b.call(_a));
             }
             function combineDirectoryPath(root, dir) {
                 return ts.ensureTrailingDirectorySeparator(ts.combinePaths(root, dir));
@@ -44656,7 +44657,7 @@ var ts;
                 if ((extensions === Extensions.TypeScript || extensions === Extensions.JavaScript || extensions === Extensions.Json)
                     && (state.compilerOptions.declarationDir || state.compilerOptions.outDir)
                     && finalPath.indexOf("/node_modules/") === -1
-                    && (state.compilerOptions.configFile ? ts.startsWith(toAbsolutePath(state.compilerOptions.configFile.fileName), scope.packageDirectory) : true)) {
+                    && (state.compilerOptions.configFile ? ts.containsPath(scope.packageDirectory, toAbsolutePath(state.compilerOptions.configFile.fileName), !useCaseSensitiveFileNames()) : true)) {
                     // So that all means we'll only try these guesses for files outside `node_modules` in a directory where the `package.json` and `tsconfig.json` are siblings.
                     // Even with all that, we still don't know if the root of the output file structure will be (relative to the package file)
                     // `.`, `./src` or any other deeper directory structure. (If project references are used, it's definitely `.` by fiat, so that should be pretty common.)
@@ -44712,7 +44713,7 @@ var ts;
                         var candidateDirectories = getOutputDirectoriesForBaseDirectory(commonSourceDirGuess);
                         for (var _e = 0, candidateDirectories_1 = candidateDirectories; _e < candidateDirectories_1.length; _e++) {
                             var candidateDir = candidateDirectories_1[_e];
-                            if (ts.startsWith(finalPath, candidateDir)) {
+                            if (ts.containsPath(candidateDir, finalPath, !useCaseSensitiveFileNames())) {
                                 // The matched export is looking up something in either the out declaration or js dir, now map the written path back into the source dir and source extension
                                 var pathFragment = finalPath.slice(candidateDir.length + 1); // +1 to also remove directory seperator
                                 var possibleInputBase = ts.combinePaths(commonSourceDirGuess, pathFragment);
@@ -44820,7 +44821,7 @@ var ts;
                 if (fromFile) {
                     return noPackageId(fromFile);
                 }
-                var fromDirectory = loadNodeModuleFromDirectoryWorker(extensions, candidate, !nodeModulesDirectoryExists, state, packageInfo.packageJsonContent, packageInfo.versionPaths);
+                var fromDirectory = loadNodeModuleFromDirectoryWorker(extensions, candidate, !nodeModulesDirectoryExists, state, packageInfo.contents.packageJsonContent, packageInfo.contents.versionPaths);
                 return withPackageId(packageInfo, fromDirectory);
             }
         }
@@ -44828,14 +44829,14 @@ var ts;
         var loader = function (extensions, candidate, onlyRecordFailures, state) {
             var _a;
             // package exports are higher priority than file/directory lookups (and, if there's exports present, blocks them)
-            if (packageInfo && packageInfo.packageJsonContent.exports && state.features & NodeResolutionFeatures.Exports) {
+            if (packageInfo && packageInfo.contents.packageJsonContent.exports && state.features & NodeResolutionFeatures.Exports) {
                 return (_a = loadModuleFromExports(packageInfo, extensions, ts.combinePaths(".", rest), state, cache, redirectedReference)) === null || _a === void 0 ? void 0 : _a.value;
             }
             var pathAndExtension = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) ||
-                loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.packageJsonContent, packageInfo && packageInfo.versionPaths);
+                loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.contents.packageJsonContent, packageInfo && packageInfo.contents.versionPaths);
             if (!pathAndExtension && packageInfo
                 // eslint-disable-next-line no-null/no-null
-                && (packageInfo.packageJsonContent.exports === undefined || packageInfo.packageJsonContent.exports === null)
+                && (packageInfo.contents.packageJsonContent.exports === undefined || packageInfo.contents.packageJsonContent.exports === null)
                 && state.features & NodeResolutionFeatures.EsmMode) {
                 // EsmMode disables index lookup in `loadNodeModuleFromDirectoryWorker` generally, however non-relative package resolutions still assume
                 // a default `index.js` entrypoint if no `main` or `exports` are present
@@ -44847,12 +44848,12 @@ var ts;
             var packageDirectory = ts.combinePaths(nodeModulesDirectory, packageName);
             // Don't use a "types" or "main" from here because we're not loading the root, but a subdirectory -- just here for the packageId and path mappings.
             packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
-            if (packageInfo && packageInfo.versionPaths) {
+            if (packageInfo && packageInfo.contents.versionPaths) {
                 if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, packageInfo.versionPaths.version, ts.version, rest);
+                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, packageInfo.contents.versionPaths.version, ts.version, rest);
                 }
                 var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
-                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.versionPaths.paths, /*pathPatterns*/ undefined, loader, !packageDirectoryExists, state);
+                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.contents.versionPaths.paths, /*pathPatterns*/ undefined, loader, !packageDirectoryExists, state);
                 if (fromPaths) {
                     return fromPaths.value;
                 }
@@ -49153,6 +49154,7 @@ var ts;
         var wildcardType = createIntrinsicType(1 /* TypeFlags.Any */, "any");
         var errorType = createIntrinsicType(1 /* TypeFlags.Any */, "error");
         var unresolvedType = createIntrinsicType(1 /* TypeFlags.Any */, "unresolved");
+        var nonInferrableAnyType = createIntrinsicType(1 /* TypeFlags.Any */, "any", 65536 /* ObjectFlags.ContainsWideningType */);
         var intrinsicMarkerType = createIntrinsicType(1 /* TypeFlags.Any */, "intrinsic");
         var unknownType = createIntrinsicType(2 /* TypeFlags.Unknown */, "unknown");
         var nonNullUnknownType = createIntrinsicType(2 /* TypeFlags.Unknown */, "unknown");
@@ -50994,41 +50996,61 @@ var ts;
             return typeof file.externalModuleIndicator !== "object" && !resolveExportByName(moduleSymbol, ts.escapeLeadingUnderscores("__esModule"), /*sourceNode*/ undefined, dontResolveAlias);
         }
         function getTargetOfImportClause(node, dontResolveAlias) {
-            var _a;
             var moduleSymbol = resolveExternalModuleName(node, node.parent.moduleSpecifier);
             if (moduleSymbol) {
-                var exportDefaultSymbol = void 0;
-                if (ts.isShorthandAmbientModuleSymbol(moduleSymbol)) {
-                    exportDefaultSymbol = moduleSymbol;
-                }
-                else {
-                    exportDefaultSymbol = resolveExportByName(moduleSymbol, "default" /* InternalSymbolName.Default */, node, dontResolveAlias);
-                }
-                var file = (_a = moduleSymbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isSourceFile);
-                var hasDefaultOnly = isOnlyImportedAsDefault(node.parent.moduleSpecifier);
-                var hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, node.parent.moduleSpecifier);
-                if (!exportDefaultSymbol && !hasSyntheticDefault && !hasDefaultOnly) {
-                    if (hasExportAssignmentSymbol(moduleSymbol)) {
-                        var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015 ? "allowSyntheticDefaultImports" : "esModuleInterop";
-                        var exportEqualsSymbol = moduleSymbol.exports.get("export=" /* InternalSymbolName.ExportEquals */);
-                        var exportAssignment = exportEqualsSymbol.valueDeclaration;
-                        var err = error(node.name, ts.Diagnostics.Module_0_can_only_be_default_imported_using_the_1_flag, symbolToString(moduleSymbol), compilerOptionName);
-                        if (exportAssignment) {
-                            ts.addRelatedInfo(err, ts.createDiagnosticForNode(exportAssignment, ts.Diagnostics.This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag, compilerOptionName));
-                        }
-                    }
-                    else {
-                        reportNonDefaultExport(moduleSymbol, node);
+                return getTargetofModuleDefault(moduleSymbol, node, dontResolveAlias);
+            }
+        }
+        function getTargetofModuleDefault(moduleSymbol, node, dontResolveAlias) {
+            var _a;
+            var exportDefaultSymbol;
+            if (ts.isShorthandAmbientModuleSymbol(moduleSymbol)) {
+                exportDefaultSymbol = moduleSymbol;
+            }
+            else {
+                exportDefaultSymbol = resolveExportByName(moduleSymbol, "default" /* InternalSymbolName.Default */, node, dontResolveAlias);
+            }
+            var file = (_a = moduleSymbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isSourceFile);
+            var specifier = getModuleSpecifierForImportOrExport(node);
+            if (!specifier) {
+                return exportDefaultSymbol;
+            }
+            var hasDefaultOnly = isOnlyImportedAsDefault(specifier);
+            var hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, specifier);
+            if (!exportDefaultSymbol && !hasSyntheticDefault && !hasDefaultOnly) {
+                if (hasExportAssignmentSymbol(moduleSymbol)) {
+                    var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015 ? "allowSyntheticDefaultImports" : "esModuleInterop";
+                    var exportEqualsSymbol = moduleSymbol.exports.get("export=" /* InternalSymbolName.ExportEquals */);
+                    var exportAssignment = exportEqualsSymbol.valueDeclaration;
+                    var err = error(node.name, ts.Diagnostics.Module_0_can_only_be_default_imported_using_the_1_flag, symbolToString(moduleSymbol), compilerOptionName);
+                    if (exportAssignment) {
+                        ts.addRelatedInfo(err, ts.createDiagnosticForNode(exportAssignment, ts.Diagnostics.This_module_is_declared_with_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag, compilerOptionName));
                     }
                 }
-                else if (hasSyntheticDefault || hasDefaultOnly) {
-                    // per emit behavior, a synthetic default overrides a "real" .default member if `__esModule` is not present
-                    var resolved = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias) || resolveSymbol(moduleSymbol, dontResolveAlias);
-                    markSymbolOfAliasDeclarationIfTypeOnly(node, moduleSymbol, resolved, /*overwriteTypeOnly*/ false);
-                    return resolved;
+                else if (ts.isImportClause(node)) {
+                    reportNonDefaultExport(moduleSymbol, node);
                 }
-                markSymbolOfAliasDeclarationIfTypeOnly(node, exportDefaultSymbol, /*finalTarget*/ undefined, /*overwriteTypeOnly*/ false);
-                return exportDefaultSymbol;
+                else {
+                    errorNoModuleMemberSymbol(moduleSymbol, moduleSymbol, node, ts.isImportOrExportSpecifier(node) && node.propertyName || node.name);
+                }
+            }
+            else if (hasSyntheticDefault || hasDefaultOnly) {
+                // per emit behavior, a synthetic default overrides a "real" .default member if `__esModule` is not present
+                var resolved = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias) || resolveSymbol(moduleSymbol, dontResolveAlias);
+                markSymbolOfAliasDeclarationIfTypeOnly(node, moduleSymbol, resolved, /*overwriteTypeOnly*/ false);
+                return resolved;
+            }
+            markSymbolOfAliasDeclarationIfTypeOnly(node, exportDefaultSymbol, /*finalTarget*/ undefined, /*overwriteTypeOnly*/ false);
+            return exportDefaultSymbol;
+        }
+        function getModuleSpecifierForImportOrExport(node) {
+            switch (node.kind) {
+                case 267 /* SyntaxKind.ImportClause */: return node.parent.moduleSpecifier;
+                case 265 /* SyntaxKind.ImportEqualsDeclaration */: return ts.isExternalModuleReference(node.moduleReference) ? node.moduleReference.expression : undefined;
+                case 268 /* SyntaxKind.NamespaceImport */: return node.parent.parent.moduleSpecifier;
+                case 270 /* SyntaxKind.ImportSpecifier */: return node.parent.parent.parent.moduleSpecifier;
+                case 275 /* SyntaxKind.ExportSpecifier */: return node.parent.parent.moduleSpecifier;
+                default: return ts.Debug.assertNever(node);
             }
         }
         function reportNonDefaultExport(moduleSymbol, node) {
@@ -51118,7 +51140,7 @@ var ts;
             }
         }
         function getExternalModuleMember(node, specifier, dontResolveAlias) {
-            var _a, _b;
+            var _a;
             if (dontResolveAlias === void 0) { dontResolveAlias = false; }
             var moduleSpecifier = ts.getExternalModuleRequireArgument(node) || node.moduleSpecifier;
             var moduleSymbol = resolveExternalModuleName(node, moduleSpecifier); // TODO: GH#18217
@@ -51154,29 +51176,33 @@ var ts;
                         combineValueAndTypeSymbols(symbolFromVariable, symbolFromModule) :
                         symbolFromModule || symbolFromVariable;
                     if (!symbol) {
-                        var moduleName = getFullyQualifiedName(moduleSymbol, node);
-                        var declarationName = ts.declarationNameToString(name);
-                        var suggestion = getSuggestedSymbolForNonexistentModule(name, targetSymbol);
-                        if (suggestion !== undefined) {
-                            var suggestionName = symbolToString(suggestion);
-                            var diagnostic = error(name, ts.Diagnostics._0_has_no_exported_member_named_1_Did_you_mean_2, moduleName, declarationName, suggestionName);
-                            if (suggestion.valueDeclaration) {
-                                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
-                            }
-                        }
-                        else {
-                            if ((_b = moduleSymbol.exports) === null || _b === void 0 ? void 0 : _b.has("default" /* InternalSymbolName.Default */)) {
-                                error(name, ts.Diagnostics.Module_0_has_no_exported_member_1_Did_you_mean_to_use_import_1_from_0_instead, moduleName, declarationName);
-                            }
-                            else {
-                                reportNonExportedMember(node, name, declarationName, moduleSymbol, moduleName);
-                            }
-                        }
+                        errorNoModuleMemberSymbol(moduleSymbol, targetSymbol, node, name);
                     }
                     return symbol;
                 }
             }
         }
+        function errorNoModuleMemberSymbol(moduleSymbol, targetSymbol, node, name) {
+            var _a;
+            var moduleName = getFullyQualifiedName(moduleSymbol, node);
+            var declarationName = ts.declarationNameToString(name);
+            var suggestion = getSuggestedSymbolForNonexistentModule(name, targetSymbol);
+            if (suggestion !== undefined) {
+                var suggestionName = symbolToString(suggestion);
+                var diagnostic = error(name, ts.Diagnostics._0_has_no_exported_member_named_1_Did_you_mean_2, moduleName, declarationName, suggestionName);
+                if (suggestion.valueDeclaration) {
+                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
+                }
+            }
+            else {
+                if ((_a = moduleSymbol.exports) === null || _a === void 0 ? void 0 : _a.has("default" /* InternalSymbolName.Default */)) {
+                    error(name, ts.Diagnostics.Module_0_has_no_exported_member_1_Did_you_mean_to_use_import_1_from_0_instead, moduleName, declarationName);
+                }
+                else {
+                    reportNonExportedMember(node, name, declarationName, moduleSymbol, moduleName);
+                }
+            }
+        }
         function reportNonExportedMember(node, name, declarationName, moduleSymbol, moduleName) {
             var _a, _b;
             var localSymbol = (_b = (_a = moduleSymbol.valueDeclaration) === null || _a === void 0 ? void 0 : _a.locals) === null || _b === void 0 ? void 0 : _b.get(name.escapedText);
@@ -51222,6 +51248,13 @@ var ts;
             }
         }
         function getTargetOfImportSpecifier(node, dontResolveAlias) {
+            if (ts.isImportSpecifier(node) && ts.idText(node.propertyName || node.name) === "default" /* InternalSymbolName.Default */) {
+                var specifier = getModuleSpecifierForImportOrExport(node);
+                var moduleSymbol = specifier && resolveExternalModuleName(node, specifier);
+                if (moduleSymbol) {
+                    return getTargetofModuleDefault(moduleSymbol, node, dontResolveAlias);
+                }
+            }
             var root = ts.isBindingElement(node) ? ts.getRootDeclaration(node) : node.parent.parent.parent;
             var commonJSPropertyAccess = getCommonJSPropertyAccess(root);
             var resolved = getExternalModuleMember(root, commonJSPropertyAccess || node, dontResolveAlias);
@@ -51243,6 +51276,13 @@ var ts;
             return resolved;
         }
         function getTargetOfExportSpecifier(node, meaning, dontResolveAlias) {
+            if (ts.idText(node.propertyName || node.name) === "default" /* InternalSymbolName.Default */) {
+                var specifier = getModuleSpecifierForImportOrExport(node);
+                var moduleSymbol = specifier && resolveExternalModuleName(node, specifier);
+                if (moduleSymbol) {
+                    return getTargetofModuleDefault(moduleSymbol, node, !!dontResolveAlias);
+                }
+            }
             var resolved = node.parent.parent.moduleSpecifier ?
                 getExternalModuleMember(node.parent.parent, node, dontResolveAlias) :
                 resolveEntityName(node.propertyName || node.name, meaning, /*ignoreErrors*/ false, dontResolveAlias);
@@ -51716,7 +51756,7 @@ var ts;
                                 if (ext === ".ts" /* Extension.Ts */ || ext === ".js" /* Extension.Js */ || ext === ".tsx" /* Extension.Tsx */ || ext === ".jsx" /* Extension.Jsx */) {
                                     var scope = currentSourceFile.packageJsonScope;
                                     var targetExt = ext === ".ts" /* Extension.Ts */ ? ".mts" /* Extension.Mts */ : ext === ".js" /* Extension.Js */ ? ".mjs" /* Extension.Mjs */ : undefined;
-                                    if (scope && !scope.packageJsonContent.type) {
+                                    if (scope && !scope.contents.packageJsonContent.type) {
                                         if (targetExt) {
                                             diagnosticDetails = ts.chainDiagnosticMessages(
                                             /*details*/ undefined, ts.Diagnostics.To_convert_this_file_to_an_ECMAScript_module_change_its_file_extension_to_0_or_add_the_field_type_Colon_module_to_1, targetExt, ts.combinePaths(scope.packageDirectory, "package.json"));
@@ -53944,22 +53984,15 @@ var ts;
                 context.approximateLength += ts.symbolName(parameterSymbol).length + 3;
                 return parameterNode;
                 function cloneBindingName(node) {
-                    return elideInitializerAndPropertyRenamingAndSetEmitFlags(node);
-                    function elideInitializerAndPropertyRenamingAndSetEmitFlags(node) {
+                    return elideInitializerAndSetEmitFlags(node);
+                    function elideInitializerAndSetEmitFlags(node) {
                         if (context.tracker.trackSymbol && ts.isComputedPropertyName(node) && isLateBindableName(node)) {
                             trackComputedName(node.expression, context.enclosingDeclaration, context);
                         }
-                        var visited = ts.visitEachChild(node, elideInitializerAndPropertyRenamingAndSetEmitFlags, ts.nullTransformationContext, /*nodesVisitor*/ undefined, elideInitializerAndPropertyRenamingAndSetEmitFlags);
+                        var visited = ts.visitEachChild(node, elideInitializerAndSetEmitFlags, ts.nullTransformationContext, /*nodesVisitor*/ undefined, elideInitializerAndSetEmitFlags);
                         if (ts.isBindingElement(visited)) {
-                            if (visited.propertyName && ts.isIdentifier(visited.propertyName) && ts.isIdentifier(visited.name)) {
-                                visited = ts.factory.updateBindingElement(visited, visited.dotDotDotToken, 
-                                /* propertyName*/ undefined, visited.propertyName, 
-                                /*initializer*/ undefined);
-                            }
-                            else {
-                                visited = ts.factory.updateBindingElement(visited, visited.dotDotDotToken, visited.propertyName, visited.name, 
-                                /*initializer*/ undefined);
-                            }
+                            visited = ts.factory.updateBindingElement(visited, visited.dotDotDotToken, visited.propertyName, visited.name, 
+                            /*initializer*/ undefined);
                         }
                         if (!ts.nodeIsSynthesized(visited)) {
                             visited = ts.factory.cloneNode(visited);
@@ -56954,7 +56987,11 @@ var ts;
             if (reportErrors && !declarationBelongsToPrivateAmbientMember(element)) {
                 reportImplicitAny(element, anyType);
             }
-            return anyType;
+            // When we're including the pattern in the type (an indication we're obtaining a contextual type), we
+            // use a non-inferrable any type. Inference will never directly infer this type, but it is possible
+            // to infer a type that contains it, e.g. for a binding pattern like [foo] or { foo }. In such cases,
+            // widening of the binding pattern type substitutes a regular any for the non-inferrable any.
+            return includePatternInType ? nonInferrableAnyType : anyType;
         }
         // Return the type implied by an object binding pattern
         function getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors) {
@@ -59055,6 +59092,12 @@ var ts;
                 return mapType(type, getLowerBoundOfKeyType);
             }
             if (type.flags & 2097152 /* TypeFlags.Intersection */) {
+                // Similarly to getTypeFromIntersectionTypeNode, we preserve the special string & {}, number & {},
+                // and bigint & {} intersections that are used to prevent subtype reduction in union types.
+                var types = type.types;
+                if (types.length === 2 && !!(types[0].flags & (4 /* TypeFlags.String */ | 8 /* TypeFlags.Number */ | 64 /* TypeFlags.BigInt */)) && types[1] === emptyTypeLiteralType) {
+                    return type;
+                }
                 return getIntersectionType(ts.sameMap(type.types, getLowerBoundOfKeyType));
             }
             return type;
@@ -62193,7 +62236,7 @@ var ts;
                 return includes & 8388608 /* TypeFlags.IncludesWildcard */ ? wildcardType : anyType;
             }
             if (!strictNullChecks && includes & 98304 /* TypeFlags.Nullable */) {
-                return includes & 32768 /* TypeFlags.Undefined */ ? undefinedType : nullType;
+                return includes & 16777216 /* TypeFlags.IncludesEmptyObject */ ? neverType : includes & 32768 /* TypeFlags.Undefined */ ? undefinedType : nullType;
             }
             if (includes & 4 /* TypeFlags.String */ && includes & (128 /* TypeFlags.StringLiteral */ | 134217728 /* TypeFlags.TemplateLiteral */ | 268435456 /* TypeFlags.StringMapping */) ||
                 includes & 8 /* TypeFlags.Number */ && includes & 256 /* TypeFlags.NumberLiteral */ ||
@@ -62883,7 +62926,7 @@ var ts;
             // (T | U)[K] -> T[K] | U[K] (reading)
             // (T | U)[K] -> T[K] & U[K] (writing)
             // (T & U)[K] -> T[K] & U[K]
-            if (objectType.flags & 3145728 /* TypeFlags.UnionOrIntersection */) {
+            if (objectType.flags & 1048576 /* TypeFlags.Union */ || objectType.flags & 2097152 /* TypeFlags.Intersection */ && !shouldDeferIndexType(objectType)) {
                 var types = ts.map(objectType.types, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType), writing); });
                 return objectType.flags & 2097152 /* TypeFlags.Intersection */ || writing ? getIntersectionType(types) : getUnionType(types);
             }
@@ -65291,7 +65334,7 @@ var ts;
             if (reduced !== type) {
                 return reduced;
             }
-            if (type.flags & 2097152 /* TypeFlags.Intersection */) {
+            if (type.flags & 2097152 /* TypeFlags.Intersection */ && ts.some(type.types, isEmptyAnonymousObjectType)) {
                 var normalizedTypes = ts.sameMap(type.types, function (t) { return getNormalizedType(t, writing); });
                 if (normalizedTypes !== type.types) {
                     return getIntersectionType(normalizedTypes);
@@ -66462,7 +66505,7 @@ var ts;
                                     // create a new chain for the constraint error
                                     resetErrorInfo(saveErrorInfo);
                                 }
-                                if (result = isRelatedTo(source, constraint, 2 /* RecursionFlags.Target */, reportErrors)) {
+                                if (result = isRelatedTo(source, constraint, 2 /* RecursionFlags.Target */, reportErrors, /* headMessage */ undefined, intersectionState)) {
                                     return result;
                                 }
                                 // prefer the shorter chain of the constraint comparison chain, and the direct comparison chain
@@ -66554,8 +66597,8 @@ var ts;
                         var skipTrue = !isTypeAssignableTo(getPermissiveInstantiation(c.checkType), getPermissiveInstantiation(c.extendsType));
                         var skipFalse = !skipTrue && isTypeAssignableTo(getRestrictiveInstantiation(c.checkType), getRestrictiveInstantiation(c.extendsType));
                         // TODO: Find a nice way to include potential conditional type breakdowns in error output, if they seem good (they usually don't)
-                        if (result = skipTrue ? -1 /* Ternary.True */ : isRelatedTo(source, getTrueTypeFromConditionalType(c), 2 /* RecursionFlags.Target */, /*reportErrors*/ false)) {
-                            result &= skipFalse ? -1 /* Ternary.True */ : isRelatedTo(source, getFalseTypeFromConditionalType(c), 2 /* RecursionFlags.Target */, /*reportErrors*/ false);
+                        if (result = skipTrue ? -1 /* Ternary.True */ : isRelatedTo(source, getTrueTypeFromConditionalType(c), 2 /* RecursionFlags.Target */, /*reportErrors*/ false, /*headMessage*/ undefined, intersectionState)) {
+                            result &= skipFalse ? -1 /* Ternary.True */ : isRelatedTo(source, getFalseTypeFromConditionalType(c), 2 /* RecursionFlags.Target */, /*reportErrors*/ false, /*headMessage*/ undefined, intersectionState);
                             if (result) {
                                 return result;
                             }
@@ -69242,7 +69285,10 @@ var ts;
                         //
                         // This flag is infectious; if we produce Box<never> (where never is silentNeverType), Box<never> is
                         // also non-inferrable.
-                        if (ts.getObjectFlags(source) & 262144 /* ObjectFlags.NonInferrableType */) {
+                        //
+                        // As a special case, also ignore nonInferrableAnyType, which is a special form of the any type
+                        // used as a stand-in for binding elements when they are being inferred.
+                        if (ts.getObjectFlags(source) & 262144 /* ObjectFlags.NonInferrableType */ || source === nonInferrableAnyType) {
                             return;
                         }
                         if (!inference.isFixed) {
@@ -71584,7 +71630,7 @@ var ts;
                 var narrowedPropType = narrowType(propType);
                 return filterType(type, function (t) {
                     var discriminantType = getTypeOfPropertyOrIndexSignature(t, propName);
-                    return !(narrowedPropType.flags & 131072 /* TypeFlags.Never */) && isTypeComparableTo(narrowedPropType, discriminantType);
+                    return !(narrowedPropType.flags & 131072 /* TypeFlags.Never */) && areTypesComparable(narrowedPropType, discriminantType);
                 });
             }
             function narrowTypeByDiscriminantProperty(type, access, operator, value, assumeTrue) {
@@ -71633,7 +71679,7 @@ var ts;
             }
             function narrowByInKeyword(type, name, assumeTrue) {
                 if (type.flags & 1048576 /* TypeFlags.Union */
-                    || type.flags & 524288 /* TypeFlags.Object */ && declaredType !== type
+                    || type.flags & 524288 /* TypeFlags.Object */ && declaredType !== type && !(declaredType === unknownType && isEmptyAnonymousObjectType(type))
                     || ts.isThisTypeParameter(type)
                     || type.flags & 2097152 /* TypeFlags.Intersection */ && ts.every(type.types, function (t) { return t.symbol !== globalThisSymbol; })) {
                     return filterType(type, function (t) { return isTypePresencePossible(t, name, assumeTrue); });
@@ -71766,14 +71812,18 @@ var ts;
                     assumeTrue = !assumeTrue;
                 }
                 var valueType = getTypeOfExpression(value);
-                if ((type.flags & 2 /* TypeFlags.Unknown */) && assumeTrue && (operator === 36 /* SyntaxKind.EqualsEqualsEqualsToken */ || operator === 37 /* SyntaxKind.ExclamationEqualsEqualsToken */)) {
+                if (((type.flags & 2 /* TypeFlags.Unknown */) || isEmptyAnonymousObjectType(type) && !(valueType.flags & 98304 /* TypeFlags.Nullable */)) &&
+                    assumeTrue &&
+                    (operator === 36 /* SyntaxKind.EqualsEqualsEqualsToken */ || operator === 37 /* SyntaxKind.ExclamationEqualsEqualsToken */)) {
                     if (valueType.flags & (131068 /* TypeFlags.Primitive */ | 67108864 /* TypeFlags.NonPrimitive */)) {
                         return valueType;
                     }
                     if (valueType.flags & 524288 /* TypeFlags.Object */) {
                         return nonPrimitiveType;
                     }
-                    return type;
+                    if (type.flags & 2 /* TypeFlags.Unknown */) {
+                        return type;
+                    }
                 }
                 if (valueType.flags & 98304 /* TypeFlags.Nullable */) {
                     if (!strictNullChecks) {
@@ -72232,7 +72282,9 @@ var ts;
                 !!(type.flags & 465829888 /* TypeFlags.Instantiable */ && getBaseConstraintOrType(type).flags & (98304 /* TypeFlags.Nullable */ | 1048576 /* TypeFlags.Union */));
         }
         function isGenericTypeWithoutNullableConstraint(type) {
-            return !!(type.flags & 465829888 /* TypeFlags.Instantiable */ && !maybeTypeOfKind(getBaseConstraintOrType(type), 98304 /* TypeFlags.Nullable */));
+            return type.flags & 2097152 /* TypeFlags.Intersection */ ?
+                ts.some(type.types, isGenericTypeWithoutNullableConstraint) :
+                !!(type.flags & 465829888 /* TypeFlags.Instantiable */ && !maybeTypeOfKind(getBaseConstraintOrType(type), 98304 /* TypeFlags.Nullable */));
         }
         function hasContextualTypeWithNoGenericTypes(node, checkMode) {
             // Computing the contextual type for a child of a JSX element involves resolving the type of the
@@ -81402,7 +81454,7 @@ var ts;
             checkDecorators(node);
         }
         function getEffectiveTypeArgumentAtIndex(node, typeParameters, index) {
-            if (index < typeParameters.length) {
+            if (node.typeArguments && index < node.typeArguments.length) {
                 return getTypeFromTypeNode(node.typeArguments[index]);
             }
             return getEffectiveTypeArguments(node, typeParameters)[index];
@@ -90181,7 +90233,7 @@ var ts;
                 return grammarErrorOnNode(node, ts.Diagnostics.This_use_of_import_is_invalid_import_calls_can_be_written_but_they_must_have_parentheses_and_cannot_have_type_arguments);
             }
             var nodeArguments = node.arguments;
-            if (moduleKind !== ts.ModuleKind.ESNext && moduleKind !== ts.ModuleKind.NodeNext) {
+            if (moduleKind !== ts.ModuleKind.ESNext && moduleKind !== ts.ModuleKind.NodeNext && moduleKind !== ts.ModuleKind.Node16) {
                 // We are allowed trailing comma after proposal-import-assertions.
                 checkGrammarForDisallowedTrailingComma(nodeArguments);
                 if (nodeArguments.length > 1) {
@@ -117828,7 +117880,7 @@ var ts;
             state.failedLookupLocations = packageJsonLocations;
             state.affectingLocations = packageJsonLocations;
             var packageJsonScope = ts.getPackageScopeForPath(fileName, state);
-            var impliedNodeFormat = (packageJsonScope === null || packageJsonScope === void 0 ? void 0 : packageJsonScope.packageJsonContent.type) === "module" ? ts.ModuleKind.ESNext : ts.ModuleKind.CommonJS;
+            var impliedNodeFormat = (packageJsonScope === null || packageJsonScope === void 0 ? void 0 : packageJsonScope.contents.packageJsonContent.type) === "module" ? ts.ModuleKind.ESNext : ts.ModuleKind.CommonJS;
             return { impliedNodeFormat: impliedNodeFormat, packageJsonLocations: packageJsonLocations, packageJsonScope: packageJsonScope };
         }
     }
@@ -119559,7 +119611,7 @@ var ts;
             // It's a _little odd_ that we can't set `impliedNodeFormat` until the program step - but it's the first and only time we have a resolution cache
             // and a freshly made source file node on hand at the same time, and we need both to set the field. Persisting the resolution cache all the way
             // to the check and emit steps would be bad - so we much prefer detecting and storing the format information on the source file node upfront.
-            var result = getImpliedNodeFormatForFileWorker(toPath(fileName), moduleResolutionCache === null || moduleResolutionCache === void 0 ? void 0 : moduleResolutionCache.getPackageJsonInfoCache(), host, options);
+            var result = getImpliedNodeFormatForFileWorker(ts.getNormalizedAbsolutePath(fileName, currentDirectory), moduleResolutionCache === null || moduleResolutionCache === void 0 ? void 0 : moduleResolutionCache.getPackageJsonInfoCache(), host, options);
             var languageVersion = ts.getEmitScriptTarget(options);
             var setExternalModuleIndicator = ts.getSetExternalModuleIndicator(options);
             return typeof result === "object" ? __assign(__assign({}, result), { languageVersion: languageVersion, setExternalModuleIndicator: setExternalModuleIndicator }) :
@@ -124220,7 +124272,7 @@ var ts;
                 var maybeBlockedByTypesVersions = false;
                 var cachedPackageJson = (_b = (_a = host.getPackageJsonInfoCache) === null || _a === void 0 ? void 0 : _a.call(host)) === null || _b === void 0 ? void 0 : _b.getPackageJsonInfo(packageJsonPath);
                 if (typeof cachedPackageJson === "object" || cachedPackageJson === undefined && host.fileExists(packageJsonPath)) {
-                    var packageJsonContent = (cachedPackageJson === null || cachedPackageJson === void 0 ? void 0 : cachedPackageJson.packageJsonContent) || JSON.parse(host.readFile(packageJsonPath));
+                    var packageJsonContent = (cachedPackageJson === null || cachedPackageJson === void 0 ? void 0 : cachedPackageJson.contents.packageJsonContent) || JSON.parse(host.readFile(packageJsonPath));
                     var importMode = overrideMode || importingSourceFile.impliedNodeFormat;
                     if (ts.getEmitModuleResolutionKind(options) === ts.ModuleResolutionKind.Node16 || ts.getEmitModuleResolutionKind(options) === ts.ModuleResolutionKind.NodeNext) {
                         var conditions = ["node", importMode === ts.ModuleKind.ESNext ? "import" : "require", "types"];
@@ -124582,7 +124634,7 @@ var ts;
                 case ts.ModuleKind.CommonJS:
                     if (file.packageJsonScope) {
                         (result !== null && result !== void 0 ? result : (result = [])).push(ts.chainDiagnosticMessages(
-                        /*details*/ undefined, file.packageJsonScope.packageJsonContent.type ?
+                        /*details*/ undefined, file.packageJsonScope.contents.packageJsonContent.type ?
                             ts.Diagnostics.File_is_CommonJS_module_because_0_has_field_type_whose_value_is_not_module :
                             ts.Diagnostics.File_is_CommonJS_module_because_0_does_not_have_field_type, toFileName(ts.last(file.packageJsonLocations), fileNameConvertor)));
                     }
@@ -126929,9 +126981,7 @@ var ts;
                 }
             }
         }
-        var seenRefs = buildInfoPath ? new ts.Set() : undefined;
         var buildInfoCacheEntry = state.buildInfoCache.get(resolvedPath);
-        seenRefs === null || seenRefs === void 0 ? void 0 : seenRefs.add(resolvedPath);
         /** Inputs are up-to-date, just need either timestamp update or bundle prepend manipulation to make it look up-to-date */
         var pseudoUpToDate = false;
         var usesPrepend = false;
@@ -126946,7 +126996,7 @@ var ts;
                     continue;
                 }
                 // Check if tsbuildinfo path is shared, then we need to rebuild
-                if (buildInfoCacheEntry && hasSameBuildInfo(state, buildInfoCacheEntry, seenRefs, resolvedConfig, resolvedRefPath)) {
+                if (buildInfoCacheEntry && hasSameBuildInfo(state, buildInfoCacheEntry, resolvedRefPath)) {
                     return {
                         type: ts.UpToDateStatusType.OutOfDateWithUpstream,
                         outOfDateOutputFileName: buildInfoPath,
@@ -127004,25 +127054,9 @@ var ts;
             oldestOutputFileName: oldestOutputFileName
         };
     }
-    function hasSameBuildInfo(state, buildInfoCacheEntry, seenRefs, resolvedConfig, resolvedRefPath) {
-        if (seenRefs.has(resolvedRefPath))
-            return false;
-        seenRefs.add(resolvedRefPath);
+    function hasSameBuildInfo(state, buildInfoCacheEntry, resolvedRefPath) {
         var refBuildInfo = state.buildInfoCache.get(resolvedRefPath);
-        if (refBuildInfo.path === buildInfoCacheEntry.path)
-            return true;
-        if (resolvedConfig.projectReferences) {
-            // Check references
-            for (var _i = 0, _a = resolvedConfig.projectReferences; _i < _a.length; _i++) {
-                var ref = _a[_i];
-                var resolvedRef = ts.resolveProjectReferencePath(ref);
-                var resolvedRefPath_1 = toResolvedConfigFilePath(state, resolvedRef);
-                var resolvedConfig_1 = parseConfigFile(state, resolvedRef, resolvedRefPath_1);
-                if (hasSameBuildInfo(state, buildInfoCacheEntry, seenRefs, resolvedConfig_1, resolvedRefPath_1))
-                    return true;
-            }
-        }
-        return false;
+        return refBuildInfo.path === buildInfoCacheEntry.path;
     }
     function getUpToDateStatus(state, project, resolvedPath) {
         if (project === undefined) {
@@ -141336,7 +141370,7 @@ var ts;
             }
             var parent = node.parent;
             var typeChecker = program.getTypeChecker();
-            if (node.kind === 159 /* SyntaxKind.OverrideKeyword */ || (ts.isJSDocOverrideTag(node) && ts.rangeContainsPosition(node.tagName, position))) {
+            if (node.kind === 159 /* SyntaxKind.OverrideKeyword */ || (ts.isIdentifier(node) && ts.isJSDocOverrideTag(parent) && parent.tagName === node)) {
                 return getDefinitionFromOverriddenMember(typeChecker, node) || ts.emptyArray;
             }
             // Labels
@@ -171614,13 +171648,13 @@ var ts;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
-                                ts.Debug.assertIsDefined(host.importServicePlugin);
+                                ts.Debug.assertIsDefined(host.importPlugin);
                                 resolvedPath = ts.combinePaths(initialDir, "node_modules");
                                 log("Dynamically importing ".concat(moduleName, " from ").concat(initialDir, " (resolved to ").concat(resolvedPath, ")"));
                                 _a.label = 1;
                             case 1:
                                 _a.trys.push([1, 3, , 4]);
-                                return [4 /*yield*/, host.importServicePlugin(resolvedPath, moduleName)];
+                                return [4 /*yield*/, host.importPlugin(resolvedPath, moduleName)];
                             case 2:
                                 result = _a.sent();
                                 return [3 /*break*/, 4];
@@ -172699,7 +172733,7 @@ var ts;
             };
             Project.prototype.enableGlobalPlugins = function (options, pluginConfigOverrides) {
                 var host = this.projectService.host;
-                if (!host.require && !host.importServicePlugin) {
+                if (!host.require && !host.importPlugin) {
                     this.projectService.logger.info("Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded");
                     return;
                 }
@@ -172756,7 +172790,7 @@ var ts;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
-                                ts.Debug.assertIsDefined(this.projectService.host.importServicePlugin);
+                                ts.Debug.assertIsDefined(this.projectService.host.importPlugin);
                                 log = function (message) { return _this.projectService.logger.info(message); };
                                 logError = function (message) {
                                     (errorLogs !== null && errorLogs !== void 0 ? errorLogs : (errorLogs = [])).push(message);
@@ -173457,7 +173491,7 @@ var ts;
             /*@internal*/
             ConfiguredProject.prototype.enablePluginsWithOptions = function (options, pluginConfigOverrides) {
                 var host = this.projectService.host;
-                if (!host.require && !host.importServicePlugin) {
+                if (!host.require && !host.importPlugin) {
                     this.projectService.logger.info("Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded");
                     return;
                 }
@@ -176901,7 +176935,7 @@ var ts;
             /*@internal*/
             ProjectService.prototype.requestEnablePlugin = function (project, pluginConfigEntry, searchPaths, pluginConfigOverrides) {
                 var _a;
-                if (!this.host.importServicePlugin && !this.host.require) {
+                if (!this.host.importPlugin && !this.host.require) {
                     this.logger.info("Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded");
                     return;
                 }
@@ -176911,7 +176945,7 @@ var ts;
                     return;
                 }
                 // If the host supports dynamic import, begin enabling the plugin asynchronously.
-                if (this.host.importServicePlugin) {
+                if (this.host.importPlugin) {
                     var importPromise = project.beginEnablePluginAsync(pluginConfigEntry, searchPaths, pluginConfigOverrides);
                     (_a = this.pendingPluginEnablements) !== null && _a !== void 0 ? _a : (this.pendingPluginEnablements = new ts.Map());
                     var promises = this.pendingPluginEnablements.get(project);
@@ -178816,7 +178850,7 @@ var ts;
                         var packageDirectory = fileName.substring(0, nodeModulesPathParts.packageRootIndex);
                         var packageJsonCache = (_a = project.getModuleResolutionCache()) === null || _a === void 0 ? void 0 : _a.getPackageJsonInfoCache();
                         var compilerOptions = project.getCompilationSettings();
-                        var packageJson = ts.getPackageScopeForPath(project.toPath(packageDirectory + "/package.json"), ts.getTemporaryModuleResolutionState(packageJsonCache, project, compilerOptions));
+                        var packageJson = ts.getPackageScopeForPath(ts.getNormalizedAbsolutePath(packageDirectory + "/package.json", project.getCurrentDirectory()), ts.getTemporaryModuleResolutionState(packageJsonCache, project, compilerOptions));
                         if (!packageJson)
                             return undefined;
                         // Use fake options instead of actual compiler options to avoid following export map if the project uses node16 or nodenext -
@@ -181210,7 +181244,7 @@ var ts;
                 setImmediate: function (x) { return setTimeout(x, 0); },
                 clearImmediate: function (handle) { return clearTimeout(handle); },
                 /* eslint-enable no-restricted-globals */
-                importServicePlugin: function (initialDir, moduleName) { return __awaiter(_this, void 0, void 0, function () {
+                importPlugin: function (initialDir, moduleName) { return __awaiter(_this, void 0, void 0, function () {
                     var packageRoot, packageJson, packageJsonResponse, e_1, browser, scriptPath, module_1, e_2;
                     return __generator(this, function (_a) {
                         switch (_a.label) {