typescript 6.0.0-dev.20260115 → 6.0.0-dev.20260116

package/lib/_tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "6.0";
-var version = `${versionMajorMinor}.0-dev.20260115`;
+var version = `${versionMajorMinor}.0-dev.20260116`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -3615,7 +3615,7 @@ var TypeFlags = /* @__PURE__ */ ((TypeFlags2) => {
   TypeFlags2[TypeFlags2["Instantiable"] = 465829888] = "Instantiable";
   TypeFlags2[TypeFlags2["StructuredOrInstantiable"] = 469499904] = "StructuredOrInstantiable";
   TypeFlags2[TypeFlags2["ObjectFlagsType"] = 3899393] = "ObjectFlagsType";
-  TypeFlags2[TypeFlags2["Simplifiable"] = 25165824] = "Simplifiable";
+  TypeFlags2[TypeFlags2["Simplifiable"] = 29360128] = "Simplifiable";
   TypeFlags2[TypeFlags2["Singleton"] = 67358815] = "Singleton";
   TypeFlags2[TypeFlags2["Narrowable"] = 536624127] = "Narrowable";
   TypeFlags2[TypeFlags2["IncludesMask"] = 473694207] = "IncludesMask";
@@ -6926,6 +6926,7 @@ var Diagnostics = {
   The_current_host_does_not_support_the_0_option: diag(5001, 1 /* Error */, "The_current_host_does_not_support_the_0_option_5001", "The current host does not support the '{0}' option."),
   Cannot_find_the_common_subdirectory_path_for_the_input_files: diag(5009, 1 /* Error */, "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", "Cannot find the common subdirectory path for the input files."),
   File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: diag(5010, 1 /* Error */, "File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0_5010", "File specification cannot end in a recursive directory wildcard ('**'): '{0}'."),
+  The_common_source_directory_of_0_is_1_The_rootDir_setting_must_be_explicitly_set_to_this_or_another_path_to_adjust_your_output_s_file_layout: diag(5011, 1 /* Error */, "The_common_source_directory_of_0_is_1_The_rootDir_setting_must_be_explicitly_set_to_this_or_another__5011", "The common source directory of '{0}' is '{1}'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout."),
   Cannot_read_file_0_Colon_1: diag(5012, 1 /* Error */, "Cannot_read_file_0_Colon_1_5012", "Cannot read file '{0}': {1}."),
   Unknown_compiler_option_0: diag(5023, 1 /* Error */, "Unknown_compiler_option_0_5023", "Unknown compiler option '{0}'."),
   Compiler_option_0_requires_a_value_of_type_1: diag(5024, 1 /* Error */, "Compiler_option_0_requires_a_value_of_type_1_5024", "Compiler option '{0}' requires a value of type {1}."),
@@ -16572,7 +16573,7 @@ function sourceFileMayBeEmitted(sourceFile, host, forceDtsEmit) {
   if (host.getRedirectFromSourceFile(sourceFile.fileName)) return false;
   if (options.outFile) return true;
   if (!options.outDir) return false;
-  if (options.rootDir || options.composite && options.configFilePath) {
+  if (options.rootDir || options.configFilePath) {
     const commonDir = getNormalizedAbsolutePath(getCommonSourceDirectory(options, () => [], host.getCurrentDirectory(), host.getCanonicalFileName), host.getCurrentDirectory());
     const outputPath = getSourceFilePathInNewDirWorker(sourceFile.fileName, options.outDir, host.getCurrentDirectory(), commonDir, host.getCanonicalFileName);
     if (comparePaths(sourceFile.fileName, outputPath, host.getCurrentDirectory(), !host.useCaseSensitiveFileNames()) === 0 /* EqualTo */) return false;
@@ -41717,7 +41718,7 @@ function getLoadModuleFromTargetExportOrImport(extensions, state, cache, redirec
       if (!state.isConfigLookup && (state.compilerOptions.declarationDir || state.compilerOptions.outDir) && !finalPath.includes("/node_modules/") && (state.compilerOptions.configFile ? containsPath(scope.packageDirectory, toAbsolutePath(state.compilerOptions.configFile.fileName), !useCaseSensitiveFileNames(state)) : true)) {
         const getCanonicalFileName = hostGetCanonicalFileName({ useCaseSensitiveFileNames: () => useCaseSensitiveFileNames(state) });
         const commonSourceDirGuesses = [];
-        if (state.compilerOptions.rootDir || state.compilerOptions.composite && state.compilerOptions.configFilePath) {
+        if (state.compilerOptions.rootDir || state.compilerOptions.configFilePath) {
           const commonDir = toAbsolutePath(getCommonSourceDirectory(state.compilerOptions, () => [], ((_b2 = (_a2 = state.host).getCurrentDirectory) == null ? void 0 : _b2.call(_a2)) || "", getCanonicalFileName));
           commonSourceDirGuesses.push(commonDir);
         } else if (state.requestContainingDirectory) {
@@ -58837,6 +58838,12 @@ function createTypeChecker(host) {
         return t.flags & 1048576 /* Union */ && baseTypes.length === types.length ? getUnionType(baseTypes) : t.flags & 2097152 /* Intersection */ && baseTypes.length ? getIntersectionType(baseTypes) : void 0;
       }
       if (t.flags & 4194304 /* Index */) {
+        if (isGenericMappedType(t.type)) {
+          const mappedType = t.type;
+          if (getNameTypeFromMappedType(mappedType) && !isMappedTypeWithKeyofConstraintDeclaration(mappedType)) {
+            return getBaseConstraint(getIndexTypeForMappedType(mappedType, 0 /* None */));
+          }
+        }
         return stringNumberSymbolType;
       }
       if (t.flags & 134217728 /* TemplateLiteral */) {
@@ -61812,13 +61819,6 @@ function createTypeChecker(host) {
       keyTypes.push(propNameType === stringType ? stringOrNumberType : propNameType);
     }
   }
-  function hasDistributiveNameType(mappedType) {
-    const typeVariable = getTypeParameterFromMappedType(mappedType);
-    return isDistributive(getNameTypeFromMappedType(mappedType) || typeVariable);
-    function isDistributive(type) {
-      return type.flags & (3 /* AnyOrUnknown */ | 402784252 /* Primitive */ | 131072 /* Never */ | 262144 /* TypeParameter */ | 524288 /* Object */ | 67108864 /* NonPrimitive */) ? true : type.flags & 16777216 /* Conditional */ ? type.root.isDistributive && type.checkType === typeVariable : type.flags & (3145728 /* UnionOrIntersection */ | 134217728 /* TemplateLiteral */) ? every(type.types, isDistributive) : type.flags & 8388608 /* IndexedAccess */ ? isDistributive(type.objectType) && isDistributive(type.indexType) : type.flags & 33554432 /* Substitution */ ? isDistributive(type.baseType) && isDistributive(type.constraint) : type.flags & 268435456 /* StringMapping */ ? isDistributive(type.type) : false;
-    }
-  }
   function getLiteralTypeFromPropertyName(name) {
     if (isPrivateIdentifier(name)) {
       return neverType;
@@ -61869,7 +61869,7 @@ function createTypeChecker(host) {
     );
   }
   function shouldDeferIndexType(type, indexFlags = 0 /* None */) {
-    return !!(type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericTupleType(type) || isGenericMappedType(type) && (!hasDistributiveNameType(type) || getMappedTypeNameTypeKind(type) === 2 /* Remapping */) || type.flags & 1048576 /* Union */ && !(indexFlags & 4 /* NoReducibleCheck */) && isGenericReducibleType(type) || type.flags & 2097152 /* Intersection */ && maybeTypeOfKind(type, 465829888 /* Instantiable */) && some(type.types, isEmptyAnonymousObjectType));
+    return !!(type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericTupleType(type) || isGenericMappedType(type) && getNameTypeFromMappedType(type) || type.flags & 1048576 /* Union */ && !(indexFlags & 4 /* NoReducibleCheck */) && isGenericReducibleType(type) || type.flags & 2097152 /* Intersection */ && maybeTypeOfKind(type, 465829888 /* Instantiable */) && some(type.types, isEmptyAnonymousObjectType));
   }
   function getIndexType(type, indexFlags = 0 /* None */) {
     type = getReducedType(type);
@@ -62311,7 +62311,7 @@ function createTypeChecker(host) {
     return (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type) || isGenericTupleType(type) ? 4194304 /* IsGenericObjectType */ : 0) | (type.flags & (58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */) || isGenericStringLikeType(type) ? 8388608 /* IsGenericIndexType */ : 0);
   }
   function getSimplifiedType(type, writing) {
-    return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type, writing) : type.flags & 16777216 /* Conditional */ ? getSimplifiedConditionalType(type, writing) : type;
+    return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type, writing) : type.flags & 16777216 /* Conditional */ ? getSimplifiedConditionalType(type, writing) : type.flags & 4194304 /* Index */ ? getSimplifiedIndexType(type) : type;
   }
   function distributeIndexOverObjectType(objectType, indexType, writing) {
     if (objectType.flags & 1048576 /* Union */ || objectType.flags & 2097152 /* Intersection */ && !shouldDeferIndexType(objectType)) {
@@ -62382,6 +62382,12 @@ function createTypeChecker(host) {
     }
     return type;
   }
+  function getSimplifiedIndexType(type) {
+    if (isGenericMappedType(type.type) && getNameTypeFromMappedType(type.type) && !isMappedTypeWithKeyofConstraintDeclaration(type.type)) {
+      return getIndexTypeForMappedType(type.type, 0 /* None */);
+    }
+    return type;
+  }
   function isIntersectionEmpty(type1, type2) {
     return !!(getUnionType([intersectTypes(type1, type2), neverType]).flags & 131072 /* Never */);
   }
@@ -64658,7 +64664,7 @@ function createTypeChecker(host) {
   }
   function getNormalizedType(type, writing) {
     while (true) {
-      const t = isFreshLiteralType(type) ? type.regularType : isGenericTupleType(type) ? getNormalizedTupleType(type, writing) : getObjectFlags(type) & 4 /* Reference */ ? type.node ? createTypeReference(type.target, getTypeArguments(type)) : getSingleBaseForNonAugmentingSubtype(type) || type : type.flags & 3145728 /* UnionOrIntersection */ ? getNormalizedUnionOrIntersectionType(type, writing) : type.flags & 33554432 /* Substitution */ ? writing ? type.baseType : getSubstitutionIntersection(type) : type.flags & 25165824 /* Simplifiable */ ? getSimplifiedType(type, writing) : type;
+      const t = isFreshLiteralType(type) ? type.regularType : isGenericTupleType(type) ? getNormalizedTupleType(type, writing) : getObjectFlags(type) & 4 /* Reference */ ? type.node ? createTypeReference(type.target, getTypeArguments(type)) : getSingleBaseForNonAugmentingSubtype(type) || type : type.flags & 3145728 /* UnionOrIntersection */ ? getNormalizedUnionOrIntersectionType(type, writing) : type.flags & 33554432 /* Substitution */ ? writing ? type.baseType : getSubstitutionIntersection(type) : type.flags & 29360128 /* Simplifiable */ ? getSimplifiedType(type, writing) : type;
       if (t === type) return t;
       type = t;
     }
@@ -64688,7 +64694,7 @@ function createTypeChecker(host) {
   }
   function getNormalizedTupleType(type, writing) {
     const elements = getElementTypes(type);
-    const normalizedElements = sameMap(elements, (t) => t.flags & 25165824 /* Simplifiable */ ? getSimplifiedType(t, writing) : t);
+    const normalizedElements = sameMap(elements, (t) => t.flags & 29360128 /* Simplifiable */ ? getSimplifiedType(t, writing) : t);
     return elements !== normalizedElements ? createNormalizedTupleType(type.target, normalizedElements) : type;
   }
   function checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain, errorOutputContainer) {
@@ -81724,9 +81730,8 @@ function createTypeChecker(host) {
     }
     const objectType = type.objectType;
     const indexType = type.indexType;
-    const objectIndexType = isGenericMappedType(objectType) && getMappedTypeNameTypeKind(objectType) === 2 /* Remapping */ ? getIndexTypeForMappedType(objectType, 0 /* None */) : getIndexType(objectType, 0 /* None */);
     const hasNumberIndexInfo = !!getIndexInfoOfType(objectType, numberType);
-    if (everyType(indexType, (t) => isTypeAssignableTo(t, objectIndexType) || hasNumberIndexInfo && isApplicableIndexType(t, numberType))) {
+    if (everyType(indexType, (t) => isTypeAssignableTo(t, getIndexType(objectType, 0 /* None */)) || hasNumberIndexInfo && isApplicableIndexType(t, numberType))) {
       if (accessNode.kind === 213 /* ElementAccessExpression */ && isAssignmentTarget(accessNode) && getObjectFlags(objectType) & 32 /* Mapped */ && getMappedTypeModifiers(objectType) & 1 /* IncludeReadonly */) {
         error(accessNode, Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
       }
@@ -115945,7 +115950,7 @@ function getCommonSourceDirectory(options, emittedFiles, currentDirectory, getCa
   if (options.rootDir) {
     commonSourceDirectory = getNormalizedAbsolutePath(options.rootDir, currentDirectory);
     checkSourceFilesBelongToPath == null ? void 0 : checkSourceFilesBelongToPath(options.rootDir);
-  } else if (options.composite && options.configFilePath) {
+  } else if (options.configFilePath) {
     commonSourceDirectory = getDirectoryPath(normalizeSlashes(options.configFilePath));
     checkSourceFilesBelongToPath == null ? void 0 : checkSourceFilesBelongToPath(commonSourceDirectory);
   } else {
@@ -115956,6 +115961,13 @@ function getCommonSourceDirectory(options, emittedFiles, currentDirectory, getCa
   }
   return commonSourceDirectory;
 }
+function getComputedCommonSourceDirectory(emittedFiles, currentDirectory, getCanonicalFileName) {
+  let commonSourceDirectory = computeCommonSourceDirectoryOfFilenames(emittedFiles, currentDirectory, getCanonicalFileName);
+  if (commonSourceDirectory && commonSourceDirectory[commonSourceDirectory.length - 1] !== directorySeparator) {
+    commonSourceDirectory += directorySeparator;
+  }
+  return commonSourceDirectory;
+}
 function getCommonSourceDirectoryOfConfig({ options, fileNames }, ignoreCase) {
   return getCommonSourceDirectory(
     options,
@@ -124388,6 +124400,31 @@ function createProgram(_rootNamesOrOptions, _options, _host, _oldProgram, _confi
         createDiagnosticForOptionName(Diagnostics.Cannot_find_the_common_subdirectory_path_for_the_input_files, "outDir");
       }
     }
+    if (!options.noEmit && !options.composite && !options.rootDir && options.configFilePath && (options.outDir || // there is --outDir specified
+    getEmitDeclarations(options) && options.declarationDir || // there is --declarationDir specified
+    options.outFile)) {
+      const dir = getCommonSourceDirectory2();
+      const emittedFiles = mapDefined(files, (file) => !file.isDeclarationFile && sourceFileMayBeEmitted(file, program) ? file.fileName : void 0);
+      const dir59 = getComputedCommonSourceDirectory(emittedFiles, currentDirectory, getCanonicalFileName);
+      if (dir59 !== "" && getCanonicalFileName(dir) !== getCanonicalFileName(dir59)) {
+        createDiagnosticForOption(
+          /*onKey*/
+          true,
+          options.outFile ? "outFile" : options.outDir ? "outDir" : "declarationDir",
+          !options.outFile && options.outDir ? "declarationDir" : void 0,
+          chainDiagnosticMessages(
+            chainDiagnosticMessages(
+              /*details*/
+              void 0,
+              Diagnostics.Visit_https_Colon_Slash_Slashaka_ms_Slashts6_for_migration_information
+            ),
+            Diagnostics.The_common_source_directory_of_0_is_1_The_rootDir_setting_must_be_explicitly_set_to_this_or_another_path_to_adjust_your_output_s_file_layout,
+            getBaseFileName(options.configFilePath),
+            getRelativePathFromFile(options.configFilePath, dir59, getCanonicalFileName)
+          )
+        );
+      }
+    }
     if (options.checkJs && !getAllowJSCompilerOption(options)) {
       createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "checkJs", "allowJs");
     }
@@ -127811,7 +127848,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     shouldRetryResolution,
     logChanges
   }) {
-    var _a;
+    var _a, _b;
     const path = resolutionHost.toPath(containingFile);
     const resolutionsInFile = perFileCache.get(path) || perFileCache.set(path, createModeAwareCache()).get(path);
     const resolvedModules = [];
@@ -127832,7 +127869,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
           resolutionHost.onDiscoveredSymlink();
         }
         resolutionsInFile.set(name, mode, resolution);
-        if (resolution !== existingResolution) {
+        if (resolution !== existingResolution && !((_b = resolutionHost.skipWatchingFailedLookups) == null ? void 0 : _b.call(resolutionHost, path))) {
           watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, path, getResolutionWithResolvedFileName, deferWatchingNonRelativeResolution);
           if (existingResolution) {
             stopWatchFailedLookupLocationOfResolution(existingResolution, path, getResolutionWithResolvedFileName);
@@ -127869,8 +127906,11 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     );
     if (resolutionsInFile.size() !== seenNamesInFile.size()) {
       resolutionsInFile.forEach((resolution, name, mode) => {
+        var _a2;
         if (!seenNamesInFile.has(name, mode)) {
-          stopWatchFailedLookupLocationOfResolution(resolution, path, getResolutionWithResolvedFileName);
+          if (!((_a2 = resolutionHost.skipWatchingFailedLookups) == null ? void 0 : _a2.call(resolutionHost, path))) {
+            stopWatchFailedLookupLocationOfResolution(resolution, path, getResolutionWithResolvedFileName);
+          }
           resolutionsInFile.delete(name, mode);
         }
       });
@@ -128284,15 +128324,18 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     }, nonRecursive ? 0 /* None */ : 1 /* Recursive */);
   }
   function removeResolutionsOfFileFromCache(cache, filePath, getResolutionWithResolvedFileName) {
+    var _a;
     const resolutions = cache.get(filePath);
     if (resolutions) {
-      resolutions.forEach(
-        (resolution) => stopWatchFailedLookupLocationOfResolution(
-          resolution,
-          filePath,
-          getResolutionWithResolvedFileName
-        )
-      );
+      if (!((_a = resolutionHost.skipWatchingFailedLookups) == null ? void 0 : _a.call(resolutionHost, filePath))) {
+        resolutions.forEach(
+          (resolution) => stopWatchFailedLookupLocationOfResolution(
+            resolution,
+            filePath,
+            getResolutionWithResolvedFileName
+          )
+        );
+      }
       cache.delete(filePath);
     }
   }
@@ -128447,11 +128490,16 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     }, 1 /* Recursive */) : noopFileWatcher;
   }
   function updateTypeRootsWatch() {
+    var _a;
     const options = resolutionHost.getCompilationSettings();
     if (options.types) {
       closeTypeRootsWatch();
       return;
     }
+    if (!isRootWatchable || ((_a = resolutionHost.skipWatchingTypeRoots) == null ? void 0 : _a.call(resolutionHost))) {
+      closeTypeRootsWatch();
+      return;
+    }
     const typeRoots = getEffectiveTypeRoots(options, { getCurrentDirectory });
     if (typeRoots) {
       mutateMap(

package/lib/typescript.js

@@ -673,6 +673,7 @@ __export(typescript_exports, {
   getCommonSourceDirectory: () => getCommonSourceDirectory,
   getCommonSourceDirectoryOfConfig: () => getCommonSourceDirectoryOfConfig,
   getCompilerOptionValue: () => getCompilerOptionValue,
+  getComputedCommonSourceDirectory: () => getComputedCommonSourceDirectory,
   getConditions: () => getConditions,
   getConfigFileParsingDiagnostics: () => getConfigFileParsingDiagnostics,
   getConstantValue: () => getConstantValue,
@@ -2285,7 +2286,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "6.0";
-var version = `${versionMajorMinor}.0-dev.20260115`;
+var version = `${versionMajorMinor}.0-dev.20260116`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -6487,7 +6488,7 @@ var TypeFlags = /* @__PURE__ */ ((TypeFlags2) => {
   TypeFlags2[TypeFlags2["Instantiable"] = 465829888] = "Instantiable";
   TypeFlags2[TypeFlags2["StructuredOrInstantiable"] = 469499904] = "StructuredOrInstantiable";
   TypeFlags2[TypeFlags2["ObjectFlagsType"] = 3899393] = "ObjectFlagsType";
-  TypeFlags2[TypeFlags2["Simplifiable"] = 25165824] = "Simplifiable";
+  TypeFlags2[TypeFlags2["Simplifiable"] = 29360128] = "Simplifiable";
   TypeFlags2[TypeFlags2["Singleton"] = 67358815] = "Singleton";
   TypeFlags2[TypeFlags2["Narrowable"] = 536624127] = "Narrowable";
   TypeFlags2[TypeFlags2["IncludesMask"] = 473694207] = "IncludesMask";
@@ -10326,6 +10327,7 @@ var Diagnostics = {
   The_current_host_does_not_support_the_0_option: diag(5001, 1 /* Error */, "The_current_host_does_not_support_the_0_option_5001", "The current host does not support the '{0}' option."),
   Cannot_find_the_common_subdirectory_path_for_the_input_files: diag(5009, 1 /* Error */, "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", "Cannot find the common subdirectory path for the input files."),
   File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: diag(5010, 1 /* Error */, "File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0_5010", "File specification cannot end in a recursive directory wildcard ('**'): '{0}'."),
+  The_common_source_directory_of_0_is_1_The_rootDir_setting_must_be_explicitly_set_to_this_or_another_path_to_adjust_your_output_s_file_layout: diag(5011, 1 /* Error */, "The_common_source_directory_of_0_is_1_The_rootDir_setting_must_be_explicitly_set_to_this_or_another__5011", "The common source directory of '{0}' is '{1}'. The 'rootDir' setting must be explicitly set to this or another path to adjust your output's file layout."),
   Cannot_read_file_0_Colon_1: diag(5012, 1 /* Error */, "Cannot_read_file_0_Colon_1_5012", "Cannot read file '{0}': {1}."),
   Unknown_compiler_option_0: diag(5023, 1 /* Error */, "Unknown_compiler_option_0_5023", "Unknown compiler option '{0}'."),
   Compiler_option_0_requires_a_value_of_type_1: diag(5024, 1 /* Error */, "Compiler_option_0_requires_a_value_of_type_1_5024", "Compiler option '{0}' requires a value of type {1}."),
@@ -20398,7 +20400,7 @@ function sourceFileMayBeEmitted(sourceFile, host, forceDtsEmit) {
   if (host.getRedirectFromSourceFile(sourceFile.fileName)) return false;
   if (options.outFile) return true;
   if (!options.outDir) return false;
-  if (options.rootDir || options.composite && options.configFilePath) {
+  if (options.rootDir || options.configFilePath) {
     const commonDir = getNormalizedAbsolutePath(getCommonSourceDirectory(options, () => [], host.getCurrentDirectory(), host.getCanonicalFileName), host.getCurrentDirectory());
     const outputPath = getSourceFilePathInNewDirWorker(sourceFile.fileName, options.outDir, host.getCurrentDirectory(), commonDir, host.getCanonicalFileName);
     if (comparePaths(sourceFile.fileName, outputPath, host.getCurrentDirectory(), !host.useCaseSensitiveFileNames()) === 0 /* EqualTo */) return false;
@@ -46227,7 +46229,7 @@ function getLoadModuleFromTargetExportOrImport(extensions, state, cache, redirec
       if (!state.isConfigLookup && (state.compilerOptions.declarationDir || state.compilerOptions.outDir) && !finalPath.includes("/node_modules/") && (state.compilerOptions.configFile ? containsPath(scope.packageDirectory, toAbsolutePath(state.compilerOptions.configFile.fileName), !useCaseSensitiveFileNames(state)) : true)) {
         const getCanonicalFileName = hostGetCanonicalFileName({ useCaseSensitiveFileNames: () => useCaseSensitiveFileNames(state) });
         const commonSourceDirGuesses = [];
-        if (state.compilerOptions.rootDir || state.compilerOptions.composite && state.compilerOptions.configFilePath) {
+        if (state.compilerOptions.rootDir || state.compilerOptions.configFilePath) {
           const commonDir = toAbsolutePath(getCommonSourceDirectory(state.compilerOptions, () => [], ((_b2 = (_a2 = state.host).getCurrentDirectory) == null ? void 0 : _b2.call(_a2)) || "", getCanonicalFileName));
           commonSourceDirGuesses.push(commonDir);
         } else if (state.requestContainingDirectory) {
@@ -63465,6 +63467,12 @@ function createTypeChecker(host) {
         return t.flags & 1048576 /* Union */ && baseTypes.length === types.length ? getUnionType(baseTypes) : t.flags & 2097152 /* Intersection */ && baseTypes.length ? getIntersectionType(baseTypes) : void 0;
       }
       if (t.flags & 4194304 /* Index */) {
+        if (isGenericMappedType(t.type)) {
+          const mappedType = t.type;
+          if (getNameTypeFromMappedType(mappedType) && !isMappedTypeWithKeyofConstraintDeclaration(mappedType)) {
+            return getBaseConstraint(getIndexTypeForMappedType(mappedType, 0 /* None */));
+          }
+        }
         return stringNumberSymbolType;
       }
       if (t.flags & 134217728 /* TemplateLiteral */) {
@@ -66440,13 +66448,6 @@ function createTypeChecker(host) {
       keyTypes.push(propNameType === stringType ? stringOrNumberType : propNameType);
     }
   }
-  function hasDistributiveNameType(mappedType) {
-    const typeVariable = getTypeParameterFromMappedType(mappedType);
-    return isDistributive(getNameTypeFromMappedType(mappedType) || typeVariable);
-    function isDistributive(type) {
-      return type.flags & (3 /* AnyOrUnknown */ | 402784252 /* Primitive */ | 131072 /* Never */ | 262144 /* TypeParameter */ | 524288 /* Object */ | 67108864 /* NonPrimitive */) ? true : type.flags & 16777216 /* Conditional */ ? type.root.isDistributive && type.checkType === typeVariable : type.flags & (3145728 /* UnionOrIntersection */ | 134217728 /* TemplateLiteral */) ? every(type.types, isDistributive) : type.flags & 8388608 /* IndexedAccess */ ? isDistributive(type.objectType) && isDistributive(type.indexType) : type.flags & 33554432 /* Substitution */ ? isDistributive(type.baseType) && isDistributive(type.constraint) : type.flags & 268435456 /* StringMapping */ ? isDistributive(type.type) : false;
-    }
-  }
   function getLiteralTypeFromPropertyName(name) {
     if (isPrivateIdentifier(name)) {
       return neverType;
@@ -66497,7 +66498,7 @@ function createTypeChecker(host) {
     );
   }
   function shouldDeferIndexType(type, indexFlags = 0 /* None */) {
-    return !!(type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericTupleType(type) || isGenericMappedType(type) && (!hasDistributiveNameType(type) || getMappedTypeNameTypeKind(type) === 2 /* Remapping */) || type.flags & 1048576 /* Union */ && !(indexFlags & 4 /* NoReducibleCheck */) && isGenericReducibleType(type) || type.flags & 2097152 /* Intersection */ && maybeTypeOfKind(type, 465829888 /* Instantiable */) && some(type.types, isEmptyAnonymousObjectType));
+    return !!(type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericTupleType(type) || isGenericMappedType(type) && getNameTypeFromMappedType(type) || type.flags & 1048576 /* Union */ && !(indexFlags & 4 /* NoReducibleCheck */) && isGenericReducibleType(type) || type.flags & 2097152 /* Intersection */ && maybeTypeOfKind(type, 465829888 /* Instantiable */) && some(type.types, isEmptyAnonymousObjectType));
   }
   function getIndexType(type, indexFlags = 0 /* None */) {
     type = getReducedType(type);
@@ -66939,7 +66940,7 @@ function createTypeChecker(host) {
     return (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type) || isGenericTupleType(type) ? 4194304 /* IsGenericObjectType */ : 0) | (type.flags & (58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */) || isGenericStringLikeType(type) ? 8388608 /* IsGenericIndexType */ : 0);
   }
   function getSimplifiedType(type, writing) {
-    return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type, writing) : type.flags & 16777216 /* Conditional */ ? getSimplifiedConditionalType(type, writing) : type;
+    return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type, writing) : type.flags & 16777216 /* Conditional */ ? getSimplifiedConditionalType(type, writing) : type.flags & 4194304 /* Index */ ? getSimplifiedIndexType(type) : type;
   }
   function distributeIndexOverObjectType(objectType, indexType, writing) {
     if (objectType.flags & 1048576 /* Union */ || objectType.flags & 2097152 /* Intersection */ && !shouldDeferIndexType(objectType)) {
@@ -67010,6 +67011,12 @@ function createTypeChecker(host) {
     }
     return type;
   }
+  function getSimplifiedIndexType(type) {
+    if (isGenericMappedType(type.type) && getNameTypeFromMappedType(type.type) && !isMappedTypeWithKeyofConstraintDeclaration(type.type)) {
+      return getIndexTypeForMappedType(type.type, 0 /* None */);
+    }
+    return type;
+  }
   function isIntersectionEmpty(type1, type2) {
     return !!(getUnionType([intersectTypes(type1, type2), neverType]).flags & 131072 /* Never */);
   }
@@ -69286,7 +69293,7 @@ function createTypeChecker(host) {
   }
   function getNormalizedType(type, writing) {
     while (true) {
-      const t = isFreshLiteralType(type) ? type.regularType : isGenericTupleType(type) ? getNormalizedTupleType(type, writing) : getObjectFlags(type) & 4 /* Reference */ ? type.node ? createTypeReference(type.target, getTypeArguments(type)) : getSingleBaseForNonAugmentingSubtype(type) || type : type.flags & 3145728 /* UnionOrIntersection */ ? getNormalizedUnionOrIntersectionType(type, writing) : type.flags & 33554432 /* Substitution */ ? writing ? type.baseType : getSubstitutionIntersection(type) : type.flags & 25165824 /* Simplifiable */ ? getSimplifiedType(type, writing) : type;
+      const t = isFreshLiteralType(type) ? type.regularType : isGenericTupleType(type) ? getNormalizedTupleType(type, writing) : getObjectFlags(type) & 4 /* Reference */ ? type.node ? createTypeReference(type.target, getTypeArguments(type)) : getSingleBaseForNonAugmentingSubtype(type) || type : type.flags & 3145728 /* UnionOrIntersection */ ? getNormalizedUnionOrIntersectionType(type, writing) : type.flags & 33554432 /* Substitution */ ? writing ? type.baseType : getSubstitutionIntersection(type) : type.flags & 29360128 /* Simplifiable */ ? getSimplifiedType(type, writing) : type;
       if (t === type) return t;
       type = t;
     }
@@ -69316,7 +69323,7 @@ function createTypeChecker(host) {
   }
   function getNormalizedTupleType(type, writing) {
     const elements = getElementTypes(type);
-    const normalizedElements = sameMap(elements, (t) => t.flags & 25165824 /* Simplifiable */ ? getSimplifiedType(t, writing) : t);
+    const normalizedElements = sameMap(elements, (t) => t.flags & 29360128 /* Simplifiable */ ? getSimplifiedType(t, writing) : t);
     return elements !== normalizedElements ? createNormalizedTupleType(type.target, normalizedElements) : type;
   }
   function checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain, errorOutputContainer) {
@@ -86352,9 +86359,8 @@ function createTypeChecker(host) {
     }
     const objectType = type.objectType;
     const indexType = type.indexType;
-    const objectIndexType = isGenericMappedType(objectType) && getMappedTypeNameTypeKind(objectType) === 2 /* Remapping */ ? getIndexTypeForMappedType(objectType, 0 /* None */) : getIndexType(objectType, 0 /* None */);
     const hasNumberIndexInfo = !!getIndexInfoOfType(objectType, numberType);
-    if (everyType(indexType, (t) => isTypeAssignableTo(t, objectIndexType) || hasNumberIndexInfo && isApplicableIndexType(t, numberType))) {
+    if (everyType(indexType, (t) => isTypeAssignableTo(t, getIndexType(objectType, 0 /* None */)) || hasNumberIndexInfo && isApplicableIndexType(t, numberType))) {
       if (accessNode.kind === 213 /* ElementAccessExpression */ && isAssignmentTarget(accessNode) && getObjectFlags(objectType) & 32 /* Mapped */ && getMappedTypeModifiers(objectType) & 1 /* IncludeReadonly */) {
         error2(accessNode, Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
       }
@@ -120755,7 +120761,7 @@ function getCommonSourceDirectory(options, emittedFiles, currentDirectory, getCa
   if (options.rootDir) {
     commonSourceDirectory = getNormalizedAbsolutePath(options.rootDir, currentDirectory);
     checkSourceFilesBelongToPath == null ? void 0 : checkSourceFilesBelongToPath(options.rootDir);
-  } else if (options.composite && options.configFilePath) {
+  } else if (options.configFilePath) {
     commonSourceDirectory = getDirectoryPath(normalizeSlashes(options.configFilePath));
     checkSourceFilesBelongToPath == null ? void 0 : checkSourceFilesBelongToPath(commonSourceDirectory);
   } else {
@@ -120766,6 +120772,13 @@ function getCommonSourceDirectory(options, emittedFiles, currentDirectory, getCa
   }
   return commonSourceDirectory;
 }
+function getComputedCommonSourceDirectory(emittedFiles, currentDirectory, getCanonicalFileName) {
+  let commonSourceDirectory = computeCommonSourceDirectoryOfFilenames(emittedFiles, currentDirectory, getCanonicalFileName);
+  if (commonSourceDirectory && commonSourceDirectory[commonSourceDirectory.length - 1] !== directorySeparator) {
+    commonSourceDirectory += directorySeparator;
+  }
+  return commonSourceDirectory;
+}
 function getCommonSourceDirectoryOfConfig({ options, fileNames }, ignoreCase) {
   return getCommonSourceDirectory(
     options,
@@ -129255,6 +129268,31 @@ function createProgram(_rootNamesOrOptions, _options, _host, _oldProgram, _confi
         createDiagnosticForOptionName(Diagnostics.Cannot_find_the_common_subdirectory_path_for_the_input_files, "outDir");
       }
     }
+    if (!options.noEmit && !options.composite && !options.rootDir && options.configFilePath && (options.outDir || // there is --outDir specified
+    getEmitDeclarations(options) && options.declarationDir || // there is --declarationDir specified
+    options.outFile)) {
+      const dir = getCommonSourceDirectory2();
+      const emittedFiles = mapDefined(files, (file) => !file.isDeclarationFile && sourceFileMayBeEmitted(file, program) ? file.fileName : void 0);
+      const dir59 = getComputedCommonSourceDirectory(emittedFiles, currentDirectory, getCanonicalFileName);
+      if (dir59 !== "" && getCanonicalFileName(dir) !== getCanonicalFileName(dir59)) {
+        createDiagnosticForOption(
+          /*onKey*/
+          true,
+          options.outFile ? "outFile" : options.outDir ? "outDir" : "declarationDir",
+          !options.outFile && options.outDir ? "declarationDir" : void 0,
+          chainDiagnosticMessages(
+            chainDiagnosticMessages(
+              /*details*/
+              void 0,
+              Diagnostics.Visit_https_Colon_Slash_Slashaka_ms_Slashts6_for_migration_information
+            ),
+            Diagnostics.The_common_source_directory_of_0_is_1_The_rootDir_setting_must_be_explicitly_set_to_this_or_another_path_to_adjust_your_output_s_file_layout,
+            getBaseFileName(options.configFilePath),
+            getRelativePathFromFile(options.configFilePath, dir59, getCanonicalFileName)
+          )
+        );
+      }
+    }
     if (options.checkJs && !getAllowJSCompilerOption(options)) {
       createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "checkJs", "allowJs");
     }
@@ -132739,7 +132777,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     shouldRetryResolution,
     logChanges
   }) {
-    var _a;
+    var _a, _b;
     const path = resolutionHost.toPath(containingFile);
     const resolutionsInFile = perFileCache.get(path) || perFileCache.set(path, createModeAwareCache()).get(path);
     const resolvedModules = [];
@@ -132760,7 +132798,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
           resolutionHost.onDiscoveredSymlink();
         }
         resolutionsInFile.set(name, mode, resolution);
-        if (resolution !== existingResolution) {
+        if (resolution !== existingResolution && !((_b = resolutionHost.skipWatchingFailedLookups) == null ? void 0 : _b.call(resolutionHost, path))) {
           watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, path, getResolutionWithResolvedFileName, deferWatchingNonRelativeResolution);
           if (existingResolution) {
             stopWatchFailedLookupLocationOfResolution(existingResolution, path, getResolutionWithResolvedFileName);
@@ -132797,8 +132835,11 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     );
     if (resolutionsInFile.size() !== seenNamesInFile.size()) {
       resolutionsInFile.forEach((resolution, name, mode) => {
+        var _a2;
         if (!seenNamesInFile.has(name, mode)) {
-          stopWatchFailedLookupLocationOfResolution(resolution, path, getResolutionWithResolvedFileName);
+          if (!((_a2 = resolutionHost.skipWatchingFailedLookups) == null ? void 0 : _a2.call(resolutionHost, path))) {
+            stopWatchFailedLookupLocationOfResolution(resolution, path, getResolutionWithResolvedFileName);
+          }
           resolutionsInFile.delete(name, mode);
         }
       });
@@ -133212,15 +133253,18 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     }, nonRecursive ? 0 /* None */ : 1 /* Recursive */);
   }
   function removeResolutionsOfFileFromCache(cache, filePath, getResolutionWithResolvedFileName) {
+    var _a;
     const resolutions = cache.get(filePath);
     if (resolutions) {
-      resolutions.forEach(
-        (resolution) => stopWatchFailedLookupLocationOfResolution(
-          resolution,
-          filePath,
-          getResolutionWithResolvedFileName
-        )
-      );
+      if (!((_a = resolutionHost.skipWatchingFailedLookups) == null ? void 0 : _a.call(resolutionHost, filePath))) {
+        resolutions.forEach(
+          (resolution) => stopWatchFailedLookupLocationOfResolution(
+            resolution,
+            filePath,
+            getResolutionWithResolvedFileName
+          )
+        );
+      }
       cache.delete(filePath);
     }
   }
@@ -133375,11 +133419,16 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     }, 1 /* Recursive */) : noopFileWatcher;
   }
   function updateTypeRootsWatch() {
+    var _a;
     const options = resolutionHost.getCompilationSettings();
     if (options.types) {
       closeTypeRootsWatch();
       return;
     }
+    if (!isRootWatchable || ((_a = resolutionHost.skipWatchingTypeRoots) == null ? void 0 : _a.call(resolutionHost))) {
+      closeTypeRootsWatch();
+      return;
+    }
     const typeRoots = getEffectiveTypeRoots(options, { getCurrentDirectory });
     if (typeRoots) {
       mutateMap(
@@ -184024,6 +184073,7 @@ __export(ts_exports2, {
   getCommonSourceDirectory: () => getCommonSourceDirectory,
   getCommonSourceDirectoryOfConfig: () => getCommonSourceDirectoryOfConfig,
   getCompilerOptionValue: () => getCompilerOptionValue,
+  getComputedCommonSourceDirectory: () => getComputedCommonSourceDirectory,
   getConditions: () => getConditions,
   getConfigFileParsingDiagnostics: () => getConfigFileParsingDiagnostics,
   getConstantValue: () => getConstantValue,
@@ -188142,6 +188192,9 @@ var Project2 = class _Project {
   }
   /** @internal */
   watchTypingLocations(files) {
+    if (this.currentDirectory === this.projectService.currentDirectory || !canWatchDirectoryOrFilePath(this.toPath(this.currentDirectory))) {
+      return;
+    }
     if (!files) {
       this.typingWatchers.isInvoked = false;
       return;
@@ -188210,6 +188263,15 @@ var Project2 = class _Project {
     });
   }
   /** @internal */
+  skipWatchingFailedLookups(path) {
+    const info = this.projectService.getScriptInfoForPath(path);
+    return info == null ? void 0 : info.isDynamic;
+  }
+  /** @internal */
+  skipWatchingTypeRoots() {
+    return isInferredProject(this) && this.currentDirectory === this.projectService.currentDirectory;
+  }
+  /** @internal */
   getCurrentProgram() {
     return this.program;
   }
@@ -198785,6 +198847,7 @@ if (typeof console !== "undefined") {
   getCommonSourceDirectory,
   getCommonSourceDirectoryOfConfig,
   getCompilerOptionValue,
+  getComputedCommonSourceDirectory,
   getConditions,
   getConfigFileParsingDiagnostics,
   getConstantValue,

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "6.0.0-dev.20260115",
+    "version": "6.0.0-dev.20260116",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -115,5 +115,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "a9f534f271dcc171e35e3aa27313982b930d467d"
+    "gitHead": "a586c340a277e0b99cb999d6b02a2cd95609178f"
 }