typescript 4.9.0-dev.20220921 → 4.9.0-dev.20220923

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 = "".concat(ts.versionMajorMinor, ".0-dev.20220921");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220923");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -45253,6 +45253,7 @@ var ts;
         }
     }
     function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesDirectory, nodeModulesDirectoryExists, state, cache, redirectedReference) {
+        var _a;
         var candidate = ts.normalizePath(ts.combinePaths(nodeModulesDirectory, moduleName));
         // First look for a nested package.json, as in `node_modules/foo/bar/package.json`.
         var packageInfo = getPackageJsonInfo(candidate, !nodeModulesDirectoryExists, state);
@@ -45267,13 +45268,7 @@ var ts;
                 return withPackageId(packageInfo, fromDirectory);
             }
         }
-        var _a = parsePackageName(moduleName), packageName = _a.packageName, rest = _a.rest;
         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.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.contents.packageJsonContent, packageInfo && packageInfo.contents.versionPaths);
             if (!pathAndExtension && packageInfo
@@ -45286,19 +45281,24 @@ var ts;
             }
             return withPackageId(packageInfo, pathAndExtension);
         };
-        if (rest !== "") { // If "rest" is empty, we just did this search above.
-            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.
+        var _b = parsePackageName(moduleName), packageName = _b.packageName, rest = _b.rest;
+        var packageDirectory = ts.combinePaths(nodeModulesDirectory, packageName);
+        if (rest !== "") {
+            // Previous `packageInfo` may have been from a nested package.json; ensure we have the one from the package root now.
             packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
-            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.contents.versionPaths.version, ts.version, rest);
-                }
-                var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
-                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.contents.versionPaths.paths, /*pathPatterns*/ undefined, loader, !packageDirectoryExists, state);
-                if (fromPaths) {
-                    return fromPaths.value;
-                }
+        }
+        // package exports are higher priority than file/directory/typesVersions lookups and (and, if there's exports present, blocks them)
+        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;
+        }
+        if (rest !== "" && 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.contents.versionPaths.version, ts.version, rest);
+            }
+            var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
+            var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.contents.versionPaths.paths, /*pathPatterns*/ undefined, loader, !packageDirectoryExists, state);
+            if (fromPaths) {
+                return fromPaths.value;
             }
         }
         return loader(extensions, candidate, !nodeModulesDirectoryExists, state);
@@ -55479,6 +55479,7 @@ var ts;
                         && symbol.escapedName !== "export=" /* InternalSymbolName.ExportEquals */
                         && !(symbol.flags & 4194304 /* SymbolFlags.Prototype */)
                         && !(symbol.flags & 32 /* SymbolFlags.Class */)
