typescript 5.0.0-dev.20221206 → 5.0.0-dev.20221208

package/lib/tsserverlibrary.js

@@ -42,7 +42,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.0";
-      version = `${versionMajorMinor}.0-dev.20221206`;
+      version = `${versionMajorMinor}.0-dev.20221208`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -2190,22 +2190,8 @@ Node ${formatSyntaxKind(node.kind)} was unexpected.`,
         function enableDebugInfo() {
           if (isDebugInfoEnabled)
             return;
-          let weakTypeTextMap;
-          let weakNodeTextMap;
-          function getWeakTypeTextMap() {
-            if (weakTypeTextMap === void 0) {
-              if (typeof WeakMap === "function")
-                weakTypeTextMap = /* @__PURE__ */ new WeakMap();
-            }
-            return weakTypeTextMap;
-          }
-          function getWeakNodeTextMap() {
-            if (weakNodeTextMap === void 0) {
-              if (typeof WeakMap === "function")
-                weakNodeTextMap = /* @__PURE__ */ new WeakMap();
-            }
-            return weakNodeTextMap;
-          }
+          const weakTypeTextMap = /* @__PURE__ */ new WeakMap();
+          const weakNodeTextMap = /* @__PURE__ */ new WeakMap();
           Object.defineProperties(objectAllocator.getSymbolConstructor().prototype, {
             __tsDebuggerDisplay: {
               value() {
@@ -2234,11 +2220,10 @@ Node ${formatSyntaxKind(node.kind)} was unexpected.`,
             } },
             __debugTypeToString: {
               value() {
-                const map2 = getWeakTypeTextMap();
-                let text = map2 == null ? void 0 : map2.get(this);
+                let text = weakTypeTextMap.get(this);
                 if (text === void 0) {
                   text = this.checker.typeToString(this);
-                  map2 == null ? void 0 : map2.set(this, text);
+                  weakTypeTextMap.set(this, text);
                 }
                 return text;
               }
@@ -2290,13 +2275,12 @@ Node ${formatSyntaxKind(node.kind)} was unexpected.`,
                   value(includeTrivia) {
                     if (nodeIsSynthesized(this))
                       return "";
-                    const map2 = getWeakNodeTextMap();
-                    let text = map2 == null ? void 0 : map2.get(this);
+                    let text = weakNodeTextMap.get(this);
                     if (text === void 0) {
                       const parseNode = getParseTreeNode(this);
                       const sourceFile = parseNode && getSourceFileOfNode(parseNode);
                       text = sourceFile ? getSourceTextOfNodeFromSourceFile(sourceFile, parseNode, includeTrivia) : "";
-                      map2 == null ? void 0 : map2.set(this, text);
+                      weakNodeTextMap.set(this, text);
                     }
                     return text;
                   }
@@ -35139,8 +35123,10 @@ ${lanes.join("\n")}
       options = redirectedReference.commandLine.options;
     }
     const containingDirectory = containingFile ? getDirectoryPath(containingFile) : void 0;
-    const perFolderCache = containingDirectory ? cache && cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference) : void 0;
-    let result = perFolderCache && perFolderCache.get(typeReferenceDirectiveName, resolutionMode);
+    let result = containingDirectory ? cache == null ? void 0 : cache.getFromDirectoryCache(typeReferenceDirectiveName, resolutionMode, containingDirectory, redirectedReference) : void 0;
+    if (!result && containingDirectory && !isExternalModuleNameRelative(typeReferenceDirectiveName)) {
+      result = cache == null ? void 0 : cache.getFromNonRelativeNameCache(typeReferenceDirectiveName, resolutionMode, containingDirectory, redirectedReference);
+    }
     if (result) {
       if (traceEnabled) {
         trace(host, Diagnostics.Resolving_type_reference_directive_0_containing_file_1, typeReferenceDirectiveName, containingFile);
@@ -35216,7 +35202,12 @@ ${lanes.join("\n")}
       affectingLocations: initializeResolutionField(affectingLocations),
       resolutionDiagnostics: initializeResolutionField(diagnostics)
     };
-    perFolderCache == null ? void 0 : perFolderCache.set(typeReferenceDirectiveName, resolutionMode, result);
+    if (containingDirectory) {
+      cache == null ? void 0 : cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference).set(typeReferenceDirectiveName, resolutionMode, result);
+      if (!isExternalModuleNameRelative(typeReferenceDirectiveName)) {
+        cache == null ? void 0 : cache.getOrCreateCacheForNonRelativeName(typeReferenceDirectiveName, resolutionMode, redirectedReference).set(containingDirectory, result);
+      }
+    }
     if (traceEnabled)
       traceResult(result);
     return result;
@@ -35346,23 +35337,27 @@ ${lanes.join("\n")}
     if (ownOptions)
       redirectsMap.set(ownOptions, ownMap);
     return {
+      getMapOfCacheRedirects,
       getOrCreateMapOfCacheRedirects,
       update,
       clear: clear2
     };
+    function getMapOfCacheRedirects(redirectedReference) {
+      return redirectedReference ? getOrCreateMap(redirectedReference.commandLine.options, false) : ownMap;
+    }
     function getOrCreateMapOfCacheRedirects(redirectedReference) {
-      return redirectedReference ? getOrCreateMap(redirectedReference.commandLine.options) : ownMap;
+      return redirectedReference ? getOrCreateMap(redirectedReference.commandLine.options, true) : ownMap;
     }
     function update(newOptions) {
       if (ownOptions !== newOptions) {
         if (ownOptions)
-          ownMap = getOrCreateMap(newOptions);
+          ownMap = getOrCreateMap(newOptions, true);
         else
           redirectsMap.set(newOptions, ownMap);
         ownOptions = newOptions;
       }
     }
-    function getOrCreateMap(redirectOptions) {
+    function getOrCreateMap(redirectOptions, create) {
       let result = redirectsMap.get(redirectOptions);
       if (result)
         return result;
@@ -35376,9 +35371,13 @@ ${lanes.join("\n")}
           else if (!redirectsKeyToMap.has(ownKey))
             redirectsKeyToMap.set(ownKey, ownMap);
         }
-        redirectsKeyToMap.set(key, result != null ? result : result = /* @__PURE__ */ new Map());
+        if (create)
+          result != null ? result : result = /* @__PURE__ */ new Map();
+        if (result)
+          redirectsKeyToMap.set(key, result);
       }
-      redirectsMap.set(redirectOptions, result);
+      if (result)
+        redirectsMap.set(redirectOptions, result);
       return result;
     }
     function clear2() {
@@ -35430,8 +35429,10 @@ ${lanes.join("\n")}
     }
     return result;
   }
-  function createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap) {
+  function createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, options) {
+    const directoryToModuleNameMap = createCacheWithRedirects(options);
     return {
+      getFromDirectoryCache,
       getOrCreateCacheForDirectory,
       clear: clear2,
       update
@@ -35439,13 +35440,18 @@ ${lanes.join("\n")}
     function clear2() {
       directoryToModuleNameMap.clear();
     }
-    function update(options) {
-      directoryToModuleNameMap.update(options);
+    function update(options2) {
+      directoryToModuleNameMap.update(options2);
     }
     function getOrCreateCacheForDirectory(directoryName, redirectedReference) {
       const path = toPath(directoryName, currentDirectory, getCanonicalFileName);
       return getOrCreateCache(directoryToModuleNameMap, redirectedReference, path, () => createModeAwareCache());
     }
+    function getFromDirectoryCache(name, mode, directoryName, redirectedReference) {
+      var _a2, _b;
+      const path = toPath(directoryName, currentDirectory, getCanonicalFileName);
+      return (_b = (_a2 = directoryToModuleNameMap.getMapOfCacheRedirects(redirectedReference)) == null ? void 0 : _a2.get(path)) == null ? void 0 : _b.get(name, mode);
+    }
   }
   function createModeAwareCacheKey(specifier, mode) {
     return mode === void 0 ? specifier : `${mode}|${specifier}`;
@@ -35494,33 +35500,32 @@ ${lanes.join("\n")}
     }
     return map2;
   }
-  function createModuleResolutionCache(currentDirectory, getCanonicalFileName, options) {
-    const directoryToModuleNameMap = createCacheWithRedirects(options);
-    const perDirectoryResolutionCache = createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap);
+  function getOriginalOrResolvedModuleFileName(result) {
+    return result.resolvedModule && (result.resolvedModule.originalPath || result.resolvedModule.resolvedFileName);
+  }
+  function getOriginalOrResolvedTypeReferenceFileName(result) {
+    return result.resolvedTypeReferenceDirective && (result.resolvedTypeReferenceDirective.originalPath || result.resolvedTypeReferenceDirective.resolvedFileName);
+  }
+  function createNonRelativeNameResolutionCache(currentDirectory, getCanonicalFileName, options, getResolvedFileName) {
     const moduleNameToDirectoryMap = createCacheWithRedirects(options);
-    const packageJsonInfoCache = createPackageJsonInfoCache(currentDirectory, getCanonicalFileName);
     return {
-      ...packageJsonInfoCache,
-      ...perDirectoryResolutionCache,
-      getOrCreateCacheForModuleName,
+      getFromNonRelativeNameCache,
+      getOrCreateCacheForNonRelativeName,
       clear: clear2,
-      update,
-      getPackageJsonInfoCache: () => packageJsonInfoCache,
-      clearAllExceptPackageJsonInfoCache
+      update
     };
     function clear2() {
-      clearAllExceptPackageJsonInfoCache();
-      packageJsonInfoCache.clear();
-    }
-    function clearAllExceptPackageJsonInfoCache() {
-      perDirectoryResolutionCache.clear();
       moduleNameToDirectoryMap.clear();
     }
     function update(options2) {
-      directoryToModuleNameMap.update(options2);
       moduleNameToDirectoryMap.update(options2);
     }
-    function getOrCreateCacheForModuleName(nonRelativeModuleName, mode, redirectedReference) {
+    function getFromNonRelativeNameCache(nonRelativeModuleName, mode, directoryName, redirectedReference) {
+      var _a2, _b;
+      Debug.assert(!isExternalModuleNameRelative(nonRelativeModuleName));
+      return (_b = (_a2 = moduleNameToDirectoryMap.getMapOfCacheRedirects(redirectedReference)) == null ? void 0 : _a2.get(createModeAwareCacheKey(nonRelativeModuleName, mode))) == null ? void 0 : _b.get(directoryName);
+    }
+    function getOrCreateCacheForNonRelativeName(nonRelativeModuleName, mode, redirectedReference) {
       Debug.assert(!isExternalModuleNameRelative(nonRelativeModuleName));
       return getOrCreateCache(moduleNameToDirectoryMap, redirectedReference, createModeAwareCacheKey(nonRelativeModuleName, mode), createPerModuleNameCache);
     }
@@ -35536,7 +35541,7 @@ ${lanes.join("\n")}
           return;
         }
         directoryPathMap.set(path, result);
-        const resolvedFileName = result.resolvedModule && (result.resolvedModule.originalPath || result.resolvedModule.resolvedFileName);
+        const resolvedFileName = getResolvedFileName(result);
         const commonPrefix = resolvedFileName && getCommonPrefix(path, resolvedFileName);
         let current = path;
         while (current !== commonPrefix) {
@@ -35570,14 +35575,22 @@ ${lanes.join("\n")}
       }
     }
   }
-  function createTypeReferenceDirectiveResolutionCache(currentDirectory, getCanonicalFileName, options, packageJsonInfoCache) {
-    const directoryToModuleNameMap = createCacheWithRedirects(options);
-    const perDirectoryResolutionCache = createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap);
-    packageJsonInfoCache || (packageJsonInfoCache = createPackageJsonInfoCache(currentDirectory, getCanonicalFileName));
+  function createModuleOrTypeReferenceResolutionCache(currentDirectory, getCanonicalFileName, options, packageJsonInfoCache, getResolvedFileName) {
+    const perDirectoryResolutionCache = createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, options);
+    const nonRelativeNameResolutionCache = createNonRelativeNameResolutionCache(
+      currentDirectory,
+      getCanonicalFileName,
+      options,
+      getResolvedFileName
+    );
+    packageJsonInfoCache != null ? packageJsonInfoCache : packageJsonInfoCache = createPackageJsonInfoCache(currentDirectory, getCanonicalFileName);
     return {
       ...packageJsonInfoCache,
       ...perDirectoryResolutionCache,
+      ...nonRelativeNameResolutionCache,
       clear: clear2,
+      update,
+      getPackageJsonInfoCache: () => packageJsonInfoCache,
       clearAllExceptPackageJsonInfoCache
     };
     function clear2() {
@@ -35586,14 +35599,36 @@ ${lanes.join("\n")}
     }
     function clearAllExceptPackageJsonInfoCache() {
       perDirectoryResolutionCache.clear();
+      nonRelativeNameResolutionCache.clear();
     }
+    function update(options2) {
+      perDirectoryResolutionCache.update(options2);
+      nonRelativeNameResolutionCache.update(options2);
+    }
+  }
+  function createModuleResolutionCache(currentDirectory, getCanonicalFileName, options) {
+    const result = createModuleOrTypeReferenceResolutionCache(
+      currentDirectory,
+      getCanonicalFileName,
+      options,
+      void 0,
+      getOriginalOrResolvedModuleFileName
+    );
+    result.getOrCreateCacheForModuleName = (nonRelativeName, mode, redirectedReference) => result.getOrCreateCacheForNonRelativeName(nonRelativeName, mode, redirectedReference);
+    return result;
+  }
+  function createTypeReferenceDirectiveResolutionCache(currentDirectory, getCanonicalFileName, options, packageJsonInfoCache) {
+    return createModuleOrTypeReferenceResolutionCache(
+      currentDirectory,
+      getCanonicalFileName,
+      options,
+      packageJsonInfoCache,
+      getOriginalOrResolvedTypeReferenceFileName
+    );
   }
   function resolveModuleNameFromCache(moduleName, containingFile, cache, mode) {
     const containingDirectory = getDirectoryPath(containingFile);
-    const perFolderCache = cache && cache.getOrCreateCacheForDirectory(containingDirectory);
-    if (!perFolderCache)
-      return void 0;
-    return perFolderCache.get(moduleName, mode);
+    return cache.getFromDirectoryCache(moduleName, mode, containingDirectory, void 0);
   }
   function resolveModuleName(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode) {
     const traceEnabled = isTraceEnabled(compilerOptions, host);
@@ -35607,8 +35642,7 @@ ${lanes.join("\n")}
       }
     }
     const containingDirectory = getDirectoryPath(containingFile);
-    const perFolderCache = cache && cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference);
-    let result = perFolderCache && perFolderCache.get(moduleName, resolutionMode);
+    let result = cache == null ? void 0 : cache.getFromDirectoryCache(moduleName, resolutionMode, containingDirectory, redirectedReference);
     if (result) {
       if (traceEnabled) {
         trace(host, Diagnostics.Resolution_for_module_0_was_found_in_cache_from_location_1, moduleName, containingDirectory);
@@ -35658,11 +35692,9 @@ ${lanes.join("\n")}
       if (result && result.resolvedModule)
         perfLogger.logInfoEvent(`Module "${moduleName}" resolved to "${result.resolvedModule.resolvedFileName}"`);
       perfLogger.logStopResolveModule(result && result.resolvedModule ? "" + result.resolvedModule.resolvedFileName : "null");
-      if (perFolderCache) {
-        perFolderCache.set(moduleName, resolutionMode, result);
-        if (!isExternalModuleNameRelative(moduleName)) {
-          cache.getOrCreateCacheForModuleName(moduleName, resolutionMode, redirectedReference).set(containingDirectory, result);
-        }
+      cache == null ? void 0 : cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference).set(moduleName, resolutionMode, result);
+      if (!isExternalModuleNameRelative(moduleName)) {
+        cache == null ? void 0 : cache.getOrCreateCacheForNonRelativeName(moduleName, resolutionMode, redirectedReference).set(containingDirectory, result);
       }
     }
     if (traceEnabled) {
@@ -36641,7 +36673,7 @@ ${lanes.join("\n")}
     return loadModuleFromNearestNodeModulesDirectoryWorker(4 /* Declaration */, moduleName, directory, state, true, void 0, void 0);
   }
   function loadModuleFromNearestNodeModulesDirectoryWorker(extensions, moduleName, directory, state, typesScopeOnly, cache, redirectedReference) {
-    const perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName, state.features === 0 ? void 0 : state.features & 32 /* EsmMode */ ? 99 /* ESNext */ : 1 /* CommonJS */, redirectedReference);
+    const mode = state.features === 0 ? void 0 : state.features & 32 /* EsmMode */ ? 99 /* ESNext */ : 1 /* CommonJS */;
     const priorityExtensions = extensions & (1 /* TypeScript */ | 4 /* Declaration */);
     const secondaryExtensions = extensions & ~(1 /* TypeScript */ | 4 /* Declaration */);
     if (priorityExtensions) {
@@ -36655,7 +36687,7 @@ ${lanes.join("\n")}
     function lookup(extensions2) {
       return forEachAncestorDirectory(normalizeSlashes(directory), (ancestorDirectory) => {
         if (getBaseFileName(ancestorDirectory) !== "node_modules") {
-          const resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, ancestorDirectory, state);
+          const resolutionFromCache = tryFindNonRelativeModuleNameInCache(cache, moduleName, mode, ancestorDirectory, redirectedReference, state);
           if (resolutionFromCache) {
             return resolutionFromCache;
           }
@@ -36800,8 +36832,8 @@ ${lanes.join("\n")}
   function unmangleScopedPackageName(typesPackageName) {
     return stringContains(typesPackageName, mangledScopedPackageSeparator) ? "@" + typesPackageName.replace(mangledScopedPackageSeparator, directorySeparator) : typesPackageName;
   }
-  function tryFindNonRelativeModuleNameInCache(cache, moduleName, containingDirectory, state) {
-    const result = cache && cache.get(containingDirectory);
+  function tryFindNonRelativeModuleNameInCache(cache, moduleName, mode, containingDirectory, redirectedReference, state) {
+    const result = cache && cache.getFromNonRelativeNameCache(moduleName, mode, containingDirectory, redirectedReference);
     if (result) {
       if (state.traceEnabled) {
         trace(state.host, Diagnostics.Resolution_for_module_0_was_found_in_cache_from_location_1, moduleName, containingDirectory);
@@ -36844,9 +36876,8 @@ ${lanes.join("\n")}
         return { value: resolvedUsingSettings };
       }
       if (!isExternalModuleNameRelative(moduleName)) {
-        const perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName, void 0, redirectedReference);
         const resolved2 = forEachAncestorDirectory(containingDirectory, (directory) => {
-          const resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, state);
+          const resolutionFromCache = tryFindNonRelativeModuleNameInCache(cache, moduleName, void 0, directory, redirectedReference, state);
           if (resolutionFromCache) {
             return resolutionFromCache;
           }
@@ -40258,7 +40289,7 @@ ${lanes.join("\n")}
     if (!shortest) {
       return void 0;
     }
-    return getEmitModuleResolutionKind(compilerOptions) === 2 /* NodeJs */ ? removeExtensionAndIndexPostFix(shortest, ending, compilerOptions) : removeFileExtension(shortest);
+    return getEmitModuleResolutionKind(compilerOptions) === 1 /* Classic */ ? removeFileExtension(shortest) : removeExtensionAndIndexPostFix(shortest, ending, compilerOptions);
   }
   function tryGetModuleNameAsNodeModule({ path, isRedirect }, { getCanonicalFileName, sourceDirectory }, importingSourceFile, host, options, userPreferences, packageNameOnly, overrideMode) {
     if (!host.fileExists || !host.readFile) {
@@ -40934,8 +40965,9 @@ ${lanes.join("\n")}
     const nonNullUnknownType = createIntrinsicType(2 /* Unknown */, "unknown");
     const undefinedType = createIntrinsicType(32768 /* Undefined */, "undefined");
     const undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(32768 /* Undefined */, "undefined", 65536 /* ContainsWideningType */);
+    const missingType = createIntrinsicType(32768 /* Undefined */, "undefined");
+    const undefinedOrMissingType = exactOptionalPropertyTypes ? missingType : undefinedType;
     const optionalType = createIntrinsicType(32768 /* Undefined */, "undefined");
-    const missingType = exactOptionalPropertyTypes ? createIntrinsicType(32768 /* Undefined */, "undefined") : undefinedType;
     const nullType = createIntrinsicType(65536 /* Null */, "null");
     const nullWideningType = strictNullChecks ? nullType : createIntrinsicType(65536 /* Null */, "null", 65536 /* ContainsWideningType */);
     const stringType = createIntrinsicType(4 /* String */, "string");
@@ -51093,7 +51125,7 @@ ${lanes.join("\n")}
       return links.resolvedJSDocType;
     }
     function getSubstitutionType(baseType, constraint) {
-      if (constraint.flags & 3 /* AnyOrUnknown */ || constraint === baseType || !isGenericType(baseType) && !isGenericType(constraint)) {
+      if (constraint.flags & 3 /* AnyOrUnknown */ || constraint === baseType) {
         return baseType;
       }
       const id = `${getTypeId(baseType)}>${getTypeId(constraint)}`;
@@ -51833,10 +51865,9 @@ ${lanes.join("\n")}
         if (includes & 3 /* AnyOrUnknown */) {
           return includes & 1 /* Any */ ? includes & 8388608 /* IncludesWildcard */ ? wildcardType : anyType : includes & 65536 /* Null */ || containsType(typeSet, unknownType) ? unknownType : nonNullUnknownType;
         }
-        if (exactOptionalPropertyTypes && includes & 32768 /* Undefined */) {
-          const missingIndex = binarySearch(typeSet, missingType, getTypeId, compareValues);
-          if (missingIndex >= 0 && containsType(typeSet, undefinedType)) {
-            orderedRemoveItemAt(typeSet, missingIndex);
+        if (includes & 32768 /* Undefined */) {
+          if (typeSet.length >= 2 && typeSet[0] === undefinedType && typeSet[1] === missingType) {
+            orderedRemoveItemAt(typeSet, 1);
           }
         }
         if (includes & (2944 /* Literal */ | 8192 /* UniqueESSymbol */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */) || includes & 16384 /* Void */ && includes & 32768 /* Undefined */) {
@@ -51961,7 +51992,7 @@ ${lanes.join("\n")}
           if (type === wildcardType)
             includes |= 8388608 /* IncludesWildcard */;
         } else if (strictNullChecks || !(flags & 98304 /* Nullable */)) {
-          if (exactOptionalPropertyTypes && type === missingType) {
+          if (type === missingType) {
             includes |= 262144 /* IncludesMissingType */;
             type = undefinedType;
           }
@@ -52111,9 +52142,9 @@ ${lanes.join("\n")}
           if (intersectUnionsOfPrimitiveTypes(typeSet)) {
             result = getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
           } else if (eachIsUnionContaining(typeSet, 32768 /* Undefined */)) {
-            const undefinedOrMissingType = exactOptionalPropertyTypes && some(typeSet, (t) => containsType(t.types, missingType)) ? missingType : undefinedType;
+            const containedUndefinedType = some(typeSet, containsMissingType) ? missingType : undefinedType;
             removeFromEach(typeSet, 32768 /* Undefined */);
-            result = getUnionType([getIntersectionType(typeSet), undefinedOrMissingType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
+            result = getUnionType([getIntersectionType(typeSet), containedUndefinedType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
           } else if (eachIsUnionContaining(typeSet, 65536 /* Null */)) {
             removeFromEach(typeSet, 65536 /* Null */);
             result = getUnionType([getIntersectionType(typeSet), nullType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
@@ -52532,7 +52563,7 @@ ${lanes.join("\n")}
             errorIfWritingToReadonlyIndex(getIndexInfoOfType(objectType, numberType));
             return mapType(objectType, (t) => {
               const restType = getRestTypeOfTupleType(t) || undefinedType;
-              return accessFlags & 1 /* IncludeUndefined */ ? getUnionType([restType, undefinedType]) : restType;
+              return accessFlags & 1 /* IncludeUndefined */ ? getUnionType([restType, missingType]) : restType;
             });
           }
         }
@@ -52552,11 +52583,11 @@ ${lanes.join("\n")}
           if (accessNode && indexInfo.keyType === stringType && !isTypeAssignableToKind(indexType, 4 /* String */ | 8 /* Number */)) {
             const indexNode = getIndexNodeForAccessExpression(accessNode);
             error(indexNode, Diagnostics.Type_0_cannot_be_used_as_an_index_type, typeToString(indexType));
-            return accessFlags & 1 /* IncludeUndefined */ ? getUnionType([indexInfo.type, undefinedType]) : indexInfo.type;
+            return accessFlags & 1 /* IncludeUndefined */ ? getUnionType([indexInfo.type, missingType]) : indexInfo.type;
           }
           errorIfWritingToReadonlyIndex(indexInfo);
           if (accessFlags & 1 /* IncludeUndefined */ && !(objectType.symbol && objectType.symbol.flags & (256 /* RegularEnum */ | 128 /* ConstEnum */) && (indexType.symbol && indexType.flags & 1024 /* EnumLiteral */ && getParentOfSymbol(indexType.symbol) === objectType.symbol))) {
-            return getUnionType([indexInfo.type, undefinedType]);
+            return getUnionType([indexInfo.type, missingType]);
           }
           return indexInfo.type;
         }
@@ -57017,8 +57048,8 @@ ${lanes.join("\n")}
     }
     function getOptionalType(type, isProperty = false) {
       Debug.assert(strictNullChecks);
-      const missingOrUndefined = isProperty ? missingType : undefinedType;
-      return type.flags & 32768 /* Undefined */ || type.flags & 1048576 /* Union */ && type.types[0] === missingOrUndefined ? type : getUnionType([type, missingOrUndefined]);
+      const missingOrUndefined = isProperty ? undefinedOrMissingType : undefinedType;
+      return type === missingOrUndefined || type.flags & 1048576 /* Union */ && type.types[0] === missingOrUndefined ? type : getUnionType([type, missingOrUndefined]);
     }
     function getGlobalNonNullableTypeInstantiation(type) {
       if (!deferredGlobalNonNullableTypeAlias) {
@@ -57045,7 +57076,7 @@ ${lanes.join("\n")}
       return exactOptionalPropertyTypes && isOptional ? removeType(type, missingType) : type;
     }
     function containsMissingType(type) {
-      return exactOptionalPropertyTypes && (type === missingType || type.flags & 1048576 /* Union */ && containsType(type.types, missingType));
+      return type === missingType || !!(type.flags & 1048576 /* Union */) && type.types[0] === missingType;
     }
     function removeMissingOrUndefinedType(type) {
       return exactOptionalPropertyTypes ? removeType(type, missingType) : getTypeWithFacts(type, 524288 /* NEUndefined */);
@@ -57145,7 +57176,7 @@ ${lanes.join("\n")}
       if (cached) {
         return cached;
       }
-      const result = createSymbolWithType(prop, missingType);
+      const result = createSymbolWithType(prop, undefinedOrMissingType);
       result.flags |= 16777216 /* Optional */;
       undefinedProperties.set(prop.escapedName, result);
       return result;
@@ -58195,7 +58226,7 @@ ${lanes.join("\n")}
       }
     }
     function isTypeOrBaseIdenticalTo(s, t) {
-      return exactOptionalPropertyTypes && t === missingType ? s === t : isTypeIdenticalTo(s, t) || !!(t.flags & 4 /* String */ && s.flags & 128 /* StringLiteral */ || t.flags & 8 /* Number */ && s.flags & 256 /* NumberLiteral */);
+      return t === missingType ? s === t : isTypeIdenticalTo(s, t) || !!(t.flags & 4 /* String */ && s.flags & 128 /* StringLiteral */ || t.flags & 8 /* Number */ && s.flags & 256 /* NumberLiteral */);
     }
     function isTypeCloselyMatchedBy(s, t) {
       return !!(s.flags & 524288 /* Object */ && t.flags & 524288 /* Object */ && s.symbol && s.symbol === t.symbol || s.aliasSymbol && s.aliasTypeArguments && s.aliasSymbol === t.aliasSymbol);
@@ -58724,7 +58755,7 @@ ${lanes.join("\n")}
     function includeUndefinedInIndexSignature(type) {
       if (!type)
         return type;
-      return compilerOptions.noUncheckedIndexedAccess ? getUnionType([type, undefinedType]) : type;
+      return compilerOptions.noUncheckedIndexedAccess ? getUnionType([type, missingType]) : type;
     }
     function getTypeOfDestructuredSpreadExpression(type) {
       return createArrayType(checkIteratedTypeOrElementType(65 /* Destructuring */, type, undefinedType, void 0) || errorType);
@@ -59489,7 +59520,7 @@ ${lanes.join("\n")}
         if (bypassFlow) {
           const flowType = getTypeAtFlowNode(bypassFlow);
           const type = getTypeFromFlowType(flowType);
-          if (!contains(antecedentTypes, type) && !isExhaustiveSwitchStatement(bypassFlow.switchStatement)) {
+          if (!(type.flags & 131072 /* Never */) && !contains(antecedentTypes, type) && !isExhaustiveSwitchStatement(bypassFlow.switchStatement)) {
             if (type === declaredType && declaredType === initialType) {
               return type;
             }
@@ -61628,7 +61659,7 @@ ${lanes.join("\n")}
           }
         } else if (exactOptionalPropertyTypes && e.kind === 229 /* OmittedExpression */) {
           hasOmittedExpression = true;
-          elementTypes.push(missingType);
+          elementTypes.push(undefinedOrMissingType);
           elementFlags.push(2 /* Optional */);
         } else {
           const elementContextualType = getContextualTypeForElementExpression(contextualType, elementTypes.length);
@@ -62775,7 +62806,7 @@ ${lanes.join("\n")}
         if (indexInfo.isReadonly && (isAssignmentTarget(node) || isDeleteTarget(node))) {
           error(node, Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(apparentType));
         }
-        propType = compilerOptions.noUncheckedIndexedAccess && !isAssignmentTarget(node) ? getUnionType([indexInfo.type, undefinedType]) : indexInfo.type;
+        propType = compilerOptions.noUncheckedIndexedAccess && !isAssignmentTarget(node) ? getUnionType([indexInfo.type, missingType]) : indexInfo.type;
         if (compilerOptions.noPropertyAccessFromIndexSignature && isPropertyAccessExpression(node)) {
           error(right, Diagnostics.Property_0_comes_from_an_index_signature_so_it_must_be_accessed_with_0, unescapeLeadingUnderscores(right.escapedText));
         }
@@ -64977,6 +65008,7 @@ ${lanes.join("\n")}
     }
     function checkExpressionWithTypeArguments(node) {
       checkGrammarExpressionWithTypeArguments(node);
+      forEach(node.typeArguments, checkSourceElement);
       const exprType = node.kind === 230 /* ExpressionWithTypeArguments */ ? checkExpression(node.expression) : isThisIdentifier(node.exprName) ? checkThisExpression(node.exprName) : checkExpression(node.exprName);
       const typeArguments = node.typeArguments;
       if (exprType === silentNeverType || isErrorType(exprType) || !some(typeArguments)) {
@@ -70304,7 +70336,6 @@ ${lanes.join("\n")}
       let firstDefaultClause;
       let hasDuplicateDefaultClause = false;
       const expressionType = checkExpression(node.expression);
-      const expressionIsLiteral = isLiteralType(expressionType);
       forEach(node.caseBlock.clauses, (clause) => {
         if (clause.kind === 293 /* DefaultClause */ && !hasDuplicateDefaultClause) {
           if (firstDefaultClause === void 0) {
@@ -70323,15 +70354,9 @@ ${lanes.join("\n")}
         }
         function createLazyCaseClauseDiagnostics(clause2) {
           return () => {
-            let caseType = checkExpression(clause2.expression);
-            const caseIsLiteral = isLiteralType(caseType);
-            let comparedExpressionType = expressionType;
-            if (!caseIsLiteral || !expressionIsLiteral) {
-              caseType = caseIsLiteral ? getBaseTypeOfLiteralType(caseType) : caseType;
-              comparedExpressionType = getBaseTypeOfLiteralType(expressionType);
-            }
-            if (!isTypeEqualityComparableTo(comparedExpressionType, caseType)) {
-              checkTypeComparableTo(caseType, comparedExpressionType, clause2.expression, void 0);
+            const caseType = checkExpression(clause2.expression);
+            if (!isTypeEqualityComparableTo(expressionType, caseType)) {
+              checkTypeComparableTo(caseType, expressionType, clause2.expression, void 0);
             }
           };
         }
@@ -100769,6 +100794,7 @@ ${lanes.join("\n")}
       getSymlinkCache,
       realpath: (_o = host.realpath) == null ? void 0 : _o.bind(host),
       useCaseSensitiveFileNames: () => host.useCaseSensitiveFileNames(),
+      getCanonicalFileName,
       getFileIncludeReasons: () => fileReasons,
       structureIsReused,
       writeFile: writeFile2
@@ -100809,7 +100835,7 @@ ${lanes.join("\n")}
       const containingFileName = getNormalizedAbsolutePath(containingFile.originalFileName, currentDirectory);
       const containingDir = getDirectoryPath(containingFileName);
       const redirectedReference = getRedirectReferenceForResolution(containingFile);
-      const fromCache = moduleResolutionCache.getOrCreateCacheForModuleName(name, mode, redirectedReference).get(containingDir);
+      const fromCache = moduleResolutionCache.getFromNonRelativeNameCache(name, mode, containingDir, redirectedReference);
       if (fromCache)
         addResolutionDiagnostics(fromCache);
     }
@@ -103485,14 +103511,13 @@ ${lanes.join("\n")}
           const referencedMap = options.module !== 0 /* None */ && !isOutFile ? createManyToManyPathMap() : void 0;
           const exportedModulesMap = referencedMap ? createManyToManyPathMap() : void 0;
           const useOldState = canReuseOldState(referencedMap, oldState);
-          const getCanonicalFileName = createGetCanonicalFileName(newProgram.useCaseSensitiveFileNames());
           newProgram.getTypeChecker();
           for (const sourceFile of newProgram.getSourceFiles()) {
             const version2 = Debug.checkDefined(sourceFile.version, "Program intended to be used with Builder should have source files with versions set");
             const oldUncommittedSignature = useOldState ? (_a2 = oldState.oldSignatures) == null ? void 0 : _a2.get(sourceFile.resolvedPath) : void 0;
             const signature = oldUncommittedSignature === void 0 ? useOldState ? (_b = oldState.fileInfos.get(sourceFile.resolvedPath)) == null ? void 0 : _b.signature : void 0 : oldUncommittedSignature || void 0;
             if (referencedMap) {
-              const newReferences = getReferencedFiles(newProgram, sourceFile, getCanonicalFileName);
+              const newReferences = getReferencedFiles(newProgram, sourceFile, newProgram.getCanonicalFileName);
               if (newReferences) {
                 referencedMap.set(sourceFile.resolvedPath, newReferences);
               }
@@ -103554,6 +103579,26 @@ ${lanes.join("\n")}
           (state.hasCalledUpdateShapeSignature || (state.hasCalledUpdateShapeSignature = /* @__PURE__ */ new Set())).add(path);
         }
         BuilderState2.updateSignatureOfFile = updateSignatureOfFile;
+        function computeDtsSignature(programOfThisState, sourceFile, cancellationToken, host, onNewSignature) {
+          programOfThisState.emit(
+            sourceFile,
+            (fileName, text, _writeByteOrderMark, _onError, sourceFiles, data) => {
+              Debug.assert(isDeclarationFileName(fileName), `File extension for signature expected to be dts: Got:: ${fileName}`);
+              onNewSignature(computeSignatureWithDiagnostics(
+                programOfThisState,
+                sourceFile,
+                text,
+                host,
+                data
+              ), sourceFiles);
+            },
+            cancellationToken,
+            true,
+            void 0,
+            true
+          );
+        }
+        BuilderState2.computeDtsSignature = computeDtsSignature;
         function updateShapeSignature(state, programOfThisState, sourceFile, cancellationToken, host, useFileVersionAsSignature = state.useFileVersionAsSignature) {
           var _a2;
           if ((_a2 = state.hasCalledUpdateShapeSignature) == null ? void 0 : _a2.has(sourceFile.resolvedPath))
@@ -103562,26 +103607,12 @@ ${lanes.join("\n")}
           const prevSignature = info.signature;
           let latestSignature;
           if (!sourceFile.isDeclarationFile && !useFileVersionAsSignature) {
-            programOfThisState.emit(
-              sourceFile,
-              (fileName, text, _writeByteOrderMark, _onError, sourceFiles, data) => {
-                Debug.assert(isDeclarationFileName(fileName), `File extension for signature expected to be dts: Got:: ${fileName}`);
-                latestSignature = computeSignatureWithDiagnostics(
-                  programOfThisState,
-                  sourceFile,
-                  text,
-                  host,
-                  data
-                );
-                if (latestSignature !== prevSignature) {
-                  updateExportedModules(state, sourceFile, sourceFiles[0].exportedModulesFromDeclarationEmit);
-                }
-              },
-              cancellationToken,
-              true,
-              void 0,
-              true
-            );
+            computeDtsSignature(programOfThisState, sourceFile, cancellationToken, host, (signature, sourceFiles) => {
+              latestSignature = signature;
+              if (latestSignature !== prevSignature) {
+                updateExportedModules(state, sourceFile, sourceFiles[0].exportedModulesFromDeclarationEmit);
+              }
+            });
           }
           if (latestSignature === void 0) {
             latestSignature = sourceFile.version;
@@ -103605,27 +103636,24 @@ ${lanes.join("\n")}
           if (!state.exportedModulesMap)
             return;
           (state.oldExportedModulesMap || (state.oldExportedModulesMap = /* @__PURE__ */ new Map())).set(sourceFile.resolvedPath, state.exportedModulesMap.getValues(sourceFile.resolvedPath) || false);
-          if (!exportedModulesFromDeclarationEmit) {
-            state.exportedModulesMap.deleteKey(sourceFile.resolvedPath);
-            return;
-          }
-          let exportedModules;
-          exportedModulesFromDeclarationEmit.forEach((symbol) => addExportedModule(getReferencedFilesFromImportedModuleSymbol(symbol)));
+          const exportedModules = getExportedModules(exportedModulesFromDeclarationEmit);
           if (exportedModules) {
             state.exportedModulesMap.set(sourceFile.resolvedPath, exportedModules);
           } else {
             state.exportedModulesMap.deleteKey(sourceFile.resolvedPath);
           }
-          function addExportedModule(exportedModulePaths) {
-            if (exportedModulePaths == null ? void 0 : exportedModulePaths.length) {
-              if (!exportedModules) {
-                exportedModules = /* @__PURE__ */ new Set();
-              }
-              exportedModulePaths.forEach((path) => exportedModules.add(path));
-            }
-          }
         }
         BuilderState2.updateExportedModules = updateExportedModules;
+        function getExportedModules(exportedModulesFromDeclarationEmit) {
+          let exportedModules;
+          exportedModulesFromDeclarationEmit == null ? void 0 : exportedModulesFromDeclarationEmit.forEach(
+            (symbol) => getReferencedFilesFromImportedModuleSymbol(symbol).forEach(
+              (path) => (exportedModules != null ? exportedModules : exportedModules = /* @__PURE__ */ new Set()).add(path)
+            )
+          );
+          return exportedModules;
+        }
+        BuilderState2.getExportedModules = getExportedModules;
         function getAllDependencies(state, programOfThisState, sourceFile) {
           const compilerOptions = programOfThisState.getCompilerOptions();
           if (outFile(compilerOptions)) {
@@ -103769,9 +103797,9 @@ ${lanes.join("\n")}
   function hasSameKeys(map1, map2) {
     return map1 === map2 || map1 !== void 0 && map2 !== void 0 && map1.size === map2.size && !forEachKey(map1, (key) => !map2.has(key));
   }
-  function createBuilderProgramState(newProgram, oldState, disableUseFileVersionAsSignature) {
+  function createBuilderProgramState(newProgram, oldState) {
     var _a2, _b;
-    const state = BuilderState.create(newProgram, oldState, disableUseFileVersionAsSignature);
+    const state = BuilderState.create(newProgram, oldState, false);
     state.program = newProgram;
     const compilerOptions = newProgram.getCompilerOptions();
     state.compilerOptions = compilerOptions;
@@ -103879,7 +103907,6 @@ ${lanes.join("\n")}
     if (!diagnostics.length)
       return emptyArray;
     let buildInfoDirectory;
-    let getCanonicalFileName;
     return diagnostics.map((diagnostic) => {
       const result = convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath3);
       result.reportsUnnecessary = diagnostic.reportsUnnecessary;
@@ -103892,7 +103919,7 @@ ${lanes.join("\n")}
     });
     function toPath3(path) {
       buildInfoDirectory != null ? buildInfoDirectory : buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(getTsBuildInfoEmitOutputFilePath(newProgram.getCompilerOptions()), newProgram.getCurrentDirectory()));
-      return toPath(path, buildInfoDirectory, getCanonicalFileName != null ? getCanonicalFileName : getCanonicalFileName = createGetCanonicalFileName(newProgram.useCaseSensitiveFileNames()));
+      return toPath(path, buildInfoDirectory, newProgram.getCanonicalFileName);
     }
   }
   function convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath3) {
@@ -104063,7 +104090,7 @@ ${lanes.join("\n")}
           sourceFile,
           cancellationToken,
           host,
-          !host.disableUseFileVersionAsSignature
+          true
         );
         if (getEmitDeclarations(state.compilerOptions)) {
           addToAffectedFilesPendingEmit(state, path, state.compilerOptions.declarationMap ? 24 /* AllDts */ : 8 /* Dts */);
@@ -104190,7 +104217,6 @@ ${lanes.join("\n")}
   function getBuildInfo2(state, bundle) {
     var _a2, _b, _c;
     const currentDirectory = Debug.checkDefined(state.program).getCurrentDirectory();
-    const getCanonicalFileName = createGetCanonicalFileName(state.program.useCaseSensitiveFileNames());
     const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(getTsBuildInfoEmitOutputFilePath(state.compilerOptions), currentDirectory));
     const latestChangedDtsFile = state.latestChangedDtsFile ? relativeToBuildInfoEnsuringAbsolutePath(state.latestChangedDtsFile) : void 0;
     const fileNames = [];
@@ -104308,7 +104334,7 @@ ${lanes.join("\n")}
       return relativeToBuildInfo(getNormalizedAbsolutePath(path, currentDirectory));
     }
     function relativeToBuildInfo(path) {
-      return ensurePathIsNonModuleName(getRelativePathFromDirectory(buildInfoDirectory, path, getCanonicalFileName));
+      return ensurePathIsNonModuleName(getRelativePathFromDirectory(buildInfoDirectory, path, state.program.getCanonicalFileName));
     }
     function toFileId(path) {
       let fileId = fileNameToFileId.get(path);
@@ -104411,7 +104437,6 @@ ${lanes.join("\n")}
   }
   function computeSignatureWithDiagnostics(program, sourceFile, text, host, data) {
     var _a2, _b;
-    let getCanonicalFileName;
     text = getTextHandlingSourceMapForSignature(text, data);
     let sourceFileDirectory;
     if ((_a2 = data == null ? void 0 : data.diagnostics) == null ? void 0 : _a2.length) {
@@ -104431,7 +104456,7 @@ ${lanes.join("\n")}
       return `${ensurePathIsNonModuleName(getRelativePathFromDirectory(
         sourceFileDirectory,
         diagnostic.file.resolvedPath,
-        getCanonicalFileName != null ? getCanonicalFileName : getCanonicalFileName = createGetCanonicalFileName(program.useCaseSensitiveFileNames())
+        program.getCanonicalFileName
       ))}(${diagnostic.start},${diagnostic.length})`;
     }
   }
@@ -104446,7 +104471,7 @@ ${lanes.join("\n")}
       oldState = void 0;
       return oldProgram;
     }
-    const state = createBuilderProgramState(newProgram, oldState, host.disableUseFileVersionAsSignature);
+    const state = createBuilderProgramState(newProgram, oldState);
     newProgram.getBuildInfo = (bundle) => getBuildInfo2(state, bundle);
     newProgram = void 0;
     oldProgram = void 0;
@@ -104943,9 +104968,9 @@ ${lanes.join("\n")}
     let filesWithInvalidatedResolutions;
     let filesWithInvalidatedNonRelativeUnresolvedImports;
     const nonRelativeExternalModuleResolutions = createMultiMap();
-    const resolutionsWithFailedLookups = [];
-    const resolutionsWithOnlyAffectingLocations = [];
-    const resolvedFileToResolution = createMultiMap();
+    const resolutionsWithFailedLookups = /* @__PURE__ */ new Set();
+    const resolutionsWithOnlyAffectingLocations = /* @__PURE__ */ new Set();
+    const resolvedFileToResolution = /* @__PURE__ */ new Map();
     const impliedFormatPackageJsons = /* @__PURE__ */ new Map();
     let hasChangedAutomaticTypeDirectiveNames = false;
     let affectingPathChecksForFile;
@@ -105018,8 +105043,8 @@ ${lanes.join("\n")}
       resolvedModuleNames.clear();
       resolvedTypeReferenceDirectives.clear();
       resolvedFileToResolution.clear();
-      resolutionsWithFailedLookups.length = 0;
-      resolutionsWithOnlyAffectingLocations.length = 0;
+      resolutionsWithFailedLookups.clear();
+      resolutionsWithOnlyAffectingLocations.clear();
       failedLookupChecks = void 0;
       startsWithPathChecks = void 0;
       isInDirectoryChecks = void 0;
@@ -105336,12 +105361,13 @@ ${lanes.join("\n")}
       return fileExtensionIsOneOf(path, failedLookupDefaultExtensions);
     }
     function watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, filePath, getResolutionWithResolvedFileName) {
+      var _a2, _b;
       if (resolution.refCount) {
         resolution.refCount++;
         Debug.assertIsDefined(resolution.files);
       } else {
         resolution.refCount = 1;
-        Debug.assert(length(resolution.files) === 0);
+        Debug.assert(!((_a2 = resolution.files) == null ? void 0 : _a2.size));
         if (isExternalModuleNameRelative(name)) {
           watchFailedLookupLocationOfResolution(resolution);
         } else {
@@ -105349,10 +105375,14 @@ ${lanes.join("\n")}
         }
         const resolved = getResolutionWithResolvedFileName(resolution);
         if (resolved && resolved.resolvedFileName) {
-          resolvedFileToResolution.add(resolutionHost.toPath(resolved.resolvedFileName), resolution);
+          const key = resolutionHost.toPath(resolved.resolvedFileName);
+          let resolutions = resolvedFileToResolution.get(key);
+          if (!resolutions)
+            resolvedFileToResolution.set(key, resolutions = /* @__PURE__ */ new Set());
+          resolutions.add(resolution);
         }
       }
-      (resolution.files || (resolution.files = [])).push(filePath);
+      ((_b = resolution.files) != null ? _b : resolution.files = /* @__PURE__ */ new Set()).add(filePath);
     }
     function watchFailedLookupLocationOfResolution(resolution) {
       Debug.assert(!!resolution.refCount);
@@ -105360,7 +105390,7 @@ ${lanes.join("\n")}
       if (!(failedLookupLocations == null ? void 0 : failedLookupLocations.length) && !(affectingLocations == null ? void 0 : affectingLocations.length))
         return;
       if (failedLookupLocations == null ? void 0 : failedLookupLocations.length)
-        resolutionsWithFailedLookups.push(resolution);
+        resolutionsWithFailedLookups.add(resolution);
       let setAtRoot = false;
       if (failedLookupLocations) {
         for (const failedLookupLocation of failedLookupLocations) {
@@ -105392,7 +105422,7 @@ ${lanes.join("\n")}
       if (!(affectingLocations == null ? void 0 : affectingLocations.length))
         return;
       if (addToResolutionsWithOnlyAffectingLocations)
-        resolutionsWithOnlyAffectingLocations.push(resolution);
+        resolutionsWithOnlyAffectingLocations.add(resolution);
       for (const affectingLocation of affectingLocations) {
         createFileWatcherOfAffectingLocation(affectingLocation, true);
       }
@@ -105471,17 +105501,20 @@ ${lanes.join("\n")}
       }
     }
     function stopWatchFailedLookupLocationOfResolution(resolution, filePath, getResolutionWithResolvedFileName) {
-      unorderedRemoveItem(Debug.checkDefined(resolution.files), filePath);
+      Debug.checkDefined(resolution.files).delete(filePath);
       resolution.refCount--;
       if (resolution.refCount) {
         return;
       }
       const resolved = getResolutionWithResolvedFileName(resolution);
       if (resolved && resolved.resolvedFileName) {
-        resolvedFileToResolution.remove(resolutionHost.toPath(resolved.resolvedFileName), resolution);
+        const key = resolutionHost.toPath(resolved.resolvedFileName);
+        const resolutions = resolvedFileToResolution.get(key);
+        if ((resolutions == null ? void 0 : resolutions.delete(resolution)) && !resolutions.size)
+          resolvedFileToResolution.delete(key);
       }
       const { failedLookupLocations, affectingLocations } = resolution;
-      if (unorderedRemoveItem(resolutionsWithFailedLookups, resolution)) {
+      if (resolutionsWithFailedLookups.delete(resolution)) {
         let removeAtRoot = false;
         for (const failedLookupLocation of failedLookupLocations) {
           const failedLookupLocationPath = resolutionHost.toPath(failedLookupLocation);
@@ -105508,7 +105541,7 @@ ${lanes.join("\n")}
           removeDirectoryWatcher(rootPath);
         }
       } else if (affectingLocations == null ? void 0 : affectingLocations.length) {
-        unorderedRemoveItem(resolutionsWithOnlyAffectingLocations, resolution);
+        resolutionsWithOnlyAffectingLocations.delete(resolution);
       }
       if (affectingLocations) {
         for (const affectingLocation of affectingLocations) {
@@ -105556,15 +105589,15 @@ ${lanes.join("\n")}
       if (!resolutions)
         return false;
       let invalidated = false;
-      for (const resolution of resolutions) {
+      resolutions.forEach((resolution) => {
         if (resolution.isInvalidated || !canInvalidate(resolution))
-          continue;
+          return;
         resolution.isInvalidated = invalidated = true;
         for (const containingFilePath of Debug.checkDefined(resolution.files)) {
           (filesWithInvalidatedResolutions != null ? filesWithInvalidatedResolutions : filesWithInvalidatedResolutions = /* @__PURE__ */ new Set()).add(containingFilePath);
           hasChangedAutomaticTypeDirectiveNames = hasChangedAutomaticTypeDirectiveNames || endsWith(containingFilePath, inferredTypesContainingFile);
         }
-      }
+      });
       return invalidated;
     }
     function invalidateResolutionOfFile(filePath) {
@@ -105857,8 +105890,7 @@ ${lanes.join("\n")}
   function explainFiles(program, write) {
     var _a2, _b;
     const reasons = program.getFileIncludeReasons();
-    const getCanonicalFileName = createGetCanonicalFileName(program.useCaseSensitiveFileNames());
-    const relativeFileName = (fileName) => convertToRelativePath(fileName, program.getCurrentDirectory(), getCanonicalFileName);
+    const relativeFileName = (fileName) => convertToRelativePath(fileName, program.getCurrentDirectory(), program.getCanonicalFileName);
     for (const file of program.getSourceFiles()) {
       write(`${toFileName(file, relativeFileName)}`);
       (_a2 = reasons.get(file.path)) == null ? void 0 : _a2.forEach((reason) => write(`  ${fileIncludeReasonToDiagnostics(program, reason, relativeFileName).messageText}`));
@@ -105916,10 +105948,9 @@ ${lanes.join("\n")}
     const configFile = program.getCompilerOptions().configFile;
     if (!((_a2 = configFile == null ? void 0 : configFile.configFileSpecs) == null ? void 0 : _a2.validatedFilesSpec))
       return void 0;
-    const getCanonicalFileName = createGetCanonicalFileName(program.useCaseSensitiveFileNames());
-    const filePath = getCanonicalFileName(fileName);
+    const filePath = program.getCanonicalFileName(fileName);
     const basePath = getDirectoryPath(getNormalizedAbsolutePath(configFile.fileName, program.getCurrentDirectory()));
-    return find(configFile.configFileSpecs.validatedFilesSpec, (fileSpec) => getCanonicalFileName(getNormalizedAbsolutePath(fileSpec, basePath)) === filePath);
+    return find(configFile.configFileSpecs.validatedFilesSpec, (fileSpec) => program.getCanonicalFileName(getNormalizedAbsolutePath(fileSpec, basePath)) === filePath);
   }
   function getMatchedIncludeSpec(program, fileName) {
     var _a2, _b;
@@ -106129,7 +106160,6 @@ ${lanes.join("\n")}
       getEnvironmentVariable: maybeBind(host, host.getEnvironmentVariable) || (() => ""),
       createHash: maybeBind(host, host.createHash),
       readDirectory: maybeBind(host, host.readDirectory),
-      disableUseFileVersionAsSignature: host.disableUseFileVersionAsSignature,
       storeFilesChangingSignatureDuringEmit: host.storeFilesChangingSignatureDuringEmit
     };
     return compilerHost;
@@ -106196,7 +106226,6 @@ ${lanes.join("\n")}
       writeFile: (path, data, writeByteOrderMark) => system.writeFile(path, data, writeByteOrderMark),
       createHash: maybeBind(system, system.createHash),
       createProgram: createProgram2 || createEmitAndSemanticDiagnosticsBuilderProgram,
-      disableUseFileVersionAsSignature: system.disableUseFileVersionAsSignature,
       storeFilesChangingSignatureDuringEmit: system.storeFilesChangingSignatureDuringEmit,
       now: maybeBind(system, system.now)
     };
@@ -106337,7 +106366,6 @@ ${lanes.join("\n")}
   function createIncrementalCompilerHost(options, system = sys) {
     const host = createCompilerHostWorker(options, void 0, system);
     host.createHash = maybeBind(system, system.createHash);
-    host.disableUseFileVersionAsSignature = system.disableUseFileVersionAsSignature;
     host.storeFilesChangingSignatureDuringEmit = system.storeFilesChangingSignatureDuringEmit;
     setGetSourceFileAsHashVersioned(host);
     changeCompilerHostLikeToUseCache(host, (fileName) => toPath(fileName, host.getCurrentDirectory(), host.getCanonicalFileName));
@@ -107129,8 +107157,6 @@ ${lanes.join("\n")}
   function createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, options, baseWatchOptions) {
     const host = hostOrHostWithWatch;
     const hostWithWatch = hostOrHostWithWatch;
-    const currentDirectory = host.getCurrentDirectory();
-    const getCanonicalFileName = createGetCanonicalFileName(host.useCaseSensitiveFileNames());
     const baseCompilerOptions = getCompilerOptionsOfBuildOptions(options);
     const compilerHost = createCompilerHostFromProgramHost(host, () => state.projectCompilerOptions);
     setGetSourceFileAsHashVersioned(compilerHost);
@@ -107142,7 +107168,7 @@ ${lanes.join("\n")}
     compilerHost.getModuleResolutionCache = maybeBind(host, host.getModuleResolutionCache);
     let moduleResolutionCache, typeReferenceDirectiveResolutionCache;
     if (!compilerHost.resolveModuleNameLiterals && !compilerHost.resolveModuleNames) {
-      moduleResolutionCache = createModuleResolutionCache(currentDirectory, getCanonicalFileName);
+      moduleResolutionCache = createModuleResolutionCache(compilerHost.getCurrentDirectory(), compilerHost.getCanonicalFileName);
       compilerHost.resolveModuleNameLiterals = (moduleNames, containingFile, redirectedReference, options2, containingSourceFile) => loadWithModeAwareCache(
         moduleNames,
         containingFile,
@@ -107156,7 +107182,7 @@ ${lanes.join("\n")}
       compilerHost.getModuleResolutionCache = () => moduleResolutionCache;
     }
     if (!compilerHost.resolveTypeReferenceDirectiveReferences && !compilerHost.resolveTypeReferenceDirectives) {
-      typeReferenceDirectiveResolutionCache = createTypeReferenceDirectiveResolutionCache(currentDirectory, getCanonicalFileName, void 0, moduleResolutionCache == null ? void 0 : moduleResolutionCache.getPackageJsonInfoCache());
+      typeReferenceDirectiveResolutionCache = createTypeReferenceDirectiveResolutionCache(compilerHost.getCurrentDirectory(), compilerHost.getCanonicalFileName, void 0, moduleResolutionCache == null ? void 0 : moduleResolutionCache.getPackageJsonInfoCache());
       compilerHost.resolveTypeReferenceDirectiveReferences = (typeDirectiveNames, containingFile, redirectedReference, options2, containingSourceFile) => loadWithModeAwareCache(
         typeDirectiveNames,
         containingFile,
@@ -107173,8 +107199,6 @@ ${lanes.join("\n")}
     const state = {
       host,
       hostWithWatch,
-      currentDirectory,
-      getCanonicalFileName,
       parseConfigFileHost: parseConfigHostFromCompilerHostLike(host),
       write: maybeBind(host, host.trace),
       options,
@@ -107218,7 +107242,7 @@ ${lanes.join("\n")}
     return state;
   }
   function toPath2(state, fileName) {
-    return toPath(fileName, state.currentDirectory, state.getCanonicalFileName);
+    return toPath(fileName, state.compilerHost.getCurrentDirectory(), state.compilerHost.getCanonicalFileName);
   }
   function toResolvedConfigFilePath(state, fileName) {
     const { resolvedConfigFilePaths } = state;
@@ -107261,7 +107285,7 @@ ${lanes.join("\n")}
     return parsed;
   }
   function resolveProjectName(state, name) {
-    return resolveConfigFileProjectName(resolvePath(state.currentDirectory, name));
+    return resolveConfigFileProjectName(resolvePath(state.compilerHost.getCurrentDirectory(), name));
   }
   function createBuildOrder(state, roots) {
     const temporaryMarks = /* @__PURE__ */ new Map();
@@ -107464,7 +107488,7 @@ ${lanes.join("\n")}
       projectPath,
       buildOrder,
       getCompilerOptions: () => config.options,
-      getCurrentDirectory: () => state.currentDirectory,
+      getCurrentDirectory: () => state.compilerHost.getCurrentDirectory(),
       updateOutputFileStatmps: () => {
         updateOutputTimestamps(state, config, projectPath);
         updateOutputFileStampsPending = false;
@@ -107489,7 +107513,7 @@ ${lanes.join("\n")}
       projectPath,
       buildOrder,
       getCompilerOptions: () => config.options,
-      getCurrentDirectory: () => state.currentDirectory,
+      getCurrentDirectory: () => state.compilerHost.getCurrentDirectory(),
       getBuilderProgram: () => withProgramOrUndefined(identity),
       getProgram: () => withProgramOrUndefined(
         (program2) => program2.getProgramOrUndefined()
@@ -107545,7 +107569,7 @@ ${lanes.join("\n")}
       projectPath,
       buildOrder,
       getCompilerOptions: () => config.options,
-      getCurrentDirectory: () => state.currentDirectory,
+      getCurrentDirectory: () => state.compilerHost.getCurrentDirectory(),
       emit: (writeFile2, customTransformers) => {
         if (step !== 4 /* EmitBundle */)
           return invalidatedProjectOfBundle;
@@ -108652,7 +108676,7 @@ ${lanes.join("\n")}
             fileOrDirectory,
             fileOrDirectoryPath: toPath2(state, fileOrDirectory),
             configFileName: resolved,
-            currentDirectory: state.currentDirectory,
+            currentDirectory: state.compilerHost.getCurrentDirectory(),
             options: parsed.options,
             program: state.builderPrograms.get(resolvedPath) || ((_a2 = getCachedParsedConfigFile(state, resolvedPath)) == null ? void 0 : _a2.fileNames),
             useCaseSensitiveFileNames: state.parseConfigFileHost.useCaseSensitiveFileNames,
@@ -108757,7 +108781,7 @@ ${lanes.join("\n")}
     };
   }
   function relName(state, path) {
-    return convertToRelativePath(path, state.currentDirectory, (f) => state.getCanonicalFileName(f));
+    return convertToRelativePath(path, state.compilerHost.getCurrentDirectory(), state.compilerHost.getCanonicalFileName);
   }
   function reportStatus(state, message, ...args) {
     state.host.reportSolutionBuilderStatus(createCompilerDiagnostic(message, ...args));
@@ -129634,6 +129658,7 @@ ${lanes.join("\n")}
       isTypeOnlyLocation,
       isJsxIdentifierExpected,
       isRightOfOpenTag,
+      isRightOfDotOrQuestionDot,
       importStatementCompletion,
       insideJsDocTagTypeExpression,
       symbolToSortTextMap,
@@ -129699,7 +129724,7 @@ ${lanes.join("\n")}
       getJSCompletionEntries(sourceFile, location.pos, uniqueNames, getEmitScriptTarget(compilerOptions), entries);
     }
     let caseBlock;
-    if (preferences.includeCompletionsWithInsertText && contextToken && (caseBlock = findAncestor(contextToken, isCaseBlock))) {
+    if (preferences.includeCompletionsWithInsertText && contextToken && !isRightOfOpenTag && !isRightOfDotOrQuestionDot && (caseBlock = findAncestor(contextToken, isCaseBlock))) {
       const cases = getExhaustiveCaseSnippets(caseBlock, sourceFile, preferences, compilerOptions, host, program, formatContext);
       if (cases) {
         entries.push(cases.entry);
@@ -131070,6 +131095,7 @@ ${lanes.join("\n")}
       isTypeOnlyLocation,
       isJsxIdentifierExpected,
       isRightOfOpenTag,
+      isRightOfDotOrQuestionDot: isRightOfDot || isRightOfQuestionDot,
       importStatementCompletion,
       hasUnresolvedAutoImports,
       flags
@@ -138164,10 +138190,17 @@ ${lanes.join("\n")}
     const usage = getUsageInfo(oldFile, toMove.all, checker);
     const currentDirectory = getDirectoryPath(oldFile.fileName);
     const extension = extensionFromPath(oldFile.fileName);
-    const newModuleName = makeUniqueModuleName(getNewModuleName(usage.oldFileImportsFromNewFile, usage.movedSymbols), extension, currentDirectory, host);
-    const newFileNameWithExtension = newModuleName + extension;
-    changes.createNewFile(oldFile, combinePaths(currentDirectory, newFileNameWithExtension), getNewStatementsAndRemoveFromOldFile(oldFile, usage, changes, toMove, program, newModuleName, preferences));
-    addNewFileToTsconfig(program, changes, oldFile.fileName, newFileNameWithExtension, hostGetCanonicalFileName(host));
+    const newFilename = combinePaths(
+      currentDirectory,
+      makeUniqueFilename(
+        inferNewFilename(usage.oldFileImportsFromNewFile, usage.movedSymbols),
+        extension,
+        currentDirectory,
+        host
+      )
+    ) + extension;
+    changes.createNewFile(oldFile, newFilename, getNewStatementsAndRemoveFromOldFile(oldFile, usage, changes, toMove, program, host, newFilename, preferences));
+    addNewFileToTsconfig(program, changes, oldFile.fileName, newFilename, hostGetCanonicalFileName(host));
   }
   function getStatementsToMove(context) {
     const rangeToMove = getRangeToMove(context);
@@ -138210,7 +138243,7 @@ ${lanes.join("\n")}
       changes.insertNodeInListAfter(cfg, last(filesProp.initializer.elements), factory.createStringLiteral(newFilePath), filesProp.initializer.elements);
     }
   }
-  function getNewStatementsAndRemoveFromOldFile(oldFile, usage, changes, toMove, program, newModuleName, preferences) {
+  function getNewStatementsAndRemoveFromOldFile(oldFile, usage, changes, toMove, program, host, newFilename, preferences) {
     const checker = program.getTypeChecker();
     const prologueDirectives = takeWhile(oldFile.statements, isPrologueDirective);
     if (oldFile.externalModuleIndicator === void 0 && oldFile.commonJsModuleIndicator === void 0 && usage.oldImportsNeededByNewFile.size() === 0) {
@@ -138219,14 +138252,14 @@ ${lanes.join("\n")}
     }
     const useEsModuleSyntax = !!oldFile.externalModuleIndicator;
     const quotePreference = getQuotePreference(oldFile, preferences);
-    const importsFromNewFile = createOldFileImportsFromNewFile(usage.oldFileImportsFromNewFile, newModuleName, useEsModuleSyntax, quotePreference);
+    const importsFromNewFile = createOldFileImportsFromNewFile(oldFile, usage.oldFileImportsFromNewFile, newFilename, program, host, useEsModuleSyntax, quotePreference);
     if (importsFromNewFile) {
       insertImports(changes, oldFile, importsFromNewFile, true);
     }
     deleteUnusedOldImports(oldFile, toMove.all, changes, usage.unusedImportsFromOldFile, checker);
     deleteMovedStatements(oldFile, toMove.ranges, changes);
-    updateImportsInOtherFiles(changes, program, oldFile, usage.movedSymbols, newModuleName);
-    const imports = getNewFileImportsAndAddExportInOldFile(oldFile, usage.oldImportsNeededByNewFile, usage.newFileImportsFromOldFile, changes, checker, useEsModuleSyntax, quotePreference);
+    updateImportsInOtherFiles(changes, program, host, oldFile, usage.movedSymbols, newFilename);
+    const imports = getNewFileImportsAndAddExportInOldFile(oldFile, usage.oldImportsNeededByNewFile, usage.newFileImportsFromOldFile, changes, checker, program, host, useEsModuleSyntax, quotePreference);
     const body = addExports(oldFile, toMove.all, usage.oldFileImportsFromNewFile, useEsModuleSyntax);
     if (imports.length && body.length) {
       return [
@@ -138254,7 +138287,7 @@ ${lanes.join("\n")}
       forEachImportInStatement(statement, (i) => deleteUnusedImports(oldFile, i, changes, (name) => toDelete.has(checker.getSymbolAtLocation(name))));
     }
   }
-  function updateImportsInOtherFiles(changes, program, oldFile, movedSymbols, newModuleName) {
+  function updateImportsInOtherFiles(changes, program, host, oldFile, movedSymbols, newFilename) {
     const checker = program.getTypeChecker();
     for (const sourceFile of program.getSourceFiles()) {
       if (sourceFile === oldFile)
@@ -138268,13 +138301,14 @@ ${lanes.join("\n")}
             return !!symbol && movedSymbols.has(symbol);
           };
           deleteUnusedImports(sourceFile, importNode, changes, shouldMove);
-          const newModuleSpecifier = combinePaths(getDirectoryPath(moduleSpecifierFromImport(importNode).text), newModuleName);
+          const pathToNewFileWithExtension = resolvePath(getDirectoryPath(oldFile.path), newFilename);
+          const newModuleSpecifier = getModuleSpecifier(program.getCompilerOptions(), sourceFile, sourceFile.path, pathToNewFileWithExtension, createModuleSpecifierResolutionHost(program, host));
           const newImportDeclaration = filterImport(importNode, factory.createStringLiteral(newModuleSpecifier), shouldMove);
           if (newImportDeclaration)
             changes.insertNodeAfter(sourceFile, statement, newImportDeclaration);
           const ns = getNamespaceLikeImport(importNode);
           if (ns)
-            updateNamespaceLikeImport(changes, sourceFile, checker, movedSymbols, newModuleName, newModuleSpecifier, ns, importNode);
+            updateNamespaceLikeImport(changes, sourceFile, checker, movedSymbols, newModuleSpecifier, ns, importNode);
         });
       }
     }
@@ -138291,8 +138325,8 @@ ${lanes.join("\n")}
         return Debug.assertNever(node, `Unexpected node kind ${node.kind}`);
     }
   }
-  function updateNamespaceLikeImport(changes, sourceFile, checker, movedSymbols, newModuleName, newModuleSpecifier, oldImportId, oldImportNode) {
-    const preferredNewNamespaceName = ts_codefix_exports.moduleSpecifierToValidIdentifier(newModuleName, 99 /* ESNext */);
+  function updateNamespaceLikeImport(changes, sourceFile, checker, movedSymbols, newModuleSpecifier, oldImportId, oldImportNode) {
+    const preferredNewNamespaceName = ts_codefix_exports.moduleSpecifierToValidIdentifier(newModuleSpecifier, 99 /* ESNext */);
     let needUniqueName = false;
     const toChange = [];
     ts_FindAllReferences_exports.Core.eachSymbolReferenceInFile(oldImportId, checker, sourceFile, (ref) => {
@@ -138308,7 +138342,7 @@ ${lanes.join("\n")}
       for (const ref of toChange) {
         changes.replaceNode(sourceFile, ref, factory.createIdentifier(newNamespaceName));
       }
-      changes.insertNodeAfter(sourceFile, oldImportNode, updateNamespaceLikeImportNode(oldImportNode, newModuleName, newModuleSpecifier));
+      changes.insertNodeAfter(sourceFile, oldImportNode, updateNamespaceLikeImportNode(oldImportNode, preferredNewNamespaceName, newModuleSpecifier));
     }
   }
   function updateNamespaceLikeImportNode(node, newNamespaceName, newModuleSpecifier) {
@@ -138349,7 +138383,7 @@ ${lanes.join("\n")}
       }
     }
   }
-  function createOldFileImportsFromNewFile(newFileNeedExport, newFileNameWithExtension, useEs6Imports, quotePreference) {
+  function createOldFileImportsFromNewFile(sourceFile, newFileNeedExport, newFileNameWithExtension, program, host, useEs6Imports, quotePreference) {
     let defaultImport;
     const imports = [];
     newFileNeedExport.forEach((symbol) => {
@@ -138359,17 +138393,18 @@ ${lanes.join("\n")}
         imports.push(symbol.name);
       }
     });
-    return makeImportOrRequire(defaultImport, imports, newFileNameWithExtension, useEs6Imports, quotePreference);
+    return makeImportOrRequire(sourceFile, defaultImport, imports, newFileNameWithExtension, program, host, useEs6Imports, quotePreference);
   }
-  function makeImportOrRequire(defaultImport, imports, path, useEs6Imports, quotePreference) {
-    path = ensurePathIsNonModuleName(path);
+  function makeImportOrRequire(sourceFile, defaultImport, imports, newFileNameWithExtension, program, host, useEs6Imports, quotePreference) {
+    const pathToNewFile = resolvePath(getDirectoryPath(sourceFile.path), newFileNameWithExtension);
+    const pathToNewFileWithCorrectExtension = getModuleSpecifier(program.getCompilerOptions(), sourceFile, sourceFile.path, pathToNewFile, createModuleSpecifierResolutionHost(program, host));
     if (useEs6Imports) {
       const specifiers = imports.map((i) => factory.createImportSpecifier(false, void 0, factory.createIdentifier(i)));
-      return makeImportIfNecessary(defaultImport, specifiers, path, quotePreference);
+      return makeImportIfNecessary(defaultImport, specifiers, pathToNewFileWithCorrectExtension, quotePreference);
     } else {
       Debug.assert(!defaultImport, "No default import should exist");
       const bindingElements = imports.map((i) => factory.createBindingElement(void 0, void 0, i));
-      return bindingElements.length ? makeVariableStatement(factory.createObjectBindingPattern(bindingElements), void 0, createRequireCall(factory.createStringLiteral(path))) : void 0;
+      return bindingElements.length ? makeVariableStatement(factory.createObjectBindingPattern(bindingElements), void 0, createRequireCall(factory.createStringLiteral(pathToNewFileWithCorrectExtension))) : void 0;
     }
   }
   function makeVariableStatement(name, type, initializer, flags = 2 /* Const */) {
@@ -138466,7 +138501,7 @@ ${lanes.join("\n")}
         break;
     }
   }
-  function getNewFileImportsAndAddExportInOldFile(oldFile, importsToCopy, newFileImportsFromOldFile, changes, checker, useEsModuleSyntax, quotePreference) {
+  function getNewFileImportsAndAddExportInOldFile(oldFile, importsToCopy, newFileImportsFromOldFile, changes, checker, program, host, useEsModuleSyntax, quotePreference) {
     const copiedOldImports = [];
     for (const oldStatement of oldFile.statements) {
       forEachImportInStatement(oldStatement, (i) => {
@@ -138497,19 +138532,19 @@ ${lanes.join("\n")}
         }
       }
     });
-    append(copiedOldImports, makeImportOrRequire(oldFileDefault, oldFileNamedImports, removeFileExtension(getBaseFileName(oldFile.fileName)), useEsModuleSyntax, quotePreference));
+    append(copiedOldImports, makeImportOrRequire(oldFile, oldFileDefault, oldFileNamedImports, getBaseFileName(oldFile.fileName), program, host, useEsModuleSyntax, quotePreference));
     return copiedOldImports;
   }
-  function makeUniqueModuleName(moduleName, extension, inDirectory, host) {
-    let newModuleName = moduleName;
+  function makeUniqueFilename(proposedFilename, extension, inDirectory, host) {
+    let newFilename = proposedFilename;
     for (let i = 1; ; i++) {
-      const name = combinePaths(inDirectory, newModuleName + extension);
+      const name = combinePaths(inDirectory, newFilename + extension);
       if (!host.fileExists(name))
-        return newModuleName;
-      newModuleName = `${moduleName}.${i}`;
+        return newFilename;
+      newFilename = `${proposedFilename}.${i}`;
     }
   }
-  function getNewModuleName(importsFromNewFile, movedSymbols) {
+  function inferNewFilename(importsFromNewFile, movedSymbols) {
     return importsFromNewFile.forEachEntry(symbolNameNoDefault) || movedSymbols.forEachEntry(symbolNameNoDefault) || "newFile";
   }
   function getUsageInfo(oldFile, toMove, checker) {
@@ -138783,6 +138818,7 @@ ${lanes.join("\n")}
   var init_moveToNewFile = __esm({
     "src/services/refactors/moveToNewFile.ts"() {
       "use strict";
+      init_moduleSpecifiers();
       init_ts4();
       init_ts_refactor();
       refactorName4 = "Move to a new file";