@typescript-deploys/pr-build 5.2.0-pr-54718-7 → 5.2.0-pr-54922-6

package/lib/tsserver.js

@@ -2327,7 +2327,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-insiders.20230630`;
+var version = `${versionMajorMinor}.0-insiders.20230707`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -3839,8 +3839,8 @@ function unorderedRemoveFirstItemWhere(array, predicate) {
   }
   return false;
 }
-function createGetCanonicalFileName(useCaseSensitiveFileNames) {
-  return useCaseSensitiveFileNames ? identity : toFileNameLowerCase;
+function createGetCanonicalFileName(useCaseSensitiveFileNames2) {
+  return useCaseSensitiveFileNames2 ? identity : toFileNameLowerCase;
 }
 function patternText({ prefix, suffix }) {
   return `${prefix}*${suffix}`;
@@ -7677,10 +7677,10 @@ function createDynamicPriorityPollingWatchFile(host) {
     pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === 250 /* Low */ ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingInterval === 250 /* Low */ ? "pollLowPollingIntervalQueue" : "pollPollingIntervalQueue", pollingIntervalQueue(pollingInterval));
   }
 }
-function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames) {
+function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2) {
   const fileWatcherCallbacks = createMultiMap();
   const dirWatchers = /* @__PURE__ */ new Map();
-  const toCanonicalName = createGetCanonicalFileName(useCaseSensitiveFileNames);
+  const toCanonicalName = createGetCanonicalFileName(useCaseSensitiveFileNames2);
   return nonPollingWatchFile;
   function nonPollingWatchFile(fileName, callback, _pollingInterval, fallbackOptions) {
     const filePath = toCanonicalName(fileName);
@@ -7756,8 +7756,8 @@ function createFixedChunkSizePollingWatchFile(host) {
     pollScheduled = host.setTimeout(pollQueue, 2e3 /* High */, "pollQueue");
   }
 }
-function createSingleWatcherPerName(cache, useCaseSensitiveFileNames, name, callback, createWatcher) {
-  const toCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames);
+function createSingleWatcherPerName(cache, useCaseSensitiveFileNames2, name, callback, createWatcher) {
+  const toCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames2);
   const path = toCanonicalFileName(name);
   const existing = cache.get(path);
   if (existing) {
@@ -7809,7 +7809,7 @@ function setSysLog(logger) {
 }
 function createDirectoryWatcherSupportingRecursive({
   watchDirectory,
-  useCaseSensitiveFileNames,
+  useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
   getCurrentDirectory,
   getAccessibleSortedChildDirectories,
   fileSystemEntryExists,
@@ -7821,8 +7821,8 @@ function createDirectoryWatcherSupportingRecursive({
   const callbackCache = createMultiMap();
   const cacheToUpdateChildWatches = /* @__PURE__ */ new Map();
   let timerToUpdateChildWatches;
-  const filePathComparer = getStringComparer(!useCaseSensitiveFileNames);
-  const toCanonicalFilePath = createGetCanonicalFileName(useCaseSensitiveFileNames);
+  const filePathComparer = getStringComparer(!useCaseSensitiveFileNames2);
+  const toCanonicalFilePath = createGetCanonicalFileName(useCaseSensitiveFileNames2);
   return (dirName, callback, recursive, options) => recursive ? createDirectoryWatcher(dirName, options, callback) : watchDirectory(dirName, callback, recursive, options);
   function createDirectoryWatcher(dirName, options, callback) {
     const dirPath = toCanonicalFilePath(dirName);
@@ -7989,12 +7989,12 @@ function createDirectoryWatcherSupportingRecursive({
     }
   }
   function isIgnoredPath(path, options) {
-    return some(ignoredPaths, (searchPath) => isInPath(path, searchPath)) || isIgnoredByWatchOptions(path, options, useCaseSensitiveFileNames, getCurrentDirectory);
+    return some(ignoredPaths, (searchPath) => isInPath(path, searchPath)) || isIgnoredByWatchOptions(path, options, useCaseSensitiveFileNames2, getCurrentDirectory);
   }
   function isInPath(path, searchPath) {
     if (stringContains(path, searchPath))
       return true;
-    if (useCaseSensitiveFileNames)
+    if (useCaseSensitiveFileNames2)
       return false;
     return stringContains(toCanonicalFilePath(path), searchPath);
   }
@@ -8017,14 +8017,14 @@ function createFsWatchCallbackForFileWatcherCallback(fileName, callback, getModi
     }
   };
 }
-function isIgnoredByWatchOptions(pathToCheck, options, useCaseSensitiveFileNames, getCurrentDirectory) {
-  return ((options == null ? void 0 : options.excludeDirectories) || (options == null ? void 0 : options.excludeFiles)) && (matchesExclude(pathToCheck, options == null ? void 0 : options.excludeFiles, useCaseSensitiveFileNames, getCurrentDirectory()) || matchesExclude(pathToCheck, options == null ? void 0 : options.excludeDirectories, useCaseSensitiveFileNames, getCurrentDirectory()));
+function isIgnoredByWatchOptions(pathToCheck, options, useCaseSensitiveFileNames2, getCurrentDirectory) {
+  return ((options == null ? void 0 : options.excludeDirectories) || (options == null ? void 0 : options.excludeFiles)) && (matchesExclude(pathToCheck, options == null ? void 0 : options.excludeFiles, useCaseSensitiveFileNames2, getCurrentDirectory()) || matchesExclude(pathToCheck, options == null ? void 0 : options.excludeDirectories, useCaseSensitiveFileNames2, getCurrentDirectory()));
 }
-function createFsWatchCallbackForDirectoryWatcherCallback(directoryName, callback, options, useCaseSensitiveFileNames, getCurrentDirectory) {
+function createFsWatchCallbackForDirectoryWatcherCallback(directoryName, callback, options, useCaseSensitiveFileNames2, getCurrentDirectory) {
   return (eventName, relativeFileName) => {
     if (eventName === "rename") {
       const fileName = !relativeFileName ? directoryName : normalizePath(combinePaths(directoryName, relativeFileName));
-      if (!relativeFileName || !isIgnoredByWatchOptions(fileName, options, useCaseSensitiveFileNames, getCurrentDirectory)) {
+      if (!relativeFileName || !isIgnoredByWatchOptions(fileName, options, useCaseSensitiveFileNames2, getCurrentDirectory)) {
         callback(fileName);
       }
     }
@@ -8037,7 +8037,7 @@ function createSystemWatchFunctions({
   clearTimeout: clearTimeout2,
   fsWatchWorker,
   fileSystemEntryExists,
-  useCaseSensitiveFileNames,
+  useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
   getCurrentDirectory,
   fsSupportsRecursiveFsWatch,
   getAccessibleSortedChildDirectories,
@@ -8109,7 +8109,7 @@ function createSystemWatchFunctions({
         );
       case 5 /* UseFsEventsOnParentDirectory */:
         if (!nonPollingWatchFile) {
-          nonPollingWatchFile = createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames);
+          nonPollingWatchFile = createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2);
         }
         return nonPollingWatchFile(fileName, callback, pollingInterval, getFallbackOptions(options));
       default:
@@ -8158,7 +8158,7 @@ function createSystemWatchFunctions({
       return fsWatch(
         directoryName,
         1 /* Directory */,
-        createFsWatchCallbackForDirectoryWatcherCallback(directoryName, callback, options, useCaseSensitiveFileNames, getCurrentDirectory),
+        createFsWatchCallbackForDirectoryWatcherCallback(directoryName, callback, options, useCaseSensitiveFileNames2, getCurrentDirectory),
         recursive,
         500 /* Medium */,
         getFallbackOptions(options)
@@ -8166,7 +8166,7 @@ function createSystemWatchFunctions({
     }
     if (!hostRecursiveDirectoryWatcher) {
       hostRecursiveDirectoryWatcher = createDirectoryWatcherSupportingRecursive({
-        useCaseSensitiveFileNames,
+        useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
         getCurrentDirectory,
         fileSystemEntryExists,
         getAccessibleSortedChildDirectories,
@@ -8212,7 +8212,7 @@ function createSystemWatchFunctions({
         return fsWatch(
           directoryName,
           1 /* Directory */,
-          createFsWatchCallbackForDirectoryWatcherCallback(directoryName, callback, options, useCaseSensitiveFileNames, getCurrentDirectory),
+          createFsWatchCallbackForDirectoryWatcherCallback(directoryName, callback, options, useCaseSensitiveFileNames2, getCurrentDirectory),
           recursive,
           500 /* Medium */,
           getFallbackOptions(watchDirectoryOptions)
@@ -8240,7 +8240,7 @@ function createSystemWatchFunctions({
   function pollingWatchFile(fileName, callback, pollingInterval, options) {
     return createSingleWatcherPerName(
       pollingWatches,
-      useCaseSensitiveFileNames,
+      useCaseSensitiveFileNames2,
       fileName,
       callback,
       (cb) => pollingWatchFileWorker(fileName, cb, pollingInterval, options)
@@ -8249,7 +8249,7 @@ function createSystemWatchFunctions({
   function fsWatch(fileOrDirectory, entryKind, callback, recursive, fallbackPollingInterval, fallbackOptions) {
     return createSingleWatcherPerName(
       recursive ? fsWatchesRecursive : fsWatches,
-      useCaseSensitiveFileNames,
+      useCaseSensitiveFileNames2,
       fileOrDirectory,
       callback,
       (cb) => fsWatchHandlingExistenceOnHost(fileOrDirectory, entryKind, cb, recursive, fallbackPollingInterval, fallbackOptions)
@@ -8377,7 +8377,7 @@ var sys = (() => {
     const Buffer2 = require("buffer").Buffer;
     const isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
     const platform = _os.platform();
-    const useCaseSensitiveFileNames = isFileSystemCaseSensitive();
+    const useCaseSensitiveFileNames2 = isFileSystemCaseSensitive();
     const fsRealpath = !!_fs.realpathSync.native ? process.platform === "win32" ? fsRealPathHandlingLongPath : _fs.realpathSync.native : _fs.realpathSync;
     const executingFilePath = __filename.endsWith("sys.js") ? _path.join(_path.dirname(__dirname), "__fake__.js") : __filename;
     const fsSupportsRecursiveFsWatch = process.platform === "win32" || process.platform === "darwin";
@@ -8388,7 +8388,7 @@ var sys = (() => {
       setTimeout,
       clearTimeout,
       fsWatchWorker,
-      useCaseSensitiveFileNames,
+      useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
       getCurrentDirectory,
       fileSystemEntryExists,
       // Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows
@@ -8405,7 +8405,7 @@ var sys = (() => {
     const nodeSystem = {
       args: process.argv.slice(2),
       newLine: _os.EOL,
-      useCaseSensitiveFileNames,
+      useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
       write(s) {
         process.stdout.write(s);
       },
@@ -8534,12 +8534,12 @@ var sys = (() => {
       for (const node of profile.nodes) {
         if (node.callFrame.url) {
           const url = normalizeSlashes(node.callFrame.url);
-          if (containsPath(fileUrlRoot, url, useCaseSensitiveFileNames)) {
+          if (containsPath(fileUrlRoot, url, useCaseSensitiveFileNames2)) {
             node.callFrame.url = getRelativePathToDirectoryOrUrl(
               fileUrlRoot,
               url,
               fileUrlRoot,
-              createGetCanonicalFileName(useCaseSensitiveFileNames),
+              createGetCanonicalFileName(useCaseSensitiveFileNames2),
               /*isAbsolutePathAnUrl*/
               true
             );
@@ -8719,7 +8719,7 @@ var sys = (() => {
       }
     }
     function readDirectory(path, extensions, excludes, includes, depth) {
-      return matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
+      return matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames2, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
     }
     function fileSystemEntryExists(path, entryKind) {
       const originalStackTraceLimit = Error.stackTraceLimit;
@@ -10986,6 +10986,7 @@ var Diagnostics = {
   Parameter_modifiers_can_only_be_used_in_TypeScript_files: diag(8012, 1 /* Error */, "Parameter_modifiers_can_only_be_used_in_TypeScript_files_8012", "Parameter modifiers can only be used in TypeScript files."),
   Non_null_assertions_can_only_be_used_in_TypeScript_files: diag(8013, 1 /* Error */, "Non_null_assertions_can_only_be_used_in_TypeScript_files_8013", "Non-null assertions can only be used in TypeScript files."),
   Type_assertion_expressions_can_only_be_used_in_TypeScript_files: diag(8016, 1 /* Error */, "Type_assertion_expressions_can_only_be_used_in_TypeScript_files_8016", "Type assertion expressions can only be used in TypeScript files."),
+  Signature_declarations_can_only_be_used_in_TypeScript_files: diag(8017, 1 /* Error */, "Signature_declarations_can_only_be_used_in_TypeScript_files_8017", "Signature declarations can only be used in TypeScript files."),
   Report_errors_in_js_files: diag(8019, 3 /* Message */, "Report_errors_in_js_files_8019", "Report errors in .js files."),
   JSDoc_types_can_only_be_used_inside_documentation_comments: diag(8020, 1 /* Error */, "JSDoc_types_can_only_be_used_inside_documentation_comments_8020", "JSDoc types can only be used inside documentation comments."),
   JSDoc_typedef_tag_should_either_have_a_type_annotation_or_be_followed_by_property_or_member_tags: diag(8021, 1 /* Error */, "JSDoc_typedef_tag_should_either_have_a_type_annotation_or_be_followed_by_property_or_member_tags_8021", "JSDoc '@typedef' tag should either have a type annotation or be followed by '@property' or '@member' tags."),
@@ -12114,7 +12115,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
         if (withMinus)
           start3--;
         error2(Diagnostics.Octal_literals_are_not_allowed_Use_the_syntax_0, start3, pos - start3, literal);
-        return { type: 9 /* NumericLiteral */, value: tokenValue };
+        return 9 /* NumericLiteral */;
       }
     } else {
       mainFragment = scanNumberFragment();
@@ -12154,20 +12155,18 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
     }
     if (tokenFlags & 8192 /* ContainsLeadingZero */) {
       error2(Diagnostics.Decimals_with_leading_zeros_are_not_allowed, start3, end2 - start3);
-      return { type: 9 /* NumericLiteral */, value: "" + +result };
+      tokenValue = "" + +result;
+      return 9 /* NumericLiteral */;
     }
     if (decimalFragment !== void 0 || tokenFlags & 16 /* Scientific */) {
       checkForIdentifierStartAfterNumericLiteral(start3, decimalFragment === void 0 && !!(tokenFlags & 16 /* Scientific */));
-      return {
-        type: 9 /* NumericLiteral */,
-        value: "" + +result
-        // if value is not an integer, it can be safely coerced to a number
-      };
+      tokenValue = "" + +result;
+      return 9 /* NumericLiteral */;
     } else {
       tokenValue = result;
       const type = checkBigIntSuffix();
       checkForIdentifierStartAfterNumericLiteral(start3);
-      return { type, value: tokenValue };
+      return type;
     }
   }
   function checkForIdentifierStartAfterNumericLiteral(numericStart, isScientific) {
@@ -12776,7 +12775,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
           return token = 41 /* MinusToken */;
         case 46 /* dot */:
           if (isDigit(text.charCodeAt(pos + 1))) {
-            tokenValue = scanNumber().value;
+            scanNumber();
             return token = 9 /* NumericLiteral */;
           }
           if (text.charCodeAt(pos + 1) === 46 /* dot */ && text.charCodeAt(pos + 2) === 46 /* dot */) {
@@ -12894,8 +12893,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
         case 55 /* _7 */:
         case 56 /* _8 */:
         case 57 /* _9 */:
-          ({ type: token, value: tokenValue } = scanNumber());
-          return token;
+          return token = scanNumber();
         case 58 /* colon */:
           pos++;
           return token = 59 /* ColonToken */;
@@ -20757,7 +20755,7 @@ function getSubPatternFromSpec(spec, basePath, usage, { singleAsteriskRegexFragm
 function replaceWildcardCharacter(match, singleAsteriskRegexFragment) {
   return match === "*" ? singleAsteriskRegexFragment : match === "?" ? "[^/]" : "\\" + match;
 }
-function getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory) {
+function getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames2, currentDirectory) {
   path = normalizePath(path);
   currentDirectory = normalizePath(currentDirectory);
   const absolutePath = combinePaths(currentDirectory, path);
@@ -20766,22 +20764,22 @@ function getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNa
     includeFilePattern: getRegularExpressionForWildcard(includes, absolutePath, "files"),
     includeDirectoryPattern: getRegularExpressionForWildcard(includes, absolutePath, "directories"),
     excludePattern: getRegularExpressionForWildcard(excludes, absolutePath, "exclude"),
-    basePaths: getBasePaths(path, includes, useCaseSensitiveFileNames)
+    basePaths: getBasePaths(path, includes, useCaseSensitiveFileNames2)
   };
 }
-function getRegexFromPattern(pattern, useCaseSensitiveFileNames) {
-  return new RegExp(pattern, useCaseSensitiveFileNames ? "" : "i");
+function getRegexFromPattern(pattern, useCaseSensitiveFileNames2) {
+  return new RegExp(pattern, useCaseSensitiveFileNames2 ? "" : "i");
 }
-function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath) {
+function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames2, currentDirectory, depth, getFileSystemEntries, realpath) {
   path = normalizePath(path);
   currentDirectory = normalizePath(currentDirectory);
-  const patterns = getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory);
-  const includeFileRegexes = patterns.includeFilePatterns && patterns.includeFilePatterns.map((pattern) => getRegexFromPattern(pattern, useCaseSensitiveFileNames));
-  const includeDirectoryRegex = patterns.includeDirectoryPattern && getRegexFromPattern(patterns.includeDirectoryPattern, useCaseSensitiveFileNames);
-  const excludeRegex = patterns.excludePattern && getRegexFromPattern(patterns.excludePattern, useCaseSensitiveFileNames);
+  const patterns = getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames2, currentDirectory);
+  const includeFileRegexes = patterns.includeFilePatterns && patterns.includeFilePatterns.map((pattern) => getRegexFromPattern(pattern, useCaseSensitiveFileNames2));
+  const includeDirectoryRegex = patterns.includeDirectoryPattern && getRegexFromPattern(patterns.includeDirectoryPattern, useCaseSensitiveFileNames2);
+  const excludeRegex = patterns.excludePattern && getRegexFromPattern(patterns.excludePattern, useCaseSensitiveFileNames2);
   const results = includeFileRegexes ? includeFileRegexes.map(() => []) : [[]];
   const visited = /* @__PURE__ */ new Map();
-  const toCanonical = createGetCanonicalFileName(useCaseSensitiveFileNames);
+  const toCanonical = createGetCanonicalFileName(useCaseSensitiveFileNames2);
   for (const basePath of patterns.basePaths) {
     visitDirectory(basePath, combinePaths(currentDirectory, basePath), depth);
   }
@@ -20823,7 +20821,7 @@ function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNa
     }
   }
 }
-function getBasePaths(path, includes, useCaseSensitiveFileNames) {
+function getBasePaths(path, includes, useCaseSensitiveFileNames2) {
   const basePaths = [path];
   if (includes) {
     const includeBasePaths = [];
@@ -20831,9 +20829,9 @@ function getBasePaths(path, includes, useCaseSensitiveFileNames) {
       const absolute = isRootedDiskPath(include) ? include : normalizePath(combinePaths(path, include));
       includeBasePaths.push(getIncludeBasePath(absolute));
     }
-    includeBasePaths.sort(getStringComparer(!useCaseSensitiveFileNames));
+    includeBasePaths.sort(getStringComparer(!useCaseSensitiveFileNames2));
     for (const includeBasePath of includeBasePaths) {
-      if (every(basePaths, (basePath) => !containsPath(basePath, includeBasePath, path, !useCaseSensitiveFileNames))) {
+      if (every(basePaths, (basePath) => !containsPath(basePath, includeBasePath, path, !useCaseSensitiveFileNames2))) {
         basePaths.push(includeBasePath);
       }
     }
@@ -30992,7 +30990,8 @@ var Parser;
     nextToken();
     const statements = parseList(0 /* SourceElements */, parseStatement);
     Debug.assert(token() === 1 /* EndOfFileToken */);
-    const endOfFileToken = addJSDocComment(parseTokenNode());
+    const endHasJSDoc = hasPrecedingJSDocComment();
+    const endOfFileToken = withJSDoc(parseTokenNode(), endHasJSDoc);
     const sourceFile = createSourceFile2(fileName, languageVersion2, scriptKind2, isDeclarationFile, statements, endOfFileToken, sourceFlags, setExternalModuleIndicator2);
     processCommentPragmas(sourceFile, sourceText);
     processPragmasIntoFields(sourceFile, reportPragmaDiagnostic);
@@ -31012,11 +31011,11 @@ var Parser;
       parseDiagnostics.push(createDetachedDiagnostic(fileName, pos, end, diagnostic));
     }
   }
-  function withJSDoc(node, hasJSDoc) {
-    return hasJSDoc ? addJSDocComment(node) : node;
-  }
   let hasDeprecatedTag = false;
-  function addJSDocComment(node) {
+  function withJSDoc(node, hasJSDoc) {
+    if (!hasJSDoc) {
+      return node;
+    }
     Debug.assert(!node.jsDoc);
     const jsDoc = mapDefined(getJSDocCommentRanges(node, sourceText), (comment) => JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos));
     if (jsDoc.length)
@@ -33531,12 +33530,14 @@ var Parser;
       return arrowExpression;
     }
     const pos = getNodePos();
+    const hasJSDoc = hasPrecedingJSDocComment();
     const expr = parseBinaryExpressionOrHigher(0 /* Lowest */);
     if (expr.kind === 80 /* Identifier */ && token() === 39 /* EqualsGreaterThanToken */) {
       return parseSimpleArrowFunctionExpression(
         pos,
         expr,
         allowReturnTypeInArrowFunction,
+        hasJSDoc,
         /*asyncModifier*/
         void 0
       );
@@ -33582,7 +33583,7 @@ var Parser;
       ), pos);
     }
   }
-  function parseSimpleArrowFunctionExpression(pos, identifier, allowReturnTypeInArrowFunction, asyncModifier) {
+  function parseSimpleArrowFunctionExpression(pos, identifier, allowReturnTypeInArrowFunction, hasJSDoc, asyncModifier) {
     Debug.assert(token() === 39 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
     const parameter = factory2.createParameterDeclaration(
       /*modifiers*/
@@ -33615,7 +33616,7 @@ var Parser;
       equalsGreaterThanToken,
       body
     );
-    return addJSDocComment(finishNode(node, pos));
+    return withJSDoc(finishNode(node, pos), hasJSDoc);
   }
   function tryParseParenthesizedArrowFunctionExpression(allowReturnTypeInArrowFunction) {
     const triState = isParenthesizedArrowFunctionExpression();
@@ -33743,9 +33744,10 @@ var Parser;
     if (token() === 134 /* AsyncKeyword */) {
       if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1 /* True */) {
         const pos = getNodePos();
+        const hasJSDoc = hasPrecedingJSDocComment();
         const asyncModifier = parseModifiersForArrowFunction();
         const expr = parseBinaryExpressionOrHigher(0 /* Lowest */);
-        return parseSimpleArrowFunctionExpression(pos, expr, allowReturnTypeInArrowFunction, asyncModifier);
+        return parseSimpleArrowFunctionExpression(pos, expr, allowReturnTypeInArrowFunction, hasJSDoc, asyncModifier);
       }
     }
     return void 0;
@@ -38500,6 +38502,7 @@ var commandOptionsWithoutBuild = [
   {
     name: "checkJs",
     type: "boolean",
+    affectsModuleResolution: true,
     showInSimplifiedHelpView: true,
     category: Diagnostics.JavaScript_Support,
     description: Diagnostics.Enable_error_reporting_in_type_checked_JavaScript_files,
@@ -40945,19 +40948,19 @@ function getFileNamesFromConfigSpecs(configFileSpecs, basePath, options, host, e
   const wildcardFiles = arrayFrom(wildcardFileMap.values());
   return literalFiles.concat(wildcardFiles, arrayFrom(wildCardJsonFileMap.values()));
 }
-function isExcludedFile(pathToCheck, spec, basePath, useCaseSensitiveFileNames, currentDirectory) {
+function isExcludedFile(pathToCheck, spec, basePath, useCaseSensitiveFileNames2, currentDirectory) {
   const { validatedFilesSpec, validatedIncludeSpecs, validatedExcludeSpecs } = spec;
   if (!length(validatedIncludeSpecs) || !length(validatedExcludeSpecs))
     return false;
   basePath = normalizePath(basePath);
-  const keyMapper = createGetCanonicalFileName(useCaseSensitiveFileNames);
+  const keyMapper = createGetCanonicalFileName(useCaseSensitiveFileNames2);
   if (validatedFilesSpec) {
     for (const fileName of validatedFilesSpec) {
       if (keyMapper(getNormalizedAbsolutePath(fileName, basePath)) === pathToCheck)
         return false;
     }
   }
-  return matchesExcludeWorker(pathToCheck, validatedExcludeSpecs, useCaseSensitiveFileNames, currentDirectory, basePath);
+  return matchesExcludeWorker(pathToCheck, validatedExcludeSpecs, useCaseSensitiveFileNames2, currentDirectory, basePath);
 }
 function invalidDotDotAfterRecursiveWildcard(s) {
   const wildcardIndex = startsWith(s, "**/") ? 0 : s.indexOf("/**/");
@@ -40967,17 +40970,17 @@ function invalidDotDotAfterRecursiveWildcard(s) {
   const lastDotIndex = endsWith(s, "/..") ? s.length : s.lastIndexOf("/../");
   return lastDotIndex > wildcardIndex;
 }
-function matchesExclude(pathToCheck, excludeSpecs, useCaseSensitiveFileNames, currentDirectory) {
+function matchesExclude(pathToCheck, excludeSpecs, useCaseSensitiveFileNames2, currentDirectory) {
   return matchesExcludeWorker(
     pathToCheck,
     filter(excludeSpecs, (spec) => !invalidDotDotAfterRecursiveWildcard(spec)),
-    useCaseSensitiveFileNames,
+    useCaseSensitiveFileNames2,
     currentDirectory
   );
 }
-function matchesExcludeWorker(pathToCheck, excludeSpecs, useCaseSensitiveFileNames, currentDirectory, basePath) {
+function matchesExcludeWorker(pathToCheck, excludeSpecs, useCaseSensitiveFileNames2, currentDirectory, basePath) {
   const excludePattern = getRegularExpressionForWildcard(excludeSpecs, combinePaths(normalizePath(currentDirectory), basePath), "exclude");
-  const excludeRegex = excludePattern && getRegexFromPattern(excludePattern, useCaseSensitiveFileNames);
+  const excludeRegex = excludePattern && getRegexFromPattern(excludePattern, useCaseSensitiveFileNames2);
   if (!excludeRegex)
     return false;
   if (excludeRegex.test(pathToCheck))
@@ -41007,9 +41010,9 @@ function specToDiagnostic(spec, disallowTrailingRecursion) {
     return [Diagnostics.File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0, spec];
   }
 }
-function getWildcardDirectories({ validatedIncludeSpecs: include, validatedExcludeSpecs: exclude }, path, useCaseSensitiveFileNames) {
+function getWildcardDirectories({ validatedIncludeSpecs: include, validatedExcludeSpecs: exclude }, path, useCaseSensitiveFileNames2) {
   const rawExcludeRegex = getRegularExpressionForWildcard(exclude, path, "exclude");
-  const excludeRegex = rawExcludeRegex && new RegExp(rawExcludeRegex, useCaseSensitiveFileNames ? "" : "i");
+  const excludeRegex = rawExcludeRegex && new RegExp(rawExcludeRegex, useCaseSensitiveFileNames2 ? "" : "i");
   const wildcardDirectories = {};
   if (include !== void 0) {
     const recursiveKeys = [];
@@ -41018,7 +41021,7 @@ function getWildcardDirectories({ validatedIncludeSpecs: include, validatedExclu
       if (excludeRegex && excludeRegex.test(spec)) {
         continue;
       }
-      const match = getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames);
+      const match = getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames2);
       if (match) {
         const { key, flags } = match;
         const existingFlags = wildcardDirectories[key];
@@ -41033,7 +41036,7 @@ function getWildcardDirectories({ validatedIncludeSpecs: include, validatedExclu
     for (const key in wildcardDirectories) {
       if (hasProperty(wildcardDirectories, key)) {
         for (const recursiveKey of recursiveKeys) {
-          if (key !== recursiveKey && containsPath(recursiveKey, key, path, !useCaseSensitiveFileNames)) {
+          if (key !== recursiveKey && containsPath(recursiveKey, key, path, !useCaseSensitiveFileNames2)) {
             delete wildcardDirectories[key];
           }
         }
@@ -41042,20 +41045,20 @@ function getWildcardDirectories({ validatedIncludeSpecs: include, validatedExclu
   }
   return wildcardDirectories;
 }
-function getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames) {
+function getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames2) {
   const match = wildcardDirectoryPattern.exec(spec);
   if (match) {
     const questionWildcardIndex = spec.indexOf("?");
     const starWildcardIndex = spec.indexOf("*");
     const lastDirectorySeperatorIndex = spec.lastIndexOf(directorySeparator);
     return {
-      key: useCaseSensitiveFileNames ? match[0] : toFileNameLowerCase(match[0]),
+      key: useCaseSensitiveFileNames2 ? match[0] : toFileNameLowerCase(match[0]),
       flags: questionWildcardIndex !== -1 && questionWildcardIndex < lastDirectorySeperatorIndex || starWildcardIndex !== -1 && starWildcardIndex < lastDirectorySeperatorIndex ? 1 /* Recursive */ : 0 /* None */
     };
   }
   if (isImplicitGlob(spec.substring(spec.lastIndexOf(directorySeparator) + 1))) {
     return {
-      key: removeTrailingDirectorySeparator(useCaseSensitiveFileNames ? spec : toFileNameLowerCase(spec)),
+      key: removeTrailingDirectorySeparator(useCaseSensitiveFileNames2 ? spec : toFileNameLowerCase(spec)),
       flags: 1 /* Recursive */
     };
   }
@@ -41201,6 +41204,18 @@ function formatExtensions(extensions) {
     result.push("JSON");
   return result.join(", ");
 }
+function extensionsToExtensionsArray(extensions) {
+  const result = [];
+  if (extensions & 1 /* TypeScript */)
+    result.push(...supportedTSImplementationExtensions);
+  if (extensions & 2 /* JavaScript */)
+    result.push(...supportedJSExtensionsFlat);
+  if (extensions & 4 /* Declaration */)
+    result.push(...supportedDeclarationExtensions);
+  if (extensions & 8 /* Json */)
+    result.push(".json" /* Json */);
+  return result;
+}
 function resolvedTypeScriptOnly(resolved) {
   if (!resolved) {
     return void 0;
@@ -41375,8 +41390,8 @@ function getDefaultTypeRoots(currentDirectory) {
 }
 var nodeModulesAtTypes = combinePaths("node_modules", "@types");
 function arePathsEqual(path1, path2, host) {
-  const useCaseSensitiveFileNames = typeof host.useCaseSensitiveFileNames === "function" ? host.useCaseSensitiveFileNames() : host.useCaseSensitiveFileNames;
-  return comparePaths(path1, path2, !useCaseSensitiveFileNames) === 0 /* EqualTo */;
+  const useCaseSensitiveFileNames2 = typeof host.useCaseSensitiveFileNames === "function" ? host.useCaseSensitiveFileNames() : host.useCaseSensitiveFileNames;
+  return comparePaths(path1, path2, !useCaseSensitiveFileNames2) === 0 /* EqualTo */;
 }
 function getOriginalAndResolvedFileName(fileName, host, traceEnabled) {
   const resolvedFileName = realPath(fileName, host, traceEnabled);
@@ -42653,7 +42668,7 @@ function getEntrypointsFromPackageJsonInfo(packageJsonInfo, options, host, cache
       arrayIsEqualTo
     );
     for (const conditions of conditionSets) {
-      const loadPackageJsonExportsState = { ...loadPackageJsonMainState, failedLookupLocations: [], conditions };
+      const loadPackageJsonExportsState = { ...loadPackageJsonMainState, failedLookupLocations: [], conditions, host };
       const exportResolutions = loadEntrypointsFromExportMap(
         packageJsonInfo,
         packageJsonInfo.contents.packageJsonContent.exports,
@@ -42685,23 +42700,42 @@ function loadEntrypointsFromExportMap(scope, exports, state, extensions) {
   return entrypoints;
   function loadEntrypointsFromTargetExports(target) {
     var _a, _b;
-    if (typeof target === "string" && startsWith(target, "./") && target.indexOf("*") === -1) {
-      const partsAfterFirst = getPathComponents(target).slice(2);
-      if (partsAfterFirst.indexOf("..") >= 0 || partsAfterFirst.indexOf(".") >= 0 || partsAfterFirst.indexOf("node_modules") >= 0) {
-        return false;
-      }
-      const resolvedTarget = combinePaths(scope.packageDirectory, target);
-      const finalPath = getNormalizedAbsolutePath(resolvedTarget, (_b = (_a = state.host).getCurrentDirectory) == null ? void 0 : _b.call(_a));
-      const result = loadFileNameFromPackageJsonField(
-        extensions,
-        finalPath,
-        /*onlyRecordFailures*/
-        false,
-        state
-      );
-      if (result) {
-        entrypoints = appendIfUnique(entrypoints, result, (a, b) => a.path === b.path);
-        return true;
+    if (typeof target === "string" && startsWith(target, "./")) {
+      if (target.indexOf("*") >= 0 && state.host.readDirectory) {
+        if (target.indexOf("*") !== target.lastIndexOf("*")) {
+          return false;
+        }
+        state.host.readDirectory(
+          scope.packageDirectory,
+          extensionsToExtensionsArray(extensions),
+          /*excludes*/
+          void 0,
+          [changeAnyExtension(target.replace("*", "**/*"), getDeclarationEmitExtensionForPath(target))]
+        ).forEach((entry) => {
+          entrypoints = appendIfUnique(entrypoints, {
+            path: entry,
+            ext: getAnyExtensionFromPath(entry),
+            resolvedUsingTsExtension: void 0
+          });
+        });
+      } else {
+        const partsAfterFirst = getPathComponents(target).slice(2);
+        if (partsAfterFirst.indexOf("..") >= 0 || partsAfterFirst.indexOf(".") >= 0 || partsAfterFirst.indexOf("node_modules") >= 0) {
+          return false;
+        }
+        const resolvedTarget = combinePaths(scope.packageDirectory, target);
+        const finalPath = getNormalizedAbsolutePath(resolvedTarget, (_b = (_a = state.host).getCurrentDirectory) == null ? void 0 : _b.call(_a));
+        const result = loadFileNameFromPackageJsonField(
+          extensions,
+          finalPath,
+          /*onlyRecordFailures*/
+          false,
+          state
+        );
+        if (result) {
+          entrypoints = appendIfUnique(entrypoints, result, (a, b) => a.path === b.path);
+          return true;
+        }
       }
     } else if (Array.isArray(target)) {
       for (const t of target) {
@@ -42910,6 +42944,9 @@ function loadModuleFromSelfNameReference(extensions, moduleName, directory, stat
   }
   const trailingParts = parts.slice(nameParts.length);
   const subpath = !length(trailingParts) ? "." : `.${directorySeparator}${trailingParts.join(directorySeparator)}`;
+  if (getAllowJSCompilerOption(state.compilerOptions) && !pathContainsNodeModules(directory)) {
+    return loadModuleFromExports(scope, extensions, subpath, state, cache, redirectedReference);
+  }
   const priorityExtensions = extensions & (1 /* TypeScript */ | 4 /* Declaration */);
   const secondaryExtensions = extensions & ~(1 /* TypeScript */ | 4 /* Declaration */);
   return loadModuleFromExports(scope, priorityExtensions, subpath, state, cache, redirectedReference) || loadModuleFromExports(scope, secondaryExtensions, subpath, state, cache, redirectedReference);
@@ -43257,13 +43294,10 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
     function combineDirectoryPath(root, dir) {
       return ensureTrailingDirectorySeparator(combinePaths(root, dir));
     }
-    function useCaseSensitiveFileNames() {
-      return !state.host.useCaseSensitiveFileNames ? true : typeof state.host.useCaseSensitiveFileNames === "boolean" ? state.host.useCaseSensitiveFileNames : state.host.useCaseSensitiveFileNames();
-    }
     function tryLoadInputFileForPath(finalPath, entry, packagePath, isImports2) {
       var _a, _b, _c, _d;
-      if (!state.isConfigLookup && (state.compilerOptions.declarationDir || state.compilerOptions.outDir) && finalPath.indexOf("/node_modules/") === -1 && (state.compilerOptions.configFile ? containsPath(scope.packageDirectory, toAbsolutePath(state.compilerOptions.configFile.fileName), !useCaseSensitiveFileNames()) : true)) {
-        const getCanonicalFileName = hostGetCanonicalFileName({ useCaseSensitiveFileNames });
+      if (!state.isConfigLookup && (state.compilerOptions.declarationDir || state.compilerOptions.outDir) && finalPath.indexOf("/node_modules/") === -1 && (state.compilerOptions.configFile ? containsPath(scope.packageDirectory, toAbsolutePath(state.compilerOptions.configFile.fileName), !useCaseSensitiveFileNames(state)) : true)) {
+        const getCanonicalFileName = hostGetCanonicalFileName({ useCaseSensitiveFileNames: () => useCaseSensitiveFileNames(state) });
         const commonSourceDirGuesses = [];
         if (state.compilerOptions.rootDir || state.compilerOptions.composite && state.compilerOptions.configFilePath) {
           const commonDir = toAbsolutePath(getCommonSourceDirectory(state.compilerOptions, () => [], ((_b = (_a = state.host).getCurrentDirectory) == null ? void 0 : _b.call(_a)) || "", getCanonicalFileName));
@@ -43292,7 +43326,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
         for (const commonSourceDirGuess of commonSourceDirGuesses) {
           const candidateDirectories = getOutputDirectoriesForBaseDirectory(commonSourceDirGuess);
           for (const candidateDir of candidateDirectories) {
-            if (containsPath(candidateDir, finalPath, !useCaseSensitiveFileNames())) {
+            if (containsPath(candidateDir, finalPath, !useCaseSensitiveFileNames(state))) {
               const pathFragment = finalPath.slice(candidateDir.length + 1);
               const possibleInputBase = combinePaths(commonSourceDirGuess, pathFragment);
               const jsAndDtsExtensions = [".mjs" /* Mjs */, ".cjs" /* Cjs */, ".js" /* Js */, ".json" /* Json */, ".d.mts" /* Dmts */, ".d.cts" /* Dcts */, ".d.ts" /* Dts */];
@@ -43302,7 +43336,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
                   for (const possibleExt of inputExts) {
                     if (!extensionIsOk(extensions, possibleExt))
                       continue;
-                    const possibleInputWithInputExtension = changeAnyExtension(possibleInputBase, possibleExt, ext, !useCaseSensitiveFileNames());
+                    const possibleInputWithInputExtension = changeAnyExtension(possibleInputBase, possibleExt, ext, !useCaseSensitiveFileNames(state));
                     if (state.host.fileExists(possibleInputWithInputExtension)) {
                       return toSearchResult(withPackageId(scope, loadFileNameFromPackageJsonField(
                         extensions,
@@ -43719,6 +43753,9 @@ function traceIfEnabled(state, diagnostic, ...args) {
     trace(state.host, diagnostic, ...args);
   }
 }
+function useCaseSensitiveFileNames(state) {
+  return !state.host.useCaseSensitiveFileNames ? true : typeof state.host.useCaseSensitiveFileNames === "boolean" ? state.host.useCaseSensitiveFileNames : state.host.useCaseSensitiveFileNames();
+}
 
 // src/compiler/binder.ts
 var ModuleInstanceState = /* @__PURE__ */ ((ModuleInstanceState2) => {
@@ -47202,7 +47239,9 @@ function tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, hos
         for (const { ending, value } of candidates) {
           if (value.length >= prefix.length + suffix.length && startsWith(value, prefix) && endsWith(value, suffix) && validateEnding({ ending, value })) {
             const matchedStar = value.substring(prefix.length, value.length - suffix.length);
-            return pathIsRelative(matchedStar) ? void 0 : key.replace("*", matchedStar);
+            if (!pathIsRelative(matchedStar)) {
+              return key.replace("*", matchedStar);
+            }
           }
         }
       } else if (some(candidates, (c) => c.ending !== 0 /* Minimal */ && pattern === c.value) || some(candidates, (c) => c.ending === 0 /* Minimal */ && pattern === c.value && validateEnding(c))) {
@@ -47274,7 +47313,7 @@ function tryGetModuleNameFromExports(options, targetFilePath, packageDirectory,
       for (const key of getOwnKeys(exports)) {
         if (key === "default" || conditions.indexOf(key) >= 0 || isApplicableVersionedTypesKey(conditions, key)) {
           const subTarget = exports[key];
-          const result = tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, subTarget, conditions);
+          const result = tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, subTarget, conditions, mode);
           if (result) {
             return result;
           }
@@ -48431,7 +48470,7 @@ function createTypeChecker(host) {
   };
   var amalgamatedDuplicates;
   var reverseMappedCache = /* @__PURE__ */ new Map();
-  var inInferTypeForHomomorphicMappedType = false;
+  var homomorphicMappedTypeInferenceStack = [];
   var ambientModulesCache;
   var patternAmbientModules;
   var patternAmbientModuleAugmentations;
@@ -53022,6 +53061,7 @@ function createTypeChecker(host) {
       );
     }
     function signatureToSignatureDeclarationHelper(signature, kind, context, options) {
+      var _a;
       const suppressAny = context.flags & 256 /* SuppressAnyReturnType */;
       if (suppressAny)
         context.flags &= ~256 /* SuppressAnyReturnType */;
@@ -53157,6 +53197,20 @@ function createTypeChecker(host) {
       if (typeArguments) {
         node.typeArguments = factory.createNodeArray(typeArguments);
       }
+      if (((_a = signature.declaration) == null ? void 0 : _a.kind) === 330 /* JSDocSignature */ && signature.declaration.parent.kind === 346 /* JSDocOverloadTag */) {
+        const comment = getTextOfNode(
+          signature.declaration.parent.parent,
+          /*includeTrivia*/
+          true
+        ).slice(2, -2).split(/\r\n|\n|\r/).map((line) => line.replace(/^\s+/, " ")).join("\n");
+        addSyntheticLeadingComment(
+          node,
+          3 /* MultiLineCommentTrivia */,
+          comment,
+          /*hasTrailingNewLine*/
+          true
+        );
+      }
       cleanup == null ? void 0 : cleanup();
       return node;
     }
@@ -59934,7 +59988,7 @@ function createTypeChecker(host) {
         return ((_a = type.target.localTypeParameters) == null ? void 0 : _a.map(() => errorType)) || emptyArray;
       }
       const node = type.node;
-      const typeArguments = !node ? emptyArray : node.kind === 183 /* TypeReference */ ? concatenate(type.target.outerTypeParameters, getEffectiveTypeArguments2(node, type.target.localTypeParameters)) : node.kind === 188 /* ArrayType */ ? [getTypeFromTypeNode(node.elementType)] : map(node.elements, (element) => removeMissingType(getTypeFromTypeNode(element), element.kind === 190 /* OptionalType */));
+      const typeArguments = !node ? emptyArray : node.kind === 183 /* TypeReference */ ? concatenate(type.target.outerTypeParameters, getEffectiveTypeArguments2(node, type.target.localTypeParameters)) : node.kind === 188 /* ArrayType */ ? [getTypeFromTypeNode(node.elementType)] : map(node.elements, getTypeFromTypeNode);
       if (popTypeResolution()) {
         type.resolvedTypeArguments = type.mapper ? instantiateTypes(typeArguments, type.mapper) : typeArguments;
       } else {
@@ -67820,17 +67874,18 @@ function createTypeChecker(host) {
     );
   }
   function inferTypeForHomomorphicMappedType(source, target, constraint) {
-    if (inInferTypeForHomomorphicMappedType) {
-      return void 0;
+    const cacheKey = source.id + "," + target.id + "," + constraint.id;
+    if (reverseMappedCache.has(cacheKey)) {
+      return reverseMappedCache.get(cacheKey);
     }
-    const key = source.id + "," + target.id + "," + constraint.id;
-    if (reverseMappedCache.has(key)) {
-      return reverseMappedCache.get(key);
+    const recursionKey = source.id + "," + (target.target || target).id;
+    if (contains(homomorphicMappedTypeInferenceStack, recursionKey)) {
+      return void 0;
     }
-    inInferTypeForHomomorphicMappedType = true;
+    homomorphicMappedTypeInferenceStack.push(recursionKey);
     const type = createReverseMappedType(source, target, constraint);
-    inInferTypeForHomomorphicMappedType = false;
-    reverseMappedCache.set(key, type);
+    homomorphicMappedTypeInferenceStack.pop();
+    reverseMappedCache.set(cacheKey, type);
     return type;
   }
   function isPartiallyInferableType(type) {
@@ -118841,14 +118896,14 @@ function getEmitListItem(emit, parenthesizerRule) {
 }
 
 // src/compiler/watchUtilities.ts
-function createCachedDirectoryStructureHost(host, currentDirectory, useCaseSensitiveFileNames) {
+function createCachedDirectoryStructureHost(host, currentDirectory, useCaseSensitiveFileNames2) {
   if (!host.getDirectories || !host.readDirectory) {
     return void 0;
   }
   const cachedReadDirectoryResult = /* @__PURE__ */ new Map();
-  const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames);
+  const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames2);
   return {
-    useCaseSensitiveFileNames,
+    useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
     fileExists,
     readFile: (path, encoding) => host.readFile(path, encoding),
     directoryExists: host.directoryExists && directoryExists,
@@ -118970,7 +119025,7 @@ function createCachedDirectoryStructureHost(host, currentDirectory, useCaseSensi
     const rootResult = tryReadDirectory2(rootDir, rootDirPath);
     let rootSymLinkResult;
     if (rootResult !== void 0) {
-      return matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath);
+      return matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames2, currentDirectory, depth, getFileSystemEntries, realpath);
     }
     return host.readDirectory(rootDir, extensions, excludes, includes, depth);
     function getFileSystemEntries(dir) {
@@ -119171,7 +119226,7 @@ function isIgnoredFileFromWildCardWatching({
   program,
   extraFileExtensions,
   currentDirectory,
-  useCaseSensitiveFileNames,
+  useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
   writeLog,
   toPath: toPath3
 }) {
@@ -119187,7 +119242,7 @@ function isIgnoredFileFromWildCardWatching({
     writeLog(`Project: ${configFileName} Detected file add/remove of non supported extension: ${fileOrDirectory}`);
     return true;
   }
-  if (isExcludedFile(fileOrDirectory, options.configFile.configFileSpecs, getNormalizedAbsolutePath(getDirectoryPath(configFileName), currentDirectory), useCaseSensitiveFileNames, currentDirectory)) {
+  if (isExcludedFile(fileOrDirectory, options.configFile.configFileSpecs, getNormalizedAbsolutePath(getDirectoryPath(configFileName), currentDirectory), useCaseSensitiveFileNames2, currentDirectory)) {
     writeLog(`Project: ${configFileName} Detected excluded file: ${fileOrDirectory}`);
     return true;
   }
@@ -119250,7 +119305,7 @@ function getWatchFactory(host, watchLogLevel, log, getDetailWatchInfo2) {
   function createExcludeHandlingAddWatch(key) {
     return (file, cb, flags, options, detailInfo1, detailInfo2) => {
       var _a;
-      return !matchesExclude(file, key === "watchFile" ? options == null ? void 0 : options.excludeFiles : options == null ? void 0 : options.excludeDirectories, useCaseSensitiveFileNames(), ((_a = host.getCurrentDirectory) == null ? void 0 : _a.call(host)) || "") ? factory2[key].call(
+      return !matchesExclude(file, key === "watchFile" ? options == null ? void 0 : options.excludeFiles : options == null ? void 0 : options.excludeDirectories, useCaseSensitiveFileNames2(), ((_a = host.getCurrentDirectory) == null ? void 0 : _a.call(host)) || "") ? factory2[key].call(
         /*thisArgs*/
         void 0,
         file,
@@ -119262,7 +119317,7 @@ function getWatchFactory(host, watchLogLevel, log, getDetailWatchInfo2) {
       ) : excludeWatcherFactory(file, flags, options, detailInfo1, detailInfo2);
     };
   }
-  function useCaseSensitiveFileNames() {
+  function useCaseSensitiveFileNames2() {
     return typeof host.useCaseSensitiveFileNames === "boolean" ? host.useCaseSensitiveFileNames : host.useCaseSensitiveFileNames();
   }
   function createExcludeWatcherWithLogging(file, flags, options, detailInfo1, detailInfo2) {
@@ -121385,6 +121440,14 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
           case 265 /* TypeAliasDeclaration */:
             diagnostics.push(createDiagnosticForNode2(node, Diagnostics.Type_aliases_can_only_be_used_in_TypeScript_files));
             return "skip";
+          case 176 /* Constructor */:
+          case 174 /* MethodDeclaration */:
+          case 262 /* FunctionDeclaration */:
+            if (!node.body) {
+              diagnostics.push(createDiagnosticForNode2(node, Diagnostics.Signature_declarations_can_only_be_used_in_TypeScript_files));
+              return "skip";
+            }
+            return;
           case 266 /* EnumDeclaration */:
             const enumKeyword = Debug.checkDefined(tokenToString(94 /* EnumKeyword */));
             diagnostics.push(createDiagnosticForNode2(node, Diagnostics._0_declarations_can_only_be_used_in_TypeScript_files, enumKeyword));
@@ -123300,6 +123363,9 @@ function parseConfigHostFromCompilerHostLike(host, directoryStructureHost = host
       return directoryStructureHost.readDirectory(root, extensions, excludes, includes, depth);
     },
     readFile: (f) => directoryStructureHost.readFile(f),
+    directoryExists: maybeBind(directoryStructureHost, directoryStructureHost.directoryExists),
+    getDirectories: maybeBind(directoryStructureHost, directoryStructureHost.getDirectories),
+    realpath: maybeBind(directoryStructureHost, directoryStructureHost.realpath),
     useCaseSensitiveFileNames: host.useCaseSensitiveFileNames(),
     getCurrentDirectory: () => host.getCurrentDirectory(),
     onUnRecoverableConfigFileDiagnostic: host.onUnRecoverableConfigFileDiagnostic || returnUndefined,
@@ -126339,12 +126405,12 @@ function getMatchedIncludeSpec(program, fileName) {
     return true;
   const isJsonFile = fileExtensionIs(fileName, ".json" /* Json */);
   const basePath = getDirectoryPath(getNormalizedAbsolutePath(configFile.fileName, program.getCurrentDirectory()));
-  const useCaseSensitiveFileNames = program.useCaseSensitiveFileNames();
+  const useCaseSensitiveFileNames2 = program.useCaseSensitiveFileNames();
   return find((_b = configFile == null ? void 0 : configFile.configFileSpecs) == null ? void 0 : _b.validatedIncludeSpecs, (includeSpec) => {
     if (isJsonFile && !endsWith(includeSpec, ".json" /* Json */))
       return false;
     const pattern = getPatternFromSpec(includeSpec, basePath, "files");
-    return !!pattern && getRegexFromPattern(`(${pattern})$`, useCaseSensitiveFileNames).test(fileName);
+    return !!pattern && getRegexFromPattern(`(${pattern})$`, useCaseSensitiveFileNames2).test(fileName);
   });
 }
 function fileIncludeReasonToDiagnostics(program, reason, fileNameConvertor) {
@@ -126573,7 +126639,7 @@ function createWatchFactory(host, options) {
   return result;
 }
 function createCompilerHostFromProgramHost(host, getCompilerOptions, directoryStructureHost = host) {
-  const useCaseSensitiveFileNames = host.useCaseSensitiveFileNames();
+  const useCaseSensitiveFileNames2 = host.useCaseSensitiveFileNames();
   const compilerHost = {
     getSourceFile: createGetSourceFile(
       (fileName, encoding) => !encoding ? compilerHost.readFile(fileName) : host.readFile(fileName, encoding),
@@ -126589,8 +126655,8 @@ function createCompilerHostFromProgramHost(host, getCompilerOptions, directorySt
       (path) => host.directoryExists(path)
     ),
     getCurrentDirectory: memoize(() => host.getCurrentDirectory()),
-    useCaseSensitiveFileNames: () => useCaseSensitiveFileNames,
-    getCanonicalFileName: createGetCanonicalFileName(useCaseSensitiveFileNames),
+    useCaseSensitiveFileNames: () => useCaseSensitiveFileNames2,
+    getCanonicalFileName: createGetCanonicalFileName(useCaseSensitiveFileNames2),
     getNewLine: () => getNewLineCharacter(getCompilerOptions()),
     fileExists: (f) => host.fileExists(f),
     readFile: (f) => host.readFile(f),
@@ -126830,7 +126896,7 @@ function createWatchProgram(host) {
   const sourceFilesCache = /* @__PURE__ */ new Map();
   let missingFilePathsRequestedForRelease;
   let hasChangedCompilerOptions = false;
-  const useCaseSensitiveFileNames = host.useCaseSensitiveFileNames();
+  const useCaseSensitiveFileNames2 = host.useCaseSensitiveFileNames();
   const currentDirectory = host.getCurrentDirectory();
   const { configFileName, optionsToExtend: optionsToExtendForConfigFile = {}, watchOptionsToExtend, extraFileExtensions, createProgram: createProgram2 } = host;
   let { rootFiles: rootFileNames, options: compilerOptions, watchOptions, projectReferences } = host;
@@ -126838,7 +126904,7 @@ function createWatchProgram(host) {
   let configFileParsingDiagnostics;
   let canConfigFileJsonReportNoInputFiles = false;
   let hasChangedConfigFileParsingErrors = false;
-  const cachedDirectoryStructureHost = configFileName === void 0 ? void 0 : createCachedDirectoryStructureHost(host, currentDirectory, useCaseSensitiveFileNames);
+  const cachedDirectoryStructureHost = configFileName === void 0 ? void 0 : createCachedDirectoryStructureHost(host, currentDirectory, useCaseSensitiveFileNames2);
   const directoryStructureHost = cachedDirectoryStructureHost || host;
   const parseConfigFileHost = parseConfigHostFromCompilerHostLike(host, directoryStructureHost);
   let newLine = updateNewLine();
@@ -126856,8 +126922,8 @@ function createWatchProgram(host) {
   Debug.assert(compilerOptions);
   Debug.assert(rootFileNames);
   const { watchFile: watchFile2, watchDirectory, writeLog } = createWatchFactory(host, compilerOptions);
-  const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames);
-  writeLog(`Current directory: ${currentDirectory} CaseSensitiveFileNames: ${useCaseSensitiveFileNames}`);
+  const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames2);
+  writeLog(`Current directory: ${currentDirectory} CaseSensitiveFileNames: ${useCaseSensitiveFileNames2}`);
   let configFileWatcher;
   if (configFileName) {
     configFileWatcher = watchFile2(configFileName, scheduleProgramReload, 2e3 /* High */, watchOptions, WatchType.ConfigFile);
@@ -127363,7 +127429,7 @@ function createWatchProgram(host) {
           options: compilerOptions,
           program: getCurrentBuilderProgram() || rootFileNames,
           currentDirectory,
-          useCaseSensitiveFileNames,
+          useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
           writeLog,
           toPath: toPath3
         }))
@@ -127453,7 +127519,7 @@ function createWatchProgram(host) {
                 options: config.parsedCommandLine.options,
                 program: config.parsedCommandLine.fileNames,
                 currentDirectory,
-                useCaseSensitiveFileNames,
+                useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
                 writeLog,
                 toPath: toPath3
               }))
@@ -133205,10 +133271,10 @@ function isImportablePath(fromPath, toPath3, getCanonicalFileName, globalCachePa
 }
 function forEachExternalModuleToImportFrom(program, host, preferences, useAutoImportProvider, cb) {
   var _a, _b;
-  const useCaseSensitiveFileNames = hostUsesCaseSensitiveFileNames(host);
+  const useCaseSensitiveFileNames2 = hostUsesCaseSensitiveFileNames(host);
   const excludePatterns = preferences.autoImportFileExcludePatterns && mapDefined(preferences.autoImportFileExcludePatterns, (spec) => {
     const pattern = getPatternFromSpec(spec, "", "exclude");
-    return pattern ? getRegexFromPattern(pattern, useCaseSensitiveFileNames) : void 0;
+    return pattern ? getRegexFromPattern(pattern, useCaseSensitiveFileNames2) : void 0;
   });
   forEachExternalModule(program.getTypeChecker(), program.getSourceFiles(), excludePatterns, (module2, file) => cb(
     module2,
@@ -134670,12 +134736,12 @@ var DocumentHighlights;
 function isDocumentRegistryEntry(entry) {
   return !!entry.sourceFile;
 }
-function createDocumentRegistry(useCaseSensitiveFileNames, currentDirectory) {
-  return createDocumentRegistryInternal(useCaseSensitiveFileNames, currentDirectory);
+function createDocumentRegistry(useCaseSensitiveFileNames2, currentDirectory) {
+  return createDocumentRegistryInternal(useCaseSensitiveFileNames2, currentDirectory);
 }
-function createDocumentRegistryInternal(useCaseSensitiveFileNames, currentDirectory = "", externalCache) {
+function createDocumentRegistryInternal(useCaseSensitiveFileNames2, currentDirectory = "", externalCache) {
   const buckets = /* @__PURE__ */ new Map();
-  const getCanonicalFileName = createGetCanonicalFileName(!!useCaseSensitiveFileNames);
+  const getCanonicalFileName = createGetCanonicalFileName(!!useCaseSensitiveFileNames2);
   function reportStats() {
     const bucketInfoArray = arrayFrom(buckets.keys()).filter((name) => name && name.charAt(0) === "_").map((name) => {
       const entries = buckets.get(name);
@@ -134878,12 +134944,12 @@ function getDocumentRegistryBucketKeyWithMode(key, mode) {
 
 // src/services/getEditsForFileRename.ts
 function getEditsForFileRename(program, oldFileOrDirPath, newFileOrDirPath, host, formatContext, preferences, sourceMapper) {
-  const useCaseSensitiveFileNames = hostUsesCaseSensitiveFileNames(host);
-  const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames);
+  const useCaseSensitiveFileNames2 = hostUsesCaseSensitiveFileNames(host);
+  const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames2);
   const oldToNew = getPathUpdater(oldFileOrDirPath, newFileOrDirPath, getCanonicalFileName, sourceMapper);
   const newToOld = getPathUpdater(newFileOrDirPath, oldFileOrDirPath, getCanonicalFileName, sourceMapper);
   return ts_textChanges_exports.ChangeTracker.with({ host, formatContext, preferences }, (changeTracker) => {
-    updateTsconfigFiles(program, changeTracker, oldToNew, oldFileOrDirPath, newFileOrDirPath, host.getCurrentDirectory(), useCaseSensitiveFileNames);
+    updateTsconfigFiles(program, changeTracker, oldToNew, oldFileOrDirPath, newFileOrDirPath, host.getCurrentDirectory(), useCaseSensitiveFileNames2);
     updateImports(program, changeTracker, oldToNew, newToOld, host, getCanonicalFileName);
   });
 }
@@ -134905,7 +134971,7 @@ function makeCorrespondingRelativeChange(a0, b0, a1, getCanonicalFileName) {
   const rel = getRelativePathFromFile(a0, b0, getCanonicalFileName);
   return combinePathsSafe(getDirectoryPath(a1), rel);
 }
-function updateTsconfigFiles(program, changeTracker, oldToNew, oldFileOrDirPath, newFileOrDirPath, currentDirectory, useCaseSensitiveFileNames) {
+function updateTsconfigFiles(program, changeTracker, oldToNew, oldFileOrDirPath, newFileOrDirPath, currentDirectory, useCaseSensitiveFileNames2) {
   const { configFile } = program.getCompilerOptions();
   if (!configFile)
     return;
@@ -134929,10 +134995,10 @@ function updateTsconfigFiles(program, changeTracker, oldToNew, oldFileOrDirPath,
           /*excludes*/
           [],
           includes,
-          useCaseSensitiveFileNames,
+          useCaseSensitiveFileNames2,
           currentDirectory
         );
-        if (getRegexFromPattern(Debug.checkDefined(matchers.includeFilePattern), useCaseSensitiveFileNames).test(oldFileOrDirPath) && !getRegexFromPattern(Debug.checkDefined(matchers.includeFilePattern), useCaseSensitiveFileNames).test(newFileOrDirPath)) {
+        if (getRegexFromPattern(Debug.checkDefined(matchers.includeFilePattern), useCaseSensitiveFileNames2).test(oldFileOrDirPath) && !getRegexFromPattern(Debug.checkDefined(matchers.includeFilePattern), useCaseSensitiveFileNames2).test(newFileOrDirPath)) {
           changeTracker.insertNodeAfter(configFile, last(property.initializer.elements), factory.createStringLiteral(relativePath(newFileOrDirPath)));
         }
         return;
@@ -134980,7 +135046,7 @@ function updateTsconfigFiles(program, changeTracker, oldToNew, oldFileOrDirPath,
       configDir,
       path,
       /*ignoreCase*/
-      !useCaseSensitiveFileNames
+      !useCaseSensitiveFileNames2
     );
   }
 }
@@ -138260,7 +138326,7 @@ function getNewStatementsAndRemoveFromOldFile2(oldFile, targetFile, usage, chang
   const body = addExports(oldFile, toMove.all, usage.oldFileImportsFromTargetFile, useEsModuleSyntax);
   if (typeof targetFile !== "string") {
     if (targetFile.statements.length > 0) {
-      changes.insertNodesAfter(targetFile, targetFile.statements[targetFile.statements.length - 1], body);
+      moveStatementsToTargetFile(changes, program, body, targetFile, toMove);
     } else {
       changes.insertNodesAtEndOfFile(
         targetFile,
@@ -139053,6 +139119,67 @@ function isNonVariableTopLevelDeclaration(node) {
       return false;
   }
 }
+function moveStatementsToTargetFile(changes, program, statements, targetFile, toMove) {
+  var _a;
+  const removedExports = /* @__PURE__ */ new Set();
+  const targetExports = (_a = targetFile.symbol) == null ? void 0 : _a.exports;
+  if (targetExports) {
+    const checker = program.getTypeChecker();
+    const targetToSourceExports = /* @__PURE__ */ new Map();
+    for (const node of toMove.all) {
+      if (isTopLevelDeclarationStatement(node) && hasSyntacticModifier(node, 1 /* Export */)) {
+        forEachTopLevelDeclaration(node, (declaration) => {
+          var _a2;
+          const targetDeclarations = canHaveSymbol(declaration) ? (_a2 = targetExports.get(declaration.symbol.escapedName)) == null ? void 0 : _a2.declarations : void 0;
+          const exportDeclaration = firstDefined(targetDeclarations, (d) => isExportDeclaration(d) ? d : isExportSpecifier(d) ? tryCast(d.parent.parent, isExportDeclaration) : void 0);
+          if (exportDeclaration && exportDeclaration.moduleSpecifier) {
+            targetToSourceExports.set(
+              exportDeclaration,
+              (targetToSourceExports.get(exportDeclaration) || /* @__PURE__ */ new Set()).add(declaration)
+            );
+          }
+        });
+      }
+    }
+    for (const [exportDeclaration, topLevelDeclarations] of arrayFrom(targetToSourceExports)) {
+      if (exportDeclaration.exportClause && isNamedExports(exportDeclaration.exportClause) && length(exportDeclaration.exportClause.elements)) {
+        const elements = exportDeclaration.exportClause.elements;
+        const updatedElements = filter(elements, (elem) => find(skipAlias(elem.symbol, checker).declarations, (d) => isTopLevelDeclaration(d) && topLevelDeclarations.has(d)) === void 0);
+        if (length(updatedElements) === 0) {
+          changes.deleteNode(targetFile, exportDeclaration);
+          removedExports.add(exportDeclaration);
+          continue;
+        }
+        if (length(updatedElements) < length(elements)) {
+          changes.replaceNode(
+            targetFile,
+            exportDeclaration,
+            factory.updateExportDeclaration(
+              exportDeclaration,
+              exportDeclaration.modifiers,
+              exportDeclaration.isTypeOnly,
+              factory.updateNamedExports(exportDeclaration.exportClause, factory.createNodeArray(updatedElements, elements.hasTrailingComma)),
+              exportDeclaration.moduleSpecifier,
+              exportDeclaration.assertClause
+            )
+          );
+        }
+      }
+    }
+  }
+  const lastReExport = findLast(targetFile.statements, (n) => isExportDeclaration(n) && !!n.moduleSpecifier && !removedExports.has(n));
+  if (lastReExport) {
+    changes.insertNodesBefore(
+      targetFile,
+      lastReExport,
+      statements,
+      /*blankLineBetween*/
+      true
+    );
+  } else {
+    changes.insertNodesAfter(targetFile, targetFile.statements[targetFile.statements.length - 1], statements);
+  }
+}
 function getOverloadRangeToMove(sourceFile, statement) {
   if (isFunctionLikeDeclaration(statement)) {
     const declarations = statement.symbol.declarations;
@@ -143518,10 +143645,10 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
       host.log(message);
     }
   }
-  const useCaseSensitiveFileNames = hostUsesCaseSensitiveFileNames(host);
-  const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames);
+  const useCaseSensitiveFileNames2 = hostUsesCaseSensitiveFileNames(host);
+  const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames2);
   const sourceMapper = getSourceMapper({
-    useCaseSensitiveFileNames: () => useCaseSensitiveFileNames,
+    useCaseSensitiveFileNames: () => useCaseSensitiveFileNames2,
     getCurrentDirectory: () => currentDirectory,
     getProgram,
     fileExists: maybeBind(host, host.fileExists),
@@ -143569,7 +143696,7 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
       getSourceFileByPath: getOrCreateSourceFileByPath,
       getCancellationToken: () => cancellationToken,
       getCanonicalFileName,
-      useCaseSensitiveFileNames: () => useCaseSensitiveFileNames,
+      useCaseSensitiveFileNames: () => useCaseSensitiveFileNames2,
       getNewLine: () => getNewLineCharacter(newSettings),
       getDefaultLibFileName: (options2) => host.getDefaultLibFileName(options2),
       writeFile: noop,
@@ -143613,9 +143740,12 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
     compilerHost.getSourceFile = getSourceFileWithCache;
     (_c = host.setCompilerHost) == null ? void 0 : _c.call(host, compilerHost);
     const parseConfigHost = {
-      useCaseSensitiveFileNames,
+      useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
       fileExists: (fileName) => compilerHost.fileExists(fileName),
       readFile: (fileName) => compilerHost.readFile(fileName),
+      directoryExists: (f) => compilerHost.directoryExists(f),
+      getDirectories: (f) => compilerHost.getDirectories(f),
+      realpath: compilerHost.realpath,
       readDirectory: (...args) => compilerHost.readDirectory(...args),
       trace: compilerHost.trace,
       getCurrentDirectory: compilerHost.getCurrentDirectory,
@@ -157667,6 +157797,13 @@ function createCompletionEntry(symbol, sortText, replacementToken, contextToken,
     data = originToCompletionEntryData(origin);
     hasAction = !importStatementCompletion;
   }
+  const parentNamedImportOrExport = findAncestor(location, isNamedImportsOrExports);
+  if ((parentNamedImportOrExport == null ? void 0 : parentNamedImportOrExport.kind) === 275 /* NamedImports */) {
+    const possibleToken = stringToToken(name);
+    if (parentNamedImportOrExport && possibleToken && (possibleToken === 135 /* AwaitKeyword */ || isNonContextualKeyword(possibleToken))) {
+      insertText = `${name} as ${name}_`;
+    }
+  }
   return {
     name,
     kind: ts_SymbolDisplay_exports.getSymbolKind(typeChecker, symbol, location),
@@ -158447,7 +158584,7 @@ function createCompletionDetails(name, kindModifiers, kind, displayParts, docume
 }
 function getCompletionEntryCodeActionsAndSourceDisplay(name, location, contextToken, origin, symbol, program, host, compilerOptions, sourceFile, position, previousToken, formatContext, preferences, data, source, cancellationToken) {
   if (data == null ? void 0 : data.moduleSpecifier) {
-    if (previousToken && getImportStatementCompletionInfo(contextToken || previousToken).replacementSpan) {
+    if (previousToken && getImportStatementCompletionInfo(contextToken || previousToken, sourceFile).replacementSpan) {
       return { codeActions: void 0, sourceDisplay: [textPart(data.moduleSpecifier)] };
     }
   }
@@ -158669,7 +158806,7 @@ function getCompletionData(program, log, sourceFile, compilerOptions, position,
   let isNewIdentifierLocation = false;
   let flags = 0 /* None */;
   if (contextToken) {
-    const importStatementCompletionInfo = getImportStatementCompletionInfo(contextToken);
+    const importStatementCompletionInfo = getImportStatementCompletionInfo(contextToken, sourceFile);
     if (importStatementCompletionInfo.keywordCompletion) {
       if (importStatementCompletionInfo.isKeywordOnlyCompletion) {
         return {
@@ -160313,7 +160450,7 @@ function tryGetObjectLiteralContextualType(node, typeChecker) {
   }
   return void 0;
 }
-function getImportStatementCompletionInfo(contextToken) {
+function getImportStatementCompletionInfo(contextToken, sourceFile) {
   var _a, _b, _c;
   let keywordCompletion;
   let isKeywordOnlyCompletion = false;
@@ -160329,6 +160466,12 @@ function getImportStatementCompletionInfo(contextToken) {
   function getCandidate() {
     const parent2 = contextToken.parent;
     if (isImportEqualsDeclaration(parent2)) {
+      const lastToken = parent2.getLastToken(sourceFile);
+      if (isIdentifier(contextToken) && lastToken !== contextToken) {
+        keywordCompletion = 161 /* FromKeyword */;
+        isKeywordOnlyCompletion = true;
+        return void 0;
+      }
       keywordCompletion = contextToken.kind === 156 /* TypeKeyword */ ? void 0 : 156 /* TypeKeyword */;
       return isModuleSpecifierMissingOrEmpty(parent2.moduleReference) ? parent2 : void 0;
     }
@@ -160830,7 +160973,7 @@ function getCompletionEntriesForRelativeModules(literalValue, scriptDirectory, c
       extensionOptions,
       host,
       /*moduleSpecifierIsRelative*/
-      false,
+      true,
       scriptPath
     ).values());
   }
@@ -161162,16 +161305,18 @@ function getModulesForPathsPattern(fragment, packageDirectory, pattern, extensio
   const fragmentDirectory = fragmentHasPath ? hasTrailingDirectorySeparator(fragment) ? fragment : getDirectoryPath(fragment) : void 0;
   const expandedPrefixDirectory = fragmentHasPath ? combinePaths(normalizedPrefixDirectory, normalizedPrefixBase + fragmentDirectory) : normalizedPrefixDirectory;
   const normalizedSuffix = normalizePath(parsed.suffix);
+  const declarationExtension = normalizedSuffix && getDeclarationEmitExtensionForPath("_" + normalizedSuffix);
+  const matchingSuffixes = declarationExtension ? [changeExtension(normalizedSuffix, declarationExtension), normalizedSuffix] : [normalizedSuffix];
   const baseDirectory = normalizePath(combinePaths(packageDirectory, expandedPrefixDirectory));
   const completePrefix = fragmentHasPath ? baseDirectory : ensureTrailingDirectorySeparator(baseDirectory) + normalizedPrefixBase;
-  const includeGlob = normalizedSuffix ? "**/*" + normalizedSuffix : "./*";
+  const includeGlobs = normalizedSuffix ? matchingSuffixes.map((suffix) => "**/*" + suffix) : ["./*"];
   const matches = mapDefined(tryReadDirectory(
     host,
     baseDirectory,
     extensionOptions.extensionsToSearch,
     /*exclude*/
     void 0,
-    [includeGlob]
+    includeGlobs
   ), (match) => {
     const trimmedWithPattern = trimPrefixAndSuffix(match);
     if (trimmedWithPattern) {
@@ -161185,8 +161330,10 @@ function getModulesForPathsPattern(fragment, packageDirectory, pattern, extensio
   const directories = normalizedSuffix ? emptyArray : mapDefined(tryGetDirectories(host, baseDirectory), (dir) => dir === "node_modules" ? void 0 : directoryResult(dir));
   return [...matches, ...directories];
   function trimPrefixAndSuffix(path) {
-    const inner = withoutStartAndEnd(normalizePath(path), completePrefix, normalizedSuffix);
-    return inner === void 0 ? void 0 : removeLeadingDirectorySeparator(inner);
+    return firstDefined(matchingSuffixes, (suffix) => {
+      const inner = withoutStartAndEnd(normalizePath(path), completePrefix, suffix);
+      return inner === void 0 ? void 0 : removeLeadingDirectorySeparator(inner);
+    });
   }
 }
 function withoutStartAndEnd(s, start2, end) {
@@ -167906,6 +168053,9 @@ var ChangeTracker = class _ChangeTracker {
   insertNodeBefore(sourceFile, before, newNode, blankLineBetween = false, options = {}) {
     this.insertNodeAt(sourceFile, getAdjustedStartPosition(sourceFile, before, options), newNode, this.getOptionsForInsertNodeBefore(before, newNode, blankLineBetween));
   }
+  insertNodesBefore(sourceFile, before, newNodes, blankLineBetween = false, options = {}) {
+    this.insertNodesAt(sourceFile, getAdjustedStartPosition(sourceFile, before, options), newNodes, this.getOptionsForInsertNodeBefore(before, first(newNodes), blankLineBetween));
+  }
   insertModifierAt(sourceFile, pos, modifier, options = {}) {
     this.insertNodeAt(sourceFile, pos, factory.createToken(modifier), options);
   }
@@ -177075,7 +177225,7 @@ var Project3 = class _Project {
     return this.projectService.includePackageJsonAutoImports();
   }
   /** @internal */
-  getModuleResolutionHostForAutoImportProvider() {
+  getHostForAutoImportProvider() {
     var _a, _b;
     if (this.program) {
       return {
@@ -177086,7 +177236,8 @@ var Project3 = class _Project {
         readFile: this.projectService.host.readFile.bind(this.projectService.host),
         getDirectories: this.projectService.host.getDirectories.bind(this.projectService.host),
         trace: (_b = this.projectService.host.trace) == null ? void 0 : _b.bind(this.projectService.host),
-        useCaseSensitiveFileNames: this.program.useCaseSensitiveFileNames()
+        useCaseSensitiveFileNames: this.program.useCaseSensitiveFileNames(),
+        readDirectory: this.projectService.host.readDirectory.bind(this.projectService.host)
       };
     }
     return this.projectService.host;
@@ -177114,7 +177265,7 @@ var Project3 = class _Project {
     if (dependencySelection) {
       (_a = tracing) == null ? void 0 : _a.push(tracing.Phase.Session, "getPackageJsonAutoImportProvider");
       const start2 = timestamp();
-      this.autoImportProviderHost = AutoImportProviderProject.create(dependencySelection, this, this.getModuleResolutionHostForAutoImportProvider(), this.documentRegistry);
+      this.autoImportProviderHost = AutoImportProviderProject.create(dependencySelection, this, this.getHostForAutoImportProvider(), this.documentRegistry);
       if (this.autoImportProviderHost) {
         updateProjectIfDirty(this.autoImportProviderHost);
         this.sendPerformanceEvent("CreatePackageJsonAutoImportProvider", timestamp() - start2);
@@ -177352,7 +177503,7 @@ var _AutoImportProviderProject = class _AutoImportProviderProject extends Projec
     this.getParsedCommandLine = maybeBind(this.hostProject, this.hostProject.getParsedCommandLine);
   }
   /** @internal */
-  static getRootFileNames(dependencySelection, hostProject, moduleResolutionHost, compilerOptions) {
+  static getRootFileNames(dependencySelection, hostProject, host, compilerOptions) {
     var _a, _b;
     if (!dependencySelection) {
       return emptyArray;
@@ -177382,7 +177533,7 @@ var _AutoImportProviderProject = class _AutoImportProviderProject extends Projec
           name,
           hostProject.currentDirectory,
           compilerOptions,
-          moduleResolutionHost,
+          host,
           program.getModuleResolutionCache()
         );
         if (packageJson) {
@@ -177399,7 +177550,7 @@ var _AutoImportProviderProject = class _AutoImportProviderProject extends Projec
               `@types/${name}`,
               directory,
               compilerOptions,
-              moduleResolutionHost,
+              host,
               program.getModuleResolutionCache()
             );
             if (typesPackageJson) {
@@ -177439,12 +177590,12 @@ var _AutoImportProviderProject = class _AutoImportProviderProject extends Projec
       const entrypoints = getEntrypointsFromPackageJsonInfo(
         packageJson,
         compilerOptions,
-        moduleResolutionHost,
+        host,
         program2.getModuleResolutionCache(),
         resolveJs
       );
       if (entrypoints) {
-        const real = (_a2 = moduleResolutionHost.realpath) == null ? void 0 : _a2.call(moduleResolutionHost, packageJson.packageDirectory);
+        const real = (_a2 = host.realpath) == null ? void 0 : _a2.call(host, packageJson.packageDirectory);
         const isSymlink = real && real !== packageJson.packageDirectory;
         if (isSymlink) {
           symlinkCache.setSymlinkedDirectory(packageJson.packageDirectory, {
@@ -177462,7 +177613,7 @@ var _AutoImportProviderProject = class _AutoImportProviderProject extends Projec
     }
   }
   /** @internal */
-  static create(dependencySelection, hostProject, moduleResolutionHost, documentRegistry) {
+  static create(dependencySelection, hostProject, host, documentRegistry) {
     if (dependencySelection === 0 /* Off */) {
       return void 0;
     }
@@ -177470,7 +177621,7 @@ var _AutoImportProviderProject = class _AutoImportProviderProject extends Projec
       ...hostProject.getCompilerOptions(),
       ...this.compilerOptionsOverrides
     };
-    const rootNames = this.getRootFileNames(dependencySelection, hostProject, moduleResolutionHost, compilerOptions);
+    const rootNames = this.getRootFileNames(dependencySelection, hostProject, host, compilerOptions);
     if (!rootNames.length) {
       return void 0;
     }
@@ -177489,7 +177640,7 @@ var _AutoImportProviderProject = class _AutoImportProviderProject extends Projec
       rootFileNames = _AutoImportProviderProject.getRootFileNames(
         this.hostProject.includePackageJsonAutoImports(),
         this.hostProject,
-        this.hostProject.getModuleResolutionHostForAutoImportProvider(),
+        this.hostProject.getHostForAutoImportProvider(),
         this.getCompilationSettings()
       );
     }
@@ -177528,7 +177679,7 @@ var _AutoImportProviderProject = class _AutoImportProviderProject extends Projec
   onPackageJsonChange() {
     throw new Error("package.json changes should be notified on an AutoImportProvider's host project");
   }
-  getModuleResolutionHostForAutoImportProvider() {
+  getHostForAutoImportProvider() {
     throw new Error("AutoImportProviderProject cannot provide its own host; use `hostProject.getModuleResolutionHostForAutomImportProvider()` instead.");
   }
   getProjectReferences() {