+                        && !(symbol.flags & 8192 /* SymbolFlags.Method */)
                         && !isConstMergedWithNSPrintableAsSignatureMerge) {
                         if (propertyAsAlias) {
                             var createdExport = serializeMaybeAliasAssignment(symbol);
@@ -115413,6 +115414,7 @@ var ts;
             writeTrailingSemicolon();
         }
         function emitExportDeclaration(node) {
+            emitModifiers(node, node.modifiers);
             var nextPos = emitTokenWithComment(93 /* SyntaxKind.ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.isTypeOnly) {
@@ -118838,7 +118840,7 @@ var ts;
      * Determines if program structure is upto date or needs to be recreated
      */
     /* @internal */
-    function isProgramUptoDate(program, rootFileNames, newOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences) {
+    function isProgramUptoDate(program, rootFileNames, newOptions, getSourceVersion, fileExists, hasInvalidatedResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences) {
         // If we haven't created a program yet or have changed automatic type directives, then it is not up-to-date
         if (!program || (hasChangedAutomaticTypeDirectiveNames === null || hasChangedAutomaticTypeDirectiveNames === void 0 ? void 0 : hasChangedAutomaticTypeDirectiveNames()))
             return false;
@@ -118866,7 +118868,7 @@ var ts;
         return true;
         function sourceFileNotUptoDate(sourceFile) {
             return !sourceFileVersionUptoDate(sourceFile) ||
-                hasInvalidatedResolution(sourceFile.path);
+                hasInvalidatedResolutions(sourceFile.path);
         }
         function sourceFileVersionUptoDate(sourceFile) {
             return sourceFile.version === getSourceVersion(sourceFile.resolvedPath, sourceFile.fileName);
@@ -119112,7 +119114,7 @@ var ts;
         var moduleResolutionCache;
         var typeReferenceDirectiveResolutionCache;
         var actualResolveModuleNamesWorker;
-        var hasInvalidatedResolution = host.hasInvalidatedResolution || ts.returnFalse;
+        var hasInvalidatedResolutions = host.hasInvalidatedResolutions || ts.returnFalse;
         if (host.resolveModuleNames) {
             actualResolveModuleNamesWorker = function (moduleNames, containingFile, containingFileName, reusedNames, redirectedReference) { return host.resolveModuleNames(ts.Debug.checkEachDefined(moduleNames), containingFileName, reusedNames, redirectedReference, options, containingFile).map(function (resolved) {
                 // An older host may have omitted extension, in which case we should infer it from the file extension of resolvedFileName.
@@ -119559,7 +119561,7 @@ var ts;
             for (var i = 0; i < moduleNames.length; i++) {
                 var moduleName = moduleNames[i];
                 // If the source file is unchanged and doesnt have invalidated resolution, reuse the module resolutions
-                if (file === oldSourceFile && !hasInvalidatedResolution(oldSourceFile.path)) {
+                if (file === oldSourceFile && !hasInvalidatedResolutions(oldSourceFile.path)) {
                     var oldResolvedModule = ts.getResolvedModule(oldSourceFile, moduleName, getModeForResolutionAtIndex(oldSourceFile, i));
                     if (oldResolvedModule) {
                         if (ts.isTraceEnabled(options, host)) {
@@ -119795,7 +119797,7 @@ var ts;
                     // tentatively approve the file
                     modifiedSourceFiles.push({ oldFile: oldSourceFile, newFile: newSourceFile });
                 }
-                else if (hasInvalidatedResolution(oldSourceFile.path)) {
+                else if (hasInvalidatedResolutions(oldSourceFile.path)) {
                     // 'module/types' references could have changed
                     structureIsReused = 1 /* StructureIsReused.SafeModules */;
                     // add file to the modified list so that we will resolve it later
@@ -123841,7 +123843,7 @@ var ts;
             invalidateResolutionOfFile: invalidateResolutionOfFile,
             invalidateResolutionsOfFailedLookupLocations: invalidateResolutionsOfFailedLookupLocations,
             setFilesWithInvalidatedNonRelativeUnresolvedImports: setFilesWithInvalidatedNonRelativeUnresolvedImports,
-            createHasInvalidatedResolution: createHasInvalidatedResolution,
+            createHasInvalidatedResolutions: createHasInvalidatedResolutions,
             isFileWithInvalidatedNonRelativeUnresolvedImports: isFileWithInvalidatedNonRelativeUnresolvedImports,
             updateTypeRootsWatch: updateTypeRootsWatch,
             closeTypeRootsWatch: closeTypeRootsWatch,
@@ -123896,17 +123898,13 @@ var ts;
             var value = filesWithInvalidatedNonRelativeUnresolvedImports.get(path);
             return !!value && !!value.length;
         }
-        function createHasInvalidatedResolution(forceAllFilesAsInvalidated) {
+        function createHasInvalidatedResolutions(customHasInvalidatedResolutions) {
             // Ensure pending resolutions are applied
             invalidateResolutionsOfFailedLookupLocations();
-            if (forceAllFilesAsInvalidated) {
-                // Any file asked would have invalidated resolution
-                filesWithInvalidatedResolutions = undefined;
-                return ts.returnTrue;
-            }
             var collected = filesWithInvalidatedResolutions;
             filesWithInvalidatedResolutions = undefined;
-            return function (path) { return (!!collected && collected.has(path)) ||
+            return function (path) { return customHasInvalidatedResolutions(path) ||
+                !!(collected === null || collected === void 0 ? void 0 : collected.has(path)) ||
                 isFileWithInvalidatedNonRelativeUnresolvedImports(path); };
         }
         function startCachingPerDirectoryResolution() {
@@ -126286,6 +126284,10 @@ var ts;
             ts.maybeBind(host, host.getModuleResolutionCache) :
             (function () { return resolutionCache.getModuleResolutionCache(); });
         var userProvidedResolution = !!host.resolveModuleNames || !!host.resolveTypeReferenceDirectives;
+        // All resolutions are invalid if user provided resolutions and didnt supply hasInvalidatedResolutions
+        var customHasInvalidatedResolutions = userProvidedResolution ?
+            ts.maybeBind(host, host.hasInvalidatedResolutions) || ts.returnTrue :
+            ts.returnFalse;
         builderProgram = readBuilderProgram(compilerOptions, compilerHost);
         synchronizeProgram();
         // Update the wild card directory watch
@@ -126351,10 +126353,9 @@ var ts;
                     resolutionCache.clear();
                 }
             }
-            // All resolutions are invalid if user provided resolutions
-            var hasInvalidatedResolution = resolutionCache.createHasInvalidatedResolution(userProvidedResolution);
+            var hasInvalidatedResolutions = resolutionCache.createHasInvalidatedResolutions(customHasInvalidatedResolutions);
             var _a = ts.changeCompilerHostLikeToUseCache(compilerHost, toPath), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile;
-            if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, function (fileName) { return compilerHost.fileExists(fileName); }, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
+            if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, function (fileName) { return compilerHost.fileExists(fileName); }, hasInvalidatedResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
                 if (hasChangedConfigFileParsingErrors) {
                     if (reportFileChangeDetectedOnCreateProgram) {
                         reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
@@ -126367,7 +126368,7 @@ var ts;
                 if (reportFileChangeDetectedOnCreateProgram) {
                     reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
                 }
-                createNewProgram(hasInvalidatedResolution);
+                createNewProgram(hasInvalidatedResolutions);
             }
             reportFileChangeDetectedOnCreateProgram = false;
             if (host.afterProgramCreate && program !== builderProgram) {
@@ -126380,7 +126381,7 @@ var ts;
             compilerHost.writeFile = originalWriteFile;
             return builderProgram;
         }
-        function createNewProgram(hasInvalidatedResolution) {
+        function createNewProgram(hasInvalidatedResolutions) {
             // Compile the program
             writeLog("CreatingProgramWith::");
             writeLog("  roots: ".concat(JSON.stringify(rootFileNames)));
@@ -126391,7 +126392,7 @@ var ts;
             hasChangedCompilerOptions = false;
             hasChangedConfigFileParsingErrors = false;
             resolutionCache.startCachingPerDirectoryResolution();
-            compilerHost.hasInvalidatedResolution = hasInvalidatedResolution;
+            compilerHost.hasInvalidatedResolutions = hasInvalidatedResolutions;
             compilerHost.hasChangedAutomaticTypeDirectiveNames = hasChangedAutomaticTypeDirectiveNames;
             var oldProgram = getCurrentProgram();
             builderProgram = createProgram(rootFileNames, compilerOptions, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
@@ -139175,7 +139176,7 @@ var ts;
                                 break;
                             case 202 /* SyntaxKind.ImportType */:
                                 // Only check for typeof import('xyz')
-                                if (direct.isTypeOf && !direct.qualifier && isExported(direct)) {
+                                if (!isAvailableThroughGlobal && direct.isTypeOf && !direct.qualifier && isExported(direct)) {
                                     addIndirectUser(direct.getSourceFile(), /** addTransitiveDependencies */ true);
                                 }
                                 directImports.push(direct);
@@ -146341,6 +146342,10 @@ var ts;
                         pushSelectionCommentRange(comment.pos, comment.end);
                     }
                     if (positionShouldSnapToNode(sourceFile, pos, node)) {
+                        if (ts.isFunctionBody(node)
+                            && ts.isFunctionLikeDeclaration(parentNode) && !ts.positionsAreOnSameLine(node.getStart(sourceFile), node.getEnd(), sourceFile)) {
+                            pushSelectionRange(node.getStart(sourceFile), node.getEnd());
+                        }
                         // 1. Blocks are effectively redundant with SyntaxLists.
                         // 2. TemplateSpans, along with the SyntaxLists containing them, are a somewhat unintuitive grouping
                         //    of things that should be considered independently.
@@ -157953,7 +157958,7 @@ var ts;
                 return { kind: InfoKind.TypeLikeDeclaration, token: token, call: call, modifierFlags: modifierFlags, parentDeclaration: declaration, declSourceFile: declSourceFile, isJSFile: isJSFile };
             }
             var enumDeclaration = ts.find(symbol.declarations, ts.isEnumDeclaration);
-            if (enumDeclaration && !ts.isPrivateIdentifier(token) && !isSourceFileFromLibrary(program, enumDeclaration.getSourceFile())) {
+            if (enumDeclaration && !(leftExpressionType.flags & 1056 /* TypeFlags.EnumLike */) && !ts.isPrivateIdentifier(token) && !isSourceFileFromLibrary(program, enumDeclaration.getSourceFile())) {
                 return { kind: InfoKind.Enum, token: token, parentDeclaration: enumDeclaration };
             }
             return undefined;
@@ -168333,7 +168338,7 @@ var ts;
             var rootFileNames = host.getScriptFileNames().slice();
             // Get a fresh cache of the host information
             var newSettings = host.getCompilationSettings() || getDefaultCompilerOptions();
-            var hasInvalidatedResolution = host.hasInvalidatedResolution || ts.returnFalse;
+            var hasInvalidatedResolutions = host.hasInvalidatedResolutions || ts.returnFalse;
             var hasChangedAutomaticTypeDirectiveNames = ts.maybeBind(host, host.hasChangedAutomaticTypeDirectiveNames);
             var projectReferences = (_b = host.getProjectReferences) === null || _b === void 0 ? void 0 : _b.call(host);
             var parsedCommandLines;
@@ -168364,7 +168369,7 @@ var ts;
                 },
                 onReleaseOldSourceFile: onReleaseOldSourceFile,
                 onReleaseParsedCommandLine: onReleaseParsedCommandLine,
-                hasInvalidatedResolution: hasInvalidatedResolution,
+                hasInvalidatedResolutions: hasInvalidatedResolutions,
                 hasChangedAutomaticTypeDirectiveNames: hasChangedAutomaticTypeDirectiveNames,
                 trace: ts.maybeBind(host, host.trace),
                 resolveModuleNames: ts.maybeBind(host, host.resolveModuleNames),
@@ -168404,7 +168409,7 @@ var ts;
             // as a const variable without downleveling, doesn't crash).
             var documentRegistryBucketKey = documentRegistry.getKeyForCompilationSettings(newSettings);
             // If the program is already up-to-date, we can reuse it
-            if (ts.isProgramUptoDate(program, rootFileNames, newSettings, function (_path, fileName) { return host.getScriptVersion(fileName); }, function (fileName) { return compilerHost.fileExists(fileName); }, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
+            if (ts.isProgramUptoDate(program, rootFileNames, newSettings, function (_path, fileName) { return host.getScriptVersion(fileName); }, function (fileName) { return compilerHost.fileExists(fileName); }, hasInvalidatedResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
                 return;
             }
             // IMPORTANT - It is critical from this moment onward that we do not check
@@ -173698,7 +173703,7 @@ var ts;
                 ts.Debug.assert(!this.isClosed(), "Called update graph worker of closed project");
                 this.writeLog("Starting updateGraphWorker: Project: ".concat(this.getProjectName()));
                 var start = ts.timestamp();
-                this.hasInvalidatedResolution = this.resolutionCache.createHasInvalidatedResolution();
+                this.hasInvalidatedResolutions = this.resolutionCache.createHasInvalidatedResolutions(ts.returnFalse);
                 this.resolutionCache.startCachingPerDirectoryResolution();
                 this.program = this.languageService.getProgram(); // TODO: GH#18217
                 this.dirty = false;

package/lib/tsserverlibrary.d.ts

@@ -3320,6 +3320,8 @@ declare namespace ts {
          */
         resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[] | readonly FileReference[], containingFile: string, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions, containingFileMode?: SourceFile["impliedNodeFormat"] | undefined): (ResolvedTypeReferenceDirective | undefined)[];
         getEnvironmentVariable?(name: string): string | undefined;
+        /** If provided along with custom resolveModuleNames or resolveTypeReferenceDirectives, used to determine if unchanged file path needs to re-resolve modules/type reference directives */
+        hasInvalidatedResolutions?(filePath: Path): boolean;
         createHash?(data: string): string;
         getParsedCommandLine?(fileName: string): ParsedCommandLine | undefined;
     }
@@ -5442,6 +5444,8 @@ declare namespace ts {
         resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames: string[] | undefined, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions, containingSourceFile?: SourceFile): (ResolvedModule | undefined)[];
         /** If provided, used to resolve type reference directives, otherwise typescript's default resolution */
         resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[] | readonly FileReference[], containingFile: string, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions, containingFileMode?: SourceFile["impliedNodeFormat"] | undefined): (ResolvedTypeReferenceDirective | undefined)[];
+        /** If provided along with custom resolveModuleNames or resolveTypeReferenceDirectives, used to determine if unchanged file path needs to re-resolve modules/type reference directives */
+        hasInvalidatedResolutions?(filePath: Path): boolean;
         /**
          * Returns the module resolution cache used by a provided `resolveModuleNames` implementation so that any non-name module resolution operations (eg, package.json lookup) can reuse it
          */

package/lib/tsserverlibrary.js

@@ -108,7 +108,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 = "".concat(ts.versionMajorMinor, ".0-dev.20220921");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220923");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -45252,6 +45252,7 @@ var ts;
         }
     }
     function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesDirectory, nodeModulesDirectoryExists, state, cache, redirectedReference) {
+        var _a;
         var candidate = ts.normalizePath(ts.combinePaths(nodeModulesDirectory, moduleName));
         // First look for a nested package.json, as in `node_modules/foo/bar/package.json`.
         var packageInfo = getPackageJsonInfo(candidate, !nodeModulesDirectoryExists, state);
@@ -45266,13 +45267,7 @@ var ts;
                 return withPackageId(packageInfo, fromDirectory);
             }
         }
-        var _a = parsePackageName(moduleName), packageName = _a.packageName, rest = _a.rest;
         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.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.contents.packageJsonContent, packageInfo && packageInfo.contents.versionPaths);
             if (!pathAndExtension && packageInfo
@@ -45285,19 +45280,24 @@ var ts;
             }
             return withPackageId(packageInfo, pathAndExtension);
         };
-        if (rest !== "") { // If "rest" is empty, we just did this search above.
-            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.
+        var _b = parsePackageName(moduleName), packageName = _b.packageName, rest = _b.rest;
+        var packageDirectory = ts.combinePaths(nodeModulesDirectory, packageName);
+        if (rest !== "") {
+            // Previous `packageInfo` may have been from a nested package.json; ensure we have the one from the package root now.
             packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
-            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.contents.versionPaths.version, ts.version, rest);
-                }
-                var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
-                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.contents.versionPaths.paths, /*pathPatterns*/ undefined, loader, !packageDirectoryExists, state);
-                if (fromPaths) {
-                    return fromPaths.value;
-                }
+        }
+        // package exports are higher priority than file/directory/typesVersions lookups and (and, if there's exports present, blocks them)
+        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;
+        }
+        if (rest !== "" && 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.contents.versionPaths.version, ts.version, rest);
+            }
+            var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
+            var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.contents.versionPaths.paths, /*pathPatterns*/ undefined, loader, !packageDirectoryExists, state);
+            if (fromPaths) {
+                return fromPaths.value;
             }
         }
         return loader(extensions, candidate, !nodeModulesDirectoryExists, state);
@@ -55478,6 +55478,7 @@ var ts;
                         && symbol.escapedName !== "export=" /* InternalSymbolName.ExportEquals */
                         && !(symbol.flags & 4194304 /* SymbolFlags.Prototype */)
                         && !(symbol.flags & 32 /* SymbolFlags.Class */)
+                        && !(symbol.flags & 8192 /* SymbolFlags.Method */)
                         && !isConstMergedWithNSPrintableAsSignatureMerge) {
                         if (propertyAsAlias) {
                             var createdExport = serializeMaybeAliasAssignment(symbol);
@@ -115412,6 +115413,7 @@ var ts;
             writeTrailingSemicolon();
         }
         function emitExportDeclaration(node) {
+            emitModifiers(node, node.modifiers);
             var nextPos = emitTokenWithComment(93 /* SyntaxKind.ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.isTypeOnly) {
@@ -118837,7 +118839,7 @@ var ts;
      * Determines if program structure is upto date or needs to be recreated
      */
     /* @internal */
-    function isProgramUptoDate(program, rootFileNames, newOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences) {
+    function isProgramUptoDate(program, rootFileNames, newOptions, getSourceVersion, fileExists, hasInvalidatedResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences) {
         // If we haven't created a program yet or have changed automatic type directives, then it is not up-to-date
         if (!program || (hasChangedAutomaticTypeDirectiveNames === null || hasChangedAutomaticTypeDirectiveNames === void 0 ? void 0 : hasChangedAutomaticTypeDirectiveNames()))
             return false;
@@ -118865,7 +118867,7 @@ var ts;
         return true;
         function sourceFileNotUptoDate(sourceFile) {
             return !sourceFileVersionUptoDate(sourceFile) ||
-                hasInvalidatedResolution(sourceFile.path);
+                hasInvalidatedResolutions(sourceFile.path);
         }
         function sourceFileVersionUptoDate(sourceFile) {
             return sourceFile.version === getSourceVersion(sourceFile.resolvedPath, sourceFile.fileName);
@@ -119111,7 +119113,7 @@ var ts;
         var moduleResolutionCache;
         var typeReferenceDirectiveResolutionCache;
         var actualResolveModuleNamesWorker;
-        var hasInvalidatedResolution = host.hasInvalidatedResolution || ts.returnFalse;
+        var hasInvalidatedResolutions = host.hasInvalidatedResolutions || ts.returnFalse;
         if (host.resolveModuleNames) {
             actualResolveModuleNamesWorker = function (moduleNames, containingFile, containingFileName, reusedNames, redirectedReference) { return host.resolveModuleNames(ts.Debug.checkEachDefined(moduleNames), containingFileName, reusedNames, redirectedReference, options, containingFile).map(function (resolved) {
                 // An older host may have omitted extension, in which case we should infer it from the file extension of resolvedFileName.
@@ -119558,7 +119560,7 @@ var ts;
             for (var i = 0; i < moduleNames.length; i++) {
                 var moduleName = moduleNames[i];
                 // If the source file is unchanged and doesnt have invalidated resolution, reuse the module resolutions
-                if (file === oldSourceFile && !hasInvalidatedResolution(oldSourceFile.path)) {
+                if (file === oldSourceFile && !hasInvalidatedResolutions(oldSourceFile.path)) {
                     var oldResolvedModule = ts.getResolvedModule(oldSourceFile, moduleName, getModeForResolutionAtIndex(oldSourceFile, i));
                     if (oldResolvedModule) {
                         if (ts.isTraceEnabled(options, host)) {
@@ -119794,7 +119796,7 @@ var ts;
                     // tentatively approve the file
                     modifiedSourceFiles.push({ oldFile: oldSourceFile, newFile: newSourceFile });
                 }
-                else if (hasInvalidatedResolution(oldSourceFile.path)) {
+                else if (hasInvalidatedResolutions(oldSourceFile.path)) {
                     // 'module/types' references could have changed
                     structureIsReused = 1 /* StructureIsReused.SafeModules */;
                     // add file to the modified list so that we will resolve it later
@@ -123840,7 +123842,7 @@ var ts;
             invalidateResolutionOfFile: invalidateResolutionOfFile,
             invalidateResolutionsOfFailedLookupLocations: invalidateResolutionsOfFailedLookupLocations,
             setFilesWithInvalidatedNonRelativeUnresolvedImports: setFilesWithInvalidatedNonRelativeUnresolvedImports,
-            createHasInvalidatedResolution: createHasInvalidatedResolution,
+            createHasInvalidatedResolutions: createHasInvalidatedResolutions,
             isFileWithInvalidatedNonRelativeUnresolvedImports: isFileWithInvalidatedNonRelativeUnresolvedImports,
             updateTypeRootsWatch: updateTypeRootsWatch,
             closeTypeRootsWatch: closeTypeRootsWatch,
@@ -123895,17 +123897,13 @@ var ts;
             var value = filesWithInvalidatedNonRelativeUnresolvedImports.get(path);
             return !!value && !!value.length;
         }
-        function createHasInvalidatedResolution(forceAllFilesAsInvalidated) {
+        function createHasInvalidatedResolutions(customHasInvalidatedResolutions) {
             // Ensure pending resolutions are applied
             invalidateResolutionsOfFailedLookupLocations();
-            if (forceAllFilesAsInvalidated) {
-                // Any file asked would have invalidated resolution
-                filesWithInvalidatedResolutions = undefined;
-                return ts.returnTrue;
-            }
             var collected = filesWithInvalidatedResolutions;
             filesWithInvalidatedResolutions = undefined;
-            return function (path) { return (!!collected && collected.has(path)) ||
+            return function (path) { return customHasInvalidatedResolutions(path) ||
+                !!(collected === null || collected === void 0 ? void 0 : collected.has(path)) ||
                 isFileWithInvalidatedNonRelativeUnresolvedImports(path); };
         }
         function startCachingPerDirectoryResolution() {
@@ -126285,6 +126283,10 @@ var ts;
             ts.maybeBind(host, host.getModuleResolutionCache) :
             (function () { return resolutionCache.getModuleResolutionCache(); });
         var userProvidedResolution = !!host.resolveModuleNames || !!host.resolveTypeReferenceDirectives;
+        // All resolutions are invalid if user provided resolutions and didnt supply hasInvalidatedResolutions
+        var customHasInvalidatedResolutions = userProvidedResolution ?
+            ts.maybeBind(host, host.hasInvalidatedResolutions) || ts.returnTrue :
+            ts.returnFalse;
         builderProgram = readBuilderProgram(compilerOptions, compilerHost);
         synchronizeProgram();
         // Update the wild card directory watch
@@ -126350,10 +126352,9 @@ var ts;
                     resolutionCache.clear();
                 }
             }
-            // All resolutions are invalid if user provided resolutions
-            var hasInvalidatedResolution = resolutionCache.createHasInvalidatedResolution(userProvidedResolution);
+            var hasInvalidatedResolutions = resolutionCache.createHasInvalidatedResolutions(customHasInvalidatedResolutions);
             var _a = ts.changeCompilerHostLikeToUseCache(compilerHost, toPath), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile;
-            if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, function (fileName) { return compilerHost.fileExists(fileName); }, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
+            if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, function (fileName) { return compilerHost.fileExists(fileName); }, hasInvalidatedResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
                 if (hasChangedConfigFileParsingErrors) {
                     if (reportFileChangeDetectedOnCreateProgram) {
                         reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
@@ -126366,7 +126367,7 @@ var ts;
                 if (reportFileChangeDetectedOnCreateProgram) {
                     reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
                 }
-                createNewProgram(hasInvalidatedResolution);
+                createNewProgram(hasInvalidatedResolutions);
             }
             reportFileChangeDetectedOnCreateProgram = false;
             if (host.afterProgramCreate && program !== builderProgram) {
@@ -126379,7 +126380,7 @@ var ts;
             compilerHost.writeFile = originalWriteFile;
             return builderProgram;
         }
-        function createNewProgram(hasInvalidatedResolution) {
+        function createNewProgram(hasInvalidatedResolutions) {
             // Compile the program
             writeLog("CreatingProgramWith::");
             writeLog("  roots: ".concat(JSON.stringify(rootFileNames)));
@@ -126390,7 +126391,7 @@ var ts;
             hasChangedCompilerOptions = false;
             hasChangedConfigFileParsingErrors = false;
             resolutionCache.startCachingPerDirectoryResolution();
-            compilerHost.hasInvalidatedResolution = hasInvalidatedResolution;
+            compilerHost.hasInvalidatedResolutions = hasInvalidatedResolutions;
             compilerHost.hasChangedAutomaticTypeDirectiveNames = hasChangedAutomaticTypeDirectiveNames;
             var oldProgram = getCurrentProgram();
             builderProgram = createProgram(rootFileNames, compilerOptions, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
@@ -139593,7 +139594,7 @@ var ts;
                                 break;
                             case 202 /* SyntaxKind.ImportType */:
                                 // Only check for typeof import('xyz')
-                                if (direct.isTypeOf && !direct.qualifier && isExported(direct)) {
+                                if (!isAvailableThroughGlobal && direct.isTypeOf && !direct.qualifier && isExported(direct)) {
                                     addIndirectUser(direct.getSourceFile(), /** addTransitiveDependencies */ true);
                                 }
                                 directImports.push(direct);
@@ -146759,6 +146760,10 @@ var ts;
                         pushSelectionCommentRange(comment.pos, comment.end);
                     }
                     if (positionShouldSnapToNode(sourceFile, pos, node)) {
+                        if (ts.isFunctionBody(node)
+                            && ts.isFunctionLikeDeclaration(parentNode) && !ts.positionsAreOnSameLine(node.getStart(sourceFile), node.getEnd(), sourceFile)) {
+                            pushSelectionRange(node.getStart(sourceFile), node.getEnd());
+                        }
                         // 1. Blocks are effectively redundant with SyntaxLists.
                         // 2. TemplateSpans, along with the SyntaxLists containing them, are a somewhat unintuitive grouping
                         //    of things that should be considered independently.
@@ -158371,7 +158376,7 @@ var ts;
                 return { kind: InfoKind.TypeLikeDeclaration, token: token, call: call, modifierFlags: modifierFlags, parentDeclaration: declaration, declSourceFile: declSourceFile, isJSFile: isJSFile };
             }
             var enumDeclaration = ts.find(symbol.declarations, ts.isEnumDeclaration);
-            if (enumDeclaration && !ts.isPrivateIdentifier(token) && !isSourceFileFromLibrary(program, enumDeclaration.getSourceFile())) {
+            if (enumDeclaration && !(leftExpressionType.flags & 1056 /* TypeFlags.EnumLike */) && !ts.isPrivateIdentifier(token) && !isSourceFileFromLibrary(program, enumDeclaration.getSourceFile())) {
                 return { kind: InfoKind.Enum, token: token, parentDeclaration: enumDeclaration };
             }
             return undefined;
@@ -168751,7 +168756,7 @@ var ts;
             var rootFileNames = host.getScriptFileNames().slice();
             // Get a fresh cache of the host information
             var newSettings = host.getCompilationSettings() || getDefaultCompilerOptions();
-            var hasInvalidatedResolution = host.hasInvalidatedResolution || ts.returnFalse;
+            var hasInvalidatedResolutions = host.hasInvalidatedResolutions || ts.returnFalse;
             var hasChangedAutomaticTypeDirectiveNames = ts.maybeBind(host, host.hasChangedAutomaticTypeDirectiveNames);
             var projectReferences = (_b = host.getProjectReferences) === null || _b === void 0 ? void 0 : _b.call(host);
             var parsedCommandLines;
@@ -168782,7 +168787,7 @@ var ts;
                 },
                 onReleaseOldSourceFile: onReleaseOldSourceFile,
                 onReleaseParsedCommandLine: onReleaseParsedCommandLine,
-                hasInvalidatedResolution: hasInvalidatedResolution,
+                hasInvalidatedResolutions: hasInvalidatedResolutions,
                 hasChangedAutomaticTypeDirectiveNames: hasChangedAutomaticTypeDirectiveNames,
                 trace: ts.maybeBind(host, host.trace),
                 resolveModuleNames: ts.maybeBind(host, host.resolveModuleNames),
@@ -168822,7 +168827,7 @@ var ts;
             // as a const variable without downleveling, doesn't crash).
             var documentRegistryBucketKey = documentRegistry.getKeyForCompilationSettings(newSettings);
             // If the program is already up-to-date, we can reuse it
-            if (ts.isProgramUptoDate(program, rootFileNames, newSettings, function (_path, fileName) { return host.getScriptVersion(fileName); }, function (fileName) { return compilerHost.fileExists(fileName); }, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
+            if (ts.isProgramUptoDate(program, rootFileNames, newSettings, function (_path, fileName) { return host.getScriptVersion(fileName); }, function (fileName) { return compilerHost.fileExists(fileName); }, hasInvalidatedResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
                 return;
             }
             // IMPORTANT - It is critical from this moment onward that we do not check
@@ -173697,7 +173702,7 @@ var ts;
                 ts.Debug.assert(!this.isClosed(), "Called update graph worker of closed project");
                 this.writeLog("Starting updateGraphWorker: Project: ".concat(this.getProjectName()));
                 var start = ts.timestamp();
-                this.hasInvalidatedResolution = this.resolutionCache.createHasInvalidatedResolution();
+                this.hasInvalidatedResolutions = this.resolutionCache.createHasInvalidatedResolutions(ts.returnFalse);
                 this.resolutionCache.startCachingPerDirectoryResolution();
                 this.program = this.languageService.getProgram(); // TODO: GH#18217
                 this.dirty = false;

package/lib/typescript.d.ts

@@ -3320,6 +3320,8 @@ declare namespace ts {
          */
         resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[] | readonly FileReference[], containingFile: string, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions, containingFileMode?: SourceFile["impliedNodeFormat"] | undefined): (ResolvedTypeReferenceDirective | undefined)[];
         getEnvironmentVariable?(name: string): string | undefined;
+        /** If provided along with custom resolveModuleNames or resolveTypeReferenceDirectives, used to determine if unchanged file path needs to re-resolve modules/type reference directives */
+        hasInvalidatedResolutions?(filePath: Path): boolean;
         createHash?(data: string): string;
         getParsedCommandLine?(fileName: string): ParsedCommandLine | undefined;
     }
@@ -5442,6 +5444,8 @@ declare namespace ts {
         resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames: string[] | undefined, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions, containingSourceFile?: SourceFile): (ResolvedModule | undefined)[];
         /** If provided, used to resolve type reference directives, otherwise typescript's default resolution */
         resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[] | readonly FileReference[], containingFile: string, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions, containingFileMode?: SourceFile["impliedNodeFormat"] | undefined): (ResolvedTypeReferenceDirective | undefined)[];
+        /** If provided along with custom resolveModuleNames or resolveTypeReferenceDirectives, used to determine if unchanged file path needs to re-resolve modules/type reference directives */
+        hasInvalidatedResolutions?(filePath: Path): boolean;
         /**
          * Returns the module resolution cache used by a provided `resolveModuleNames` implementation so that any non-name module resolution operations (eg, package.json lookup) can reuse it
          */