typescript 5.0.0-dev.20221206 → 5.0.0-dev.20221207

package/lib/typescript.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.20221207`;
       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) {
@@ -70304,7 +70335,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 +70353,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);
             }
           };
         }
@@ -100809,7 +100833,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);
     }
@@ -103554,6 +103578,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 +103606,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 +103635,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 +103796,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;
@@ -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 */);
@@ -104446,7 +104473,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 +104970,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 +105045,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 +105363,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 +105377,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 +105392,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 +105424,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 +105503,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 +105543,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 +105591,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) {
@@ -106129,7 +106164,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 +106230,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 +106370,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));
@@ -129648,6 +129680,7 @@ ${lanes.join("\n")}
       isTypeOnlyLocation,
       isJsxIdentifierExpected,
       isRightOfOpenTag,
+      isRightOfDotOrQuestionDot,
       importStatementCompletion,
       insideJsDocTagTypeExpression,
       symbolToSortTextMap,
@@ -129713,7 +129746,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);
@@ -131084,6 +131117,7 @@ ${lanes.join("\n")}
       isTypeOnlyLocation,
       isJsxIdentifierExpected,
       isRightOfOpenTag,
+      isRightOfDotOrQuestionDot: isRightOfDot || isRightOfQuestionDot,
       importStatementCompletion,
       hasUnresolvedAutoImports,
       flags
@@ -138178,10 +138212,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);
@@ -138224,7 +138265,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) {
@@ -138233,14 +138274,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 [
@@ -138268,7 +138309,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)
@@ -138282,13 +138323,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);
         });
       }
     }
@@ -138305,8 +138347,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) => {
@@ -138322,7 +138364,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) {
@@ -138363,7 +138405,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) => {
@@ -138373,17 +138415,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 */) {
@@ -138480,7 +138523,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) => {
@@ -138511,19 +138554,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) {
@@ -138797,6 +138840,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";