@typescript-deploys/pr-build 5.2.0-pr-54536-13 → 5.2.0-pr-54546-4

package/lib/tsc.js

@@ -6138,6 +6138,7 @@ var Diagnostics = {
   The_project_root_is_ambiguous_but_is_required_to_resolve_import_map_entry_0_in_file_1_Supply_the_rootDir_compiler_option_to_disambiguate: diag(2210, 1 /* Error */, "The_project_root_is_ambiguous_but_is_required_to_resolve_import_map_entry_0_in_file_1_Supply_the_roo_2210", "The project root is ambiguous, but is required to resolve import map entry '{0}' in file '{1}'. Supply the `rootDir` compiler option to disambiguate."),
   Add_extends_constraint: diag(2211, 3 /* Message */, "Add_extends_constraint_2211", "Add `extends` constraint."),
   Add_extends_constraint_to_all_type_parameters: diag(2212, 3 /* Message */, "Add_extends_constraint_to_all_type_parameters_2212", "Add `extends` constraint to all type parameters"),
+  The_project_root_is_ambiguous_but_is_required_to_determine_the_module_format_of_output_js_files_Supply_the_rootDir_compiler_option_to_disambiguate: diag(2213, 1 /* Error */, "The_project_root_is_ambiguous_but_is_required_to_determine_the_module_format_of_output_js_files_Supp_2213", "The project root is ambiguous, but is required to determine the module format of output '.js' files. Supply the `rootDir` compiler option to disambiguate."),
   Duplicate_identifier_0: diag(2300, 1 /* Error */, "Duplicate_identifier_0_2300", "Duplicate identifier '{0}'."),
   Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: diag(2301, 1 /* Error */, "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor."),
   Static_members_cannot_reference_class_type_parameters: diag(2302, 1 /* Error */, "Static_members_cannot_reference_class_type_parameters_2302", "Static members cannot reference class type parameters."),
@@ -52656,13 +52657,19 @@ function createTypeChecker(host) {
     if (getObjectFlags(type) & 4 /* Reference */) {
       const target = type.target;
       const typeArguments = getTypeArguments(type);
-      return length(target.typeParameters) === length(typeArguments) ? createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType])) : type;
+      if (length(target.typeParameters) === length(typeArguments)) {
+        const ref = createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType]));
+        return needApparentType ? getApparentType(ref) : ref;
+      }
     } else if (type.flags & 2097152 /* Intersection */) {
       const types = sameMap(type.types, (t) => getTypeWithThisArgument(t, thisArgument, needApparentType));
       return types !== type.types ? getIntersectionType(types) : type;
     }
     return needApparentType ? getApparentType(type) : type;
   }
+  function getThisArgument(type) {
+    return getObjectFlags(type) & 4 /* Reference */ && length(getTypeArguments(type)) > getTypeReferenceArity(type) ? last(getTypeArguments(type)) : type;
+  }
   function resolveObjectTypeMembers(type, source, typeParameters, typeArguments) {
     let mapper;
     let members;
@@ -53728,7 +53735,7 @@ function createTypeChecker(host) {
       return type.resolvedBaseConstraint;
     }
     const stack = [];
-    return type.resolvedBaseConstraint = getImmediateBaseConstraint(type);
+    return type.resolvedBaseConstraint = getTypeWithThisArgument(getImmediateBaseConstraint(type), getThisArgument(type));
     function getImmediateBaseConstraint(t) {
       if (!t.immediateBaseConstraint) {
         if (!pushTypeResolution(t, 4 /* ImmediateBaseConstraint */)) {
@@ -53820,18 +53827,18 @@ function createTypeChecker(host) {
       }
       if (isGenericTupleType(t)) {
         const newElements = map(getElementTypes(t), (v, i) => {
-          const constraint = v.flags & 262144 /* TypeParameter */ && t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
-          return constraint !== v && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
+          const constraint = t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
+          return constraint && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
         });
         return createTupleType(newElements, t.target.elementFlags, t.target.readonly, t.target.labeledElementDeclarations);
       }
       return t;
     }
   }
-  function getApparentTypeOfIntersectionType(type, thisArgument) {
+  function getApparentTypeOfIntersectionType(type) {
     return type.resolvedApparentType || (type.resolvedApparentType = getTypeWithThisArgument(
       type,
-      thisArgument,
+      type,
       /*needApparentType*/
       true
     ));
@@ -53882,9 +53889,8 @@ function createTypeChecker(host) {
     return !!(type.flags & 8388608 /* IndexedAccess */ && getObjectFlags(objectType = type.objectType) & 32 /* Mapped */ && !isGenericMappedType(objectType) && isGenericIndexType(type.indexType) && !(getMappedTypeModifiers(objectType) & 8 /* ExcludeOptional */) && !objectType.declaration.nameType);
   }
   function getApparentType(type) {
-    const t = type.flags & 465829888 /* Instantiable */ ? getBaseConstraintOfType(type) || unknownType : type;
-    const objectFlags = getObjectFlags(t);
-    return objectFlags & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : objectFlags & 4 /* Reference */ && t !== type ? getTypeWithThisArgument(t, type) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t, type) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
+    const t = !(type.flags & 465829888 /* Instantiable */) ? type : getBaseConstraintOfType(type) || unknownType;
+    return getObjectFlags(t) & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
   }
   function getReducedApparentType(type) {
     return getReducedType(getApparentType(getReducedType(type)));
@@ -58092,7 +58098,10 @@ function createTypeChecker(host) {
         const newMapper = createTypeMapper(typeParameters, typeArguments);
         result = target.objectFlags & 4 /* Reference */ ? createDeferredTypeReference(type.target, type.node, newMapper, newAliasSymbol, newAliasTypeArguments) : target.objectFlags & 32 /* Mapped */ ? instantiateMappedType(target, newMapper, newAliasSymbol, newAliasTypeArguments) : instantiateAnonymousType(target, newMapper, newAliasSymbol, newAliasTypeArguments);
         if (result.flags & 138117121 /* ObjectFlagsType */ && !(result.objectFlags & 524288 /* CouldContainTypeVariablesComputed */)) {
-          result.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (some(typeArguments, couldContainTypeVariables) ? 1048576 /* CouldContainTypeVariables */ : 0);
+          const resultCouldContainTypeVariables = some(typeArguments, couldContainTypeVariables);
+          if (!(result.objectFlags & 524288 /* CouldContainTypeVariablesComputed */)) {
+            result.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (resultCouldContainTypeVariables ? 1048576 /* CouldContainTypeVariables */ : 0);
+          }
         }
         target.instantiations.set(id, result);
       }
@@ -60705,7 +60714,7 @@ function createTypeChecker(host) {
           return 3 /* Maybe */;
         }
         const c = target2;
-        if (!c.root.inferTypeParameters && !isDistributionDependent(c.root) && !(source2.flags & 16777216 /* Conditional */ && source2.root === c.root)) {
+        if (!c.root.inferTypeParameters && !isDistributionDependent(c.root)) {
           const skipTrue = !isTypeAssignableTo(getPermissiveInstantiation(c.checkType), getPermissiveInstantiation(c.extendsType));
           const skipFalse = !skipTrue && isTypeAssignableTo(getRestrictiveInstantiation(c.checkType), getRestrictiveInstantiation(c.extendsType));
           if (result2 = skipTrue ? -1 /* True */ : isRelatedTo(
@@ -107153,6 +107162,15 @@ function getOutputDeclarationFileName(inputFileName, configFile, ignoreCase, get
     getDeclarationEmitExtensionForPath(inputFileName)
   );
 }
+function getOutputDeclarationFileNameWithoutConfigFile(inputFileName, options, ignoreCase, currentDirectory, getCommonSourceDirectory2) {
+  const directory = options.declarationDir || options.outDir ? getNormalizedAbsolutePath(options.declarationDir || options.outDir, currentDirectory) : void 0;
+  const outputPathWithoutChangedExtension = directory ? resolvePath(directory, getRelativePathFromDirectory(getCommonSourceDirectory2(), inputFileName, ignoreCase)) : inputFileName;
+  const outputFileName = changeExtension(
+    outputPathWithoutChangedExtension,
+    getDeclarationEmitExtensionForPath(inputFileName)
+  );
+  return outputFileName;
+}
 function getOutputJSFileName(inputFileName, configFile, ignoreCase, getCommonSourceDirectory2) {
   if (configFile.options.emitDeclarationOnly)
     return void 0;
@@ -107163,6 +107181,18 @@ function getOutputJSFileName(inputFileName, configFile, ignoreCase, getCommonSou
   );
   return !isJsonFile || comparePaths(inputFileName, outputFileName, Debug.checkDefined(configFile.options.configFilePath), ignoreCase) !== 0 /* EqualTo */ ? outputFileName : void 0;
 }
+function getOutputJSFileNameWithoutConfigFile(inputFileName, options, ignoreCase, currentDirectory, getCommonSourceDirectory2) {
+  if (options.emitDeclarationOnly)
+    return void 0;
+  const isJsonFile = fileExtensionIs(inputFileName, ".json" /* Json */);
+  const outDir = options.outDir ? getNormalizedAbsolutePath(options.outDir, currentDirectory) : void 0;
+  const outputPathWithoutChangedExtension = outDir ? resolvePath(outDir, getRelativePathFromDirectory(getCommonSourceDirectory2(), inputFileName, ignoreCase)) : inputFileName;
+  const outputFileName = changeExtension(
+    outputPathWithoutChangedExtension,
+    getOutputExtension(inputFileName, options)
+  );
+  return !isJsonFile || !options.configFilePath || comparePaths(inputFileName, outputFileName, options.configFilePath, ignoreCase) !== 0 /* EqualTo */ ? outputFileName : void 0;
+}
 function createAddOutput() {
   let outputs;
   return { addOutput, getOutputs };
@@ -113638,6 +113668,15 @@ function getImpliedNodeFormatForFileWorker(fileName, packageJsonInfoCache, host,
     return { impliedNodeFormat, packageJsonLocations, packageJsonScope };
   }
 }
+function moduleFormatNeedsPackageJsonLookup(fileName, options) {
+  switch (getEmitModuleResolutionKind(options)) {
+    case 3 /* Node16 */:
+    case 99 /* NodeNext */:
+      return fileExtensionIsOneOf(fileName, [".d.ts" /* Dts */, ".ts" /* Ts */, ".tsx" /* Tsx */, ".js" /* Js */, ".jsx" /* Jsx */]);
+    default:
+      return false;
+  }
+}
 var plainJSErrors = /* @__PURE__ */ new Set([
   // binder errors
   Diagnostics.Cannot_redeclare_block_scoped_variable_0.code,
@@ -113758,6 +113797,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
   let files;
   let symlinks;
   let commonSourceDirectory;
+  let assumedCommonSourceDirectory;
   let typeChecker;
   let classifiableNames;
   const ambientModuleNameToUnmodifiedFileName = /* @__PURE__ */ new Map();
@@ -114249,6 +114289,9 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     }
     return commonSourceDirectory;
   }
+  function getAssumedCommonSourceDirectory() {
+    return commonSourceDirectory ?? (assumedCommonSourceDirectory ?? (assumedCommonSourceDirectory = getCommonSourceDirectory(options, () => rootNames, host.getCurrentDirectory(), getCanonicalFileName)));
+  }
   function getClassifiableNames() {
     var _a2;
     if (!classifiableNames) {
@@ -114472,7 +114515,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     })(SeenPackageName || (SeenPackageName = {}));
     const seenPackageNames = /* @__PURE__ */ new Map();
     for (const oldSourceFile of oldSourceFiles) {
-      const sourceFileOptions = getCreateSourceFileOptions(oldSourceFile.fileName, moduleResolutionCache, host, options);
+      const sourceFileOptions = getCreateSourceFileOptions(oldSourceFile.fileName);
       let newSourceFile = host.getSourceFileByPath ? host.getSourceFileByPath(
         oldSourceFile.fileName,
         oldSourceFile.resolvedPath,
@@ -115434,10 +115477,48 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     (_b2 = tracing) == null ? void 0 : _b2.pop();
     return result;
   }
-  function getCreateSourceFileOptions(fileName, moduleResolutionCache2, host2, options2) {
-    const result = getImpliedNodeFormatForFileWorker(getNormalizedAbsolutePath(fileName, currentDirectory), moduleResolutionCache2 == null ? void 0 : moduleResolutionCache2.getPackageJsonInfoCache(), host2, options2);
-    const languageVersion = getEmitScriptTarget(options2);
-    const setExternalModuleIndicator2 = getSetExternalModuleIndicator(options2);
+  function getImpliedNodeFormatForFile(fileName) {
+    let fileNameForModuleFormatDetection = getNormalizedAbsolutePath(fileName, currentDirectory);
+    if (moduleFormatNeedsPackageJsonLookup(fileName, options)) {
+      const projectReference = getResolvedProjectReferenceToRedirect(fileName);
+      if (projectReference) {
+        Debug.assert(useSourceOfProjectReferenceRedirect);
+        fileNameForModuleFormatDetection = getOutputDeclarationFileName(
+          fileNameForModuleFormatDetection,
+          projectReference.commandLine,
+          !host.useCaseSensitiveFileNames()
+        ) || getOutputJSFileName(
+          fileNameForModuleFormatDetection,
+          projectReference.commandLine,
+          !host.useCaseSensitiveFileNames()
+        ) || fileNameForModuleFormatDetection;
+      } else {
+        fileNameForModuleFormatDetection = getOutputDeclarationFileNameWithoutConfigFile(
+          fileNameForModuleFormatDetection,
+          options,
+          !host.useCaseSensitiveFileNames(),
+          currentDirectory,
+          getAssumedCommonSourceDirectory
+        ) || getOutputJSFileNameWithoutConfigFile(
+          fileNameForModuleFormatDetection,
+          options,
+          !host.useCaseSensitiveFileNames(),
+          currentDirectory,
+          getAssumedCommonSourceDirectory
+        ) || fileNameForModuleFormatDetection;
+      }
+    }
+    return getImpliedNodeFormatForFileWorker(
+      fileNameForModuleFormatDetection,
+      moduleResolutionCache == null ? void 0 : moduleResolutionCache.getPackageJsonInfoCache(),
+      host,
+      options
+    );
+  }
+  function getCreateSourceFileOptions(fileName) {
+    const result = getImpliedNodeFormatForFile(fileName);
+    const languageVersion = getEmitScriptTarget(options);
+    const setExternalModuleIndicator2 = getSetExternalModuleIndicator(options);
     return typeof result === "object" ? { ...result, languageVersion, setExternalModuleIndicator: setExternalModuleIndicator2 } : { languageVersion, impliedNodeFormat: result, setExternalModuleIndicator: setExternalModuleIndicator2 };
   }
   function findSourceFileWorker(fileName, isDefaultLib, ignoreNoDefaultLib, reason, packageId) {
@@ -115509,7 +115590,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
         redirectedPath = toPath3(redirect);
       }
     }
-    const sourceFileOptions = getCreateSourceFileOptions(fileName, moduleResolutionCache, host, options);
+    const sourceFileOptions = getCreateSourceFileOptions(fileName);
     const file = host.getSourceFile(
       fileName,
       sourceFileOptions,
@@ -116132,6 +116213,9 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
         createDiagnosticForOptionName(Diagnostics.Cannot_find_the_common_subdirectory_path_for_the_input_files, "outDir");
       }
     }
+    if (assumedCommonSourceDirectory && assumedCommonSourceDirectory !== getCommonSourceDirectory2()) {
+      programDiagnostics.add(createCompilerDiagnostic(Diagnostics.The_project_root_is_ambiguous_but_is_required_to_determine_the_module_format_of_output_js_files_Supply_the_rootDir_compiler_option_to_disambiguate));
+    }
     if (options.useDefineForClassFields && languageVersion === 0 /* ES3 */) {
       createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_when_option_target_is_ES3, "useDefineForClassFields");
     }

package/lib/tsserver.js

@@ -919,8 +919,11 @@ __export(server_exports, {
   getOriginalNodeId: () => getOriginalNodeId,
   getOriginalSourceFile: () => getOriginalSourceFile,
   getOutputDeclarationFileName: () => getOutputDeclarationFileName,
+  getOutputDeclarationFileNameWithoutConfigFile: () => getOutputDeclarationFileNameWithoutConfigFile,
   getOutputExtension: () => getOutputExtension,
   getOutputFileNames: () => getOutputFileNames,
+  getOutputJSFileName: () => getOutputJSFileName,
+  getOutputJSFileNameWithoutConfigFile: () => getOutputJSFileNameWithoutConfigFile,
   getOutputPathsFor: () => getOutputPathsFor,
   getOutputPathsForBundle: () => getOutputPathsForBundle,
   getOwnEmitOutputFilePath: () => getOwnEmitOutputFilePath,
@@ -9646,6 +9649,7 @@ var Diagnostics = {
   The_project_root_is_ambiguous_but_is_required_to_resolve_import_map_entry_0_in_file_1_Supply_the_rootDir_compiler_option_to_disambiguate: diag(2210, 1 /* Error */, "The_project_root_is_ambiguous_but_is_required_to_resolve_import_map_entry_0_in_file_1_Supply_the_roo_2210", "The project root is ambiguous, but is required to resolve import map entry '{0}' in file '{1}'. Supply the `rootDir` compiler option to disambiguate."),
   Add_extends_constraint: diag(2211, 3 /* Message */, "Add_extends_constraint_2211", "Add `extends` constraint."),
   Add_extends_constraint_to_all_type_parameters: diag(2212, 3 /* Message */, "Add_extends_constraint_to_all_type_parameters_2212", "Add `extends` constraint to all type parameters"),
+  The_project_root_is_ambiguous_but_is_required_to_determine_the_module_format_of_output_js_files_Supply_the_rootDir_compiler_option_to_disambiguate: diag(2213, 1 /* Error */, "The_project_root_is_ambiguous_but_is_required_to_determine_the_module_format_of_output_js_files_Supp_2213", "The project root is ambiguous, but is required to determine the module format of output '.js' files. Supply the `rootDir` compiler option to disambiguate."),
   Duplicate_identifier_0: diag(2300, 1 /* Error */, "Duplicate_identifier_0_2300", "Duplicate identifier '{0}'."),
   Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: diag(2301, 1 /* Error */, "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor."),
   Static_members_cannot_reference_class_type_parameters: diag(2302, 1 /* Error */, "Static_members_cannot_reference_class_type_parameters_2302", "Static members cannot reference class type parameters."),
@@ -57307,13 +57311,19 @@ function createTypeChecker(host) {
     if (getObjectFlags(type) & 4 /* Reference */) {
       const target = type.target;
       const typeArguments = getTypeArguments(type);
-      return length(target.typeParameters) === length(typeArguments) ? createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType])) : type;
+      if (length(target.typeParameters) === length(typeArguments)) {
+        const ref = createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType]));
+        return needApparentType ? getApparentType(ref) : ref;
+      }
     } else if (type.flags & 2097152 /* Intersection */) {
       const types = sameMap(type.types, (t) => getTypeWithThisArgument(t, thisArgument, needApparentType));
       return types !== type.types ? getIntersectionType(types) : type;
     }
     return needApparentType ? getApparentType(type) : type;
   }
+  function getThisArgument(type) {
+    return getObjectFlags(type) & 4 /* Reference */ && length(getTypeArguments(type)) > getTypeReferenceArity(type) ? last(getTypeArguments(type)) : type;
+  }
   function resolveObjectTypeMembers(type, source, typeParameters, typeArguments) {
     let mapper;
     let members;
@@ -58379,7 +58389,7 @@ function createTypeChecker(host) {
       return type.resolvedBaseConstraint;
     }
     const stack = [];
-    return type.resolvedBaseConstraint = getImmediateBaseConstraint(type);
+    return type.resolvedBaseConstraint = getTypeWithThisArgument(getImmediateBaseConstraint(type), getThisArgument(type));
     function getImmediateBaseConstraint(t) {
       if (!t.immediateBaseConstraint) {
         if (!pushTypeResolution(t, 4 /* ImmediateBaseConstraint */)) {
@@ -58471,18 +58481,18 @@ function createTypeChecker(host) {
       }
       if (isGenericTupleType(t)) {
         const newElements = map(getElementTypes(t), (v, i) => {
-          const constraint = v.flags & 262144 /* TypeParameter */ && t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
-          return constraint !== v && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
+          const constraint = t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
+          return constraint && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
         });
         return createTupleType(newElements, t.target.elementFlags, t.target.readonly, t.target.labeledElementDeclarations);
       }
       return t;
     }
   }
-  function getApparentTypeOfIntersectionType(type, thisArgument) {
+  function getApparentTypeOfIntersectionType(type) {
     return type.resolvedApparentType || (type.resolvedApparentType = getTypeWithThisArgument(
       type,
-      thisArgument,
+      type,
       /*needApparentType*/
       true
     ));
@@ -58533,9 +58543,8 @@ function createTypeChecker(host) {
     return !!(type.flags & 8388608 /* IndexedAccess */ && getObjectFlags(objectType = type.objectType) & 32 /* Mapped */ && !isGenericMappedType(objectType) && isGenericIndexType(type.indexType) && !(getMappedTypeModifiers(objectType) & 8 /* ExcludeOptional */) && !objectType.declaration.nameType);
   }
   function getApparentType(type) {
-    const t = type.flags & 465829888 /* Instantiable */ ? getBaseConstraintOfType(type) || unknownType : type;
-    const objectFlags = getObjectFlags(t);
-    return objectFlags & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : objectFlags & 4 /* Reference */ && t !== type ? getTypeWithThisArgument(t, type) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t, type) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
+    const t = !(type.flags & 465829888 /* Instantiable */) ? type : getBaseConstraintOfType(type) || unknownType;
+    return getObjectFlags(t) & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
   }
   function getReducedApparentType(type) {
     return getReducedType(getApparentType(getReducedType(type)));
@@ -62743,7 +62752,10 @@ function createTypeChecker(host) {
         const newMapper = createTypeMapper(typeParameters, typeArguments);
         result = target.objectFlags & 4 /* Reference */ ? createDeferredTypeReference(type.target, type.node, newMapper, newAliasSymbol, newAliasTypeArguments) : target.objectFlags & 32 /* Mapped */ ? instantiateMappedType(target, newMapper, newAliasSymbol, newAliasTypeArguments) : instantiateAnonymousType(target, newMapper, newAliasSymbol, newAliasTypeArguments);
         if (result.flags & 138117121 /* ObjectFlagsType */ && !(result.objectFlags & 524288 /* CouldContainTypeVariablesComputed */)) {
-          result.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (some(typeArguments, couldContainTypeVariables) ? 1048576 /* CouldContainTypeVariables */ : 0);
+          const resultCouldContainTypeVariables = some(typeArguments, couldContainTypeVariables);
+          if (!(result.objectFlags & 524288 /* CouldContainTypeVariablesComputed */)) {
+            result.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (resultCouldContainTypeVariables ? 1048576 /* CouldContainTypeVariables */ : 0);
+          }
         }
         target.instantiations.set(id, result);
       }
@@ -65356,7 +65368,7 @@ function createTypeChecker(host) {
           return 3 /* Maybe */;
         }
         const c = target2;
-        if (!c.root.inferTypeParameters && !isDistributionDependent(c.root) && !(source2.flags & 16777216 /* Conditional */ && source2.root === c.root)) {
+        if (!c.root.inferTypeParameters && !isDistributionDependent(c.root)) {
           const skipTrue = !isTypeAssignableTo(getPermissiveInstantiation(c.checkType), getPermissiveInstantiation(c.extendsType));
           const skipFalse = !skipTrue && isTypeAssignableTo(getRestrictiveInstantiation(c.checkType), getRestrictiveInstantiation(c.extendsType));
           if (result2 = skipTrue ? -1 /* True */ : isRelatedTo(
@@ -111975,6 +111987,15 @@ function getOutputDeclarationFileName(inputFileName, configFile, ignoreCase, get
     getDeclarationEmitExtensionForPath(inputFileName)
   );
 }
+function getOutputDeclarationFileNameWithoutConfigFile(inputFileName, options, ignoreCase, currentDirectory, getCommonSourceDirectory2) {
+  const directory = options.declarationDir || options.outDir ? getNormalizedAbsolutePath(options.declarationDir || options.outDir, currentDirectory) : void 0;
+  const outputPathWithoutChangedExtension = directory ? resolvePath(directory, getRelativePathFromDirectory(getCommonSourceDirectory2(), inputFileName, ignoreCase)) : inputFileName;
+  const outputFileName = changeExtension(
+    outputPathWithoutChangedExtension,
+    getDeclarationEmitExtensionForPath(inputFileName)
+  );
+  return outputFileName;
+}
 function getOutputJSFileName(inputFileName, configFile, ignoreCase, getCommonSourceDirectory2) {
   if (configFile.options.emitDeclarationOnly)
     return void 0;
@@ -111985,6 +112006,18 @@ function getOutputJSFileName(inputFileName, configFile, ignoreCase, getCommonSou
   );
   return !isJsonFile || comparePaths(inputFileName, outputFileName, Debug.checkDefined(configFile.options.configFilePath), ignoreCase) !== 0 /* EqualTo */ ? outputFileName : void 0;
 }
+function getOutputJSFileNameWithoutConfigFile(inputFileName, options, ignoreCase, currentDirectory, getCommonSourceDirectory2) {
+  if (options.emitDeclarationOnly)
+    return void 0;
+  const isJsonFile = fileExtensionIs(inputFileName, ".json" /* Json */);
+  const outDir = options.outDir ? getNormalizedAbsolutePath(options.outDir, currentDirectory) : void 0;
+  const outputPathWithoutChangedExtension = outDir ? resolvePath(outDir, getRelativePathFromDirectory(getCommonSourceDirectory2(), inputFileName, ignoreCase)) : inputFileName;
+  const outputFileName = changeExtension(
+    outputPathWithoutChangedExtension,
+    getOutputExtension(inputFileName, options)
+  );
+  return !isJsonFile || !options.configFilePath || comparePaths(inputFileName, outputFileName, options.configFilePath, ignoreCase) !== 0 /* EqualTo */ ? outputFileName : void 0;
+}
 function createAddOutput() {
   let outputs;
   return { addOutput, getOutputs };
@@ -118525,6 +118558,15 @@ function getImpliedNodeFormatForFileWorker(fileName, packageJsonInfoCache, host,
     return { impliedNodeFormat, packageJsonLocations, packageJsonScope };
   }
 }
+function moduleFormatNeedsPackageJsonLookup(fileName, options) {
+  switch (getEmitModuleResolutionKind(options)) {
+    case 3 /* Node16 */:
+    case 99 /* NodeNext */:
+      return fileExtensionIsOneOf(fileName, [".d.ts" /* Dts */, ".ts" /* Ts */, ".tsx" /* Tsx */, ".js" /* Js */, ".jsx" /* Jsx */]);
+    default:
+      return false;
+  }
+}
 var plainJSErrors = /* @__PURE__ */ new Set([
   // binder errors
   Diagnostics.Cannot_redeclare_block_scoped_variable_0.code,
@@ -118645,6 +118687,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
   let files;
   let symlinks;
   let commonSourceDirectory;
+  let assumedCommonSourceDirectory;
   let typeChecker;
   let classifiableNames;
   const ambientModuleNameToUnmodifiedFileName = /* @__PURE__ */ new Map();
@@ -119136,6 +119179,9 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     }
     return commonSourceDirectory;
   }
+  function getAssumedCommonSourceDirectory() {
+    return commonSourceDirectory ?? (assumedCommonSourceDirectory ?? (assumedCommonSourceDirectory = getCommonSourceDirectory(options, () => rootNames, host.getCurrentDirectory(), getCanonicalFileName)));
+  }
   function getClassifiableNames() {
     var _a2;
     if (!classifiableNames) {
@@ -119359,7 +119405,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     })(SeenPackageName || (SeenPackageName = {}));
     const seenPackageNames = /* @__PURE__ */ new Map();
     for (const oldSourceFile of oldSourceFiles) {
-      const sourceFileOptions = getCreateSourceFileOptions(oldSourceFile.fileName, moduleResolutionCache, host, options);
+      const sourceFileOptions = getCreateSourceFileOptions(oldSourceFile.fileName);
       let newSourceFile = host.getSourceFileByPath ? host.getSourceFileByPath(
         oldSourceFile.fileName,
         oldSourceFile.resolvedPath,
@@ -120321,10 +120367,48 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     (_b2 = tracing) == null ? void 0 : _b2.pop();
     return result;
   }
-  function getCreateSourceFileOptions(fileName, moduleResolutionCache2, host2, options2) {
-    const result = getImpliedNodeFormatForFileWorker(getNormalizedAbsolutePath(fileName, currentDirectory), moduleResolutionCache2 == null ? void 0 : moduleResolutionCache2.getPackageJsonInfoCache(), host2, options2);
-    const languageVersion = getEmitScriptTarget(options2);
-    const setExternalModuleIndicator2 = getSetExternalModuleIndicator(options2);
+  function getImpliedNodeFormatForFile2(fileName) {
+    let fileNameForModuleFormatDetection = getNormalizedAbsolutePath(fileName, currentDirectory);
+    if (moduleFormatNeedsPackageJsonLookup(fileName, options)) {
+      const projectReference = getResolvedProjectReferenceToRedirect(fileName);
+      if (projectReference) {
+        Debug.assert(useSourceOfProjectReferenceRedirect);
+        fileNameForModuleFormatDetection = getOutputDeclarationFileName(
+          fileNameForModuleFormatDetection,
+          projectReference.commandLine,
+          !host.useCaseSensitiveFileNames()
+        ) || getOutputJSFileName(
+          fileNameForModuleFormatDetection,
+          projectReference.commandLine,
+          !host.useCaseSensitiveFileNames()
+        ) || fileNameForModuleFormatDetection;
+      } else {
+        fileNameForModuleFormatDetection = getOutputDeclarationFileNameWithoutConfigFile(
+          fileNameForModuleFormatDetection,
+          options,
+          !host.useCaseSensitiveFileNames(),
+          currentDirectory,
+          getAssumedCommonSourceDirectory
+        ) || getOutputJSFileNameWithoutConfigFile(
+          fileNameForModuleFormatDetection,
+          options,
+          !host.useCaseSensitiveFileNames(),
+          currentDirectory,
+          getAssumedCommonSourceDirectory
+        ) || fileNameForModuleFormatDetection;
+      }
+    }
+    return getImpliedNodeFormatForFileWorker(
+      fileNameForModuleFormatDetection,
+      moduleResolutionCache == null ? void 0 : moduleResolutionCache.getPackageJsonInfoCache(),
+      host,
+      options
+    );
+  }
+  function getCreateSourceFileOptions(fileName) {
+    const result = getImpliedNodeFormatForFile2(fileName);
+    const languageVersion = getEmitScriptTarget(options);
+    const setExternalModuleIndicator2 = getSetExternalModuleIndicator(options);
     return typeof result === "object" ? { ...result, languageVersion, setExternalModuleIndicator: setExternalModuleIndicator2 } : { languageVersion, impliedNodeFormat: result, setExternalModuleIndicator: setExternalModuleIndicator2 };
   }
   function findSourceFileWorker(fileName, isDefaultLib, ignoreNoDefaultLib, reason, packageId) {
@@ -120396,7 +120480,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
         redirectedPath = toPath3(redirect);
       }
     }
-    const sourceFileOptions = getCreateSourceFileOptions(fileName, moduleResolutionCache, host, options);
+    const sourceFileOptions = getCreateSourceFileOptions(fileName);
     const file = host.getSourceFile(
       fileName,
       sourceFileOptions,
@@ -121019,6 +121103,9 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
         createDiagnosticForOptionName(Diagnostics.Cannot_find_the_common_subdirectory_path_for_the_input_files, "outDir");
       }
     }
+    if (assumedCommonSourceDirectory && assumedCommonSourceDirectory !== getCommonSourceDirectory2()) {
+      programDiagnostics.add(createCompilerDiagnostic(Diagnostics.The_project_root_is_ambiguous_but_is_required_to_determine_the_module_format_of_output_js_files_Supply_the_rootDir_compiler_option_to_disambiguate));
+    }
     if (options.useDefineForClassFields && languageVersion === 0 /* ES3 */) {
       createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_when_option_target_is_ES3, "useDefineForClassFields");
     }
@@ -170799,8 +170886,11 @@ __export(ts_exports2, {
   getOriginalNodeId: () => getOriginalNodeId,
   getOriginalSourceFile: () => getOriginalSourceFile,
   getOutputDeclarationFileName: () => getOutputDeclarationFileName,
+  getOutputDeclarationFileNameWithoutConfigFile: () => getOutputDeclarationFileNameWithoutConfigFile,
   getOutputExtension: () => getOutputExtension,
   getOutputFileNames: () => getOutputFileNames,
+  getOutputJSFileName: () => getOutputJSFileName,
+  getOutputJSFileNameWithoutConfigFile: () => getOutputJSFileNameWithoutConfigFile,
   getOutputPathsFor: () => getOutputPathsFor,
   getOutputPathsForBundle: () => getOutputPathsForBundle,
   getOwnEmitOutputFilePath: () => getOwnEmitOutputFilePath,
@@ -185272,8 +185362,11 @@ start(initializeNodeSystem(), require("os").platform());
   getOriginalNodeId,
   getOriginalSourceFile,
   getOutputDeclarationFileName,
+  getOutputDeclarationFileNameWithoutConfigFile,
   getOutputExtension,
   getOutputFileNames,
+  getOutputJSFileName,
+  getOutputJSFileNameWithoutConfigFile,
   getOutputPathsFor,
   getOutputPathsForBundle,
   getOwnEmitOutputFilePath,

package/lib/tsserverlibrary.js

@@ -7452,6 +7452,7 @@ ${lanes.join("\n")}
         The_project_root_is_ambiguous_but_is_required_to_resolve_import_map_entry_0_in_file_1_Supply_the_rootDir_compiler_option_to_disambiguate: diag(2210, 1 /* Error */, "The_project_root_is_ambiguous_but_is_required_to_resolve_import_map_entry_0_in_file_1_Supply_the_roo_2210", "The project root is ambiguous, but is required to resolve import map entry '{0}' in file '{1}'. Supply the `rootDir` compiler option to disambiguate."),
         Add_extends_constraint: diag(2211, 3 /* Message */, "Add_extends_constraint_2211", "Add `extends` constraint."),
         Add_extends_constraint_to_all_type_parameters: diag(2212, 3 /* Message */, "Add_extends_constraint_to_all_type_parameters_2212", "Add `extends` constraint to all type parameters"),
+        The_project_root_is_ambiguous_but_is_required_to_determine_the_module_format_of_output_js_files_Supply_the_rootDir_compiler_option_to_disambiguate: diag(2213, 1 /* Error */, "The_project_root_is_ambiguous_but_is_required_to_determine_the_module_format_of_output_js_files_Supp_2213", "The project root is ambiguous, but is required to determine the module format of output '.js' files. Supply the `rootDir` compiler option to disambiguate."),
         Duplicate_identifier_0: diag(2300, 1 /* Error */, "Duplicate_identifier_0_2300", "Duplicate identifier '{0}'."),
         Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: diag(2301, 1 /* Error */, "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor."),
         Static_members_cannot_reference_class_type_parameters: diag(2302, 1 /* Error */, "Static_members_cannot_reference_class_type_parameters_2302", "Static members cannot reference class type parameters."),
@@ -55096,13 +55097,19 @@ ${lanes.join("\n")}
       if (getObjectFlags(type) & 4 /* Reference */) {
         const target = type.target;
         const typeArguments = getTypeArguments(type);
-        return length(target.typeParameters) === length(typeArguments) ? createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType])) : type;
+        if (length(target.typeParameters) === length(typeArguments)) {
+          const ref = createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType]));
+          return needApparentType ? getApparentType(ref) : ref;
+        }
       } else if (type.flags & 2097152 /* Intersection */) {
         const types = sameMap(type.types, (t) => getTypeWithThisArgument(t, thisArgument, needApparentType));
         return types !== type.types ? getIntersectionType(types) : type;
       }
       return needApparentType ? getApparentType(type) : type;
     }
+    function getThisArgument(type) {
+      return getObjectFlags(type) & 4 /* Reference */ && length(getTypeArguments(type)) > getTypeReferenceArity(type) ? last(getTypeArguments(type)) : type;
+    }
     function resolveObjectTypeMembers(type, source, typeParameters, typeArguments) {
       let mapper;
       let members;
@@ -56168,7 +56175,7 @@ ${lanes.join("\n")}
         return type.resolvedBaseConstraint;
       }
       const stack = [];
-      return type.resolvedBaseConstraint = getImmediateBaseConstraint(type);
+      return type.resolvedBaseConstraint = getTypeWithThisArgument(getImmediateBaseConstraint(type), getThisArgument(type));
       function getImmediateBaseConstraint(t) {
         if (!t.immediateBaseConstraint) {
           if (!pushTypeResolution(t, 4 /* ImmediateBaseConstraint */)) {
@@ -56260,18 +56267,18 @@ ${lanes.join("\n")}
         }
         if (isGenericTupleType(t)) {
           const newElements = map(getElementTypes(t), (v, i) => {
-            const constraint = v.flags & 262144 /* TypeParameter */ && t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
-            return constraint !== v && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
+            const constraint = t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
+            return constraint && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
           });
           return createTupleType(newElements, t.target.elementFlags, t.target.readonly, t.target.labeledElementDeclarations);
         }
         return t;
       }
     }
-    function getApparentTypeOfIntersectionType(type, thisArgument) {
+    function getApparentTypeOfIntersectionType(type) {
       return type.resolvedApparentType || (type.resolvedApparentType = getTypeWithThisArgument(
         type,
-        thisArgument,
+        type,
         /*needApparentType*/
         true
       ));
@@ -56322,9 +56329,8 @@ ${lanes.join("\n")}
       return !!(type.flags & 8388608 /* IndexedAccess */ && getObjectFlags(objectType = type.objectType) & 32 /* Mapped */ && !isGenericMappedType(objectType) && isGenericIndexType(type.indexType) && !(getMappedTypeModifiers(objectType) & 8 /* ExcludeOptional */) && !objectType.declaration.nameType);
     }
     function getApparentType(type) {
-      const t = type.flags & 465829888 /* Instantiable */ ? getBaseConstraintOfType(type) || unknownType : type;
-      const objectFlags = getObjectFlags(t);
-      return objectFlags & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : objectFlags & 4 /* Reference */ && t !== type ? getTypeWithThisArgument(t, type) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t, type) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
+      const t = !(type.flags & 465829888 /* Instantiable */) ? type : getBaseConstraintOfType(type) || unknownType;
+      return getObjectFlags(t) & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
     }
     function getReducedApparentType(type) {
       return getReducedType(getApparentType(getReducedType(type)));
@@ -60532,7 +60538,10 @@ ${lanes.join("\n")}
           const newMapper = createTypeMapper(typeParameters, typeArguments);
           result = target.objectFlags & 4 /* Reference */ ? createDeferredTypeReference(type.target, type.node, newMapper, newAliasSymbol, newAliasTypeArguments) : target.objectFlags & 32 /* Mapped */ ? instantiateMappedType(target, newMapper, newAliasSymbol, newAliasTypeArguments) : instantiateAnonymousType(target, newMapper, newAliasSymbol, newAliasTypeArguments);
           if (result.flags & 138117121 /* ObjectFlagsType */ && !(result.objectFlags & 524288 /* CouldContainTypeVariablesComputed */)) {
-            result.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (some(typeArguments, couldContainTypeVariables) ? 1048576 /* CouldContainTypeVariables */ : 0);
+            const resultCouldContainTypeVariables = some(typeArguments, couldContainTypeVariables);
+            if (!(result.objectFlags & 524288 /* CouldContainTypeVariablesComputed */)) {
+              result.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (resultCouldContainTypeVariables ? 1048576 /* CouldContainTypeVariables */ : 0);
+            }
           }
           target.instantiations.set(id, result);
         }
@@ -63145,7 +63154,7 @@ ${lanes.join("\n")}
             return 3 /* Maybe */;
           }
           const c = target2;
-          if (!c.root.inferTypeParameters && !isDistributionDependent(c.root) && !(source2.flags & 16777216 /* Conditional */ && source2.root === c.root)) {
+          if (!c.root.inferTypeParameters && !isDistributionDependent(c.root)) {
             const skipTrue = !isTypeAssignableTo(getPermissiveInstantiation(c.checkType), getPermissiveInstantiation(c.extendsType));
             const skipFalse = !skipTrue && isTypeAssignableTo(getRestrictiveInstantiation(c.checkType), getRestrictiveInstantiation(c.extendsType));
             if (result2 = skipTrue ? -1 /* True */ : isRelatedTo(
@@ -110078,6 +110087,15 @@ ${lanes.join("\n")}
       getDeclarationEmitExtensionForPath(inputFileName)
     );
   }
+  function getOutputDeclarationFileNameWithoutConfigFile(inputFileName, options, ignoreCase, currentDirectory, getCommonSourceDirectory2) {
+    const directory = options.declarationDir || options.outDir ? getNormalizedAbsolutePath(options.declarationDir || options.outDir, currentDirectory) : void 0;
+    const outputPathWithoutChangedExtension = directory ? resolvePath(directory, getRelativePathFromDirectory(getCommonSourceDirectory2(), inputFileName, ignoreCase)) : inputFileName;
+    const outputFileName = changeExtension(
+      outputPathWithoutChangedExtension,
+      getDeclarationEmitExtensionForPath(inputFileName)
+    );
+    return outputFileName;
+  }
   function getOutputJSFileName(inputFileName, configFile, ignoreCase, getCommonSourceDirectory2) {
     if (configFile.options.emitDeclarationOnly)
       return void 0;
@@ -110088,6 +110106,18 @@ ${lanes.join("\n")}
     );
     return !isJsonFile || comparePaths(inputFileName, outputFileName, Debug.checkDefined(configFile.options.configFilePath), ignoreCase) !== 0 /* EqualTo */ ? outputFileName : void 0;
   }
+  function getOutputJSFileNameWithoutConfigFile(inputFileName, options, ignoreCase, currentDirectory, getCommonSourceDirectory2) {
+    if (options.emitDeclarationOnly)
+      return void 0;
+    const isJsonFile = fileExtensionIs(inputFileName, ".json" /* Json */);
+    const outDir = options.outDir ? getNormalizedAbsolutePath(options.outDir, currentDirectory) : void 0;
+    const outputPathWithoutChangedExtension = outDir ? resolvePath(outDir, getRelativePathFromDirectory(getCommonSourceDirectory2(), inputFileName, ignoreCase)) : inputFileName;
+    const outputFileName = changeExtension(
+      outputPathWithoutChangedExtension,
+      getOutputExtension(inputFileName, options)
+    );
+    return !isJsonFile || !options.configFilePath || comparePaths(inputFileName, outputFileName, options.configFilePath, ignoreCase) !== 0 /* EqualTo */ ? outputFileName : void 0;
+  }
   function createAddOutput() {
     let outputs;
     return { addOutput, getOutputs };
@@ -116618,6 +116648,15 @@ ${lanes.join("\n")}
       return { impliedNodeFormat, packageJsonLocations, packageJsonScope };
     }
   }
+  function moduleFormatNeedsPackageJsonLookup(fileName, options) {
+    switch (getEmitModuleResolutionKind(options)) {
+      case 3 /* Node16 */:
+      case 99 /* NodeNext */:
+        return fileExtensionIsOneOf(fileName, [".d.ts" /* Dts */, ".ts" /* Ts */, ".tsx" /* Tsx */, ".js" /* Js */, ".jsx" /* Jsx */]);
+      default:
+        return false;
+    }
+  }
   function shouldProgramCreateNewSourceFiles(program, newOptions) {
     if (!program)
       return false;
@@ -116644,6 +116683,7 @@ ${lanes.join("\n")}
     let files;
     let symlinks;
     let commonSourceDirectory;
+    let assumedCommonSourceDirectory;
     let typeChecker;
     let classifiableNames;
     const ambientModuleNameToUnmodifiedFileName = /* @__PURE__ */ new Map();
@@ -117135,6 +117175,9 @@ ${lanes.join("\n")}
       }
       return commonSourceDirectory;
     }
+    function getAssumedCommonSourceDirectory() {
+      return commonSourceDirectory ?? (assumedCommonSourceDirectory ?? (assumedCommonSourceDirectory = getCommonSourceDirectory(options, () => rootNames, host.getCurrentDirectory(), getCanonicalFileName)));
+    }
     function getClassifiableNames() {
       var _a2;
       if (!classifiableNames) {
@@ -117358,7 +117401,7 @@ ${lanes.join("\n")}
       })(SeenPackageName || (SeenPackageName = {}));
       const seenPackageNames = /* @__PURE__ */ new Map();
       for (const oldSourceFile of oldSourceFiles) {
-        const sourceFileOptions = getCreateSourceFileOptions(oldSourceFile.fileName, moduleResolutionCache, host, options);
+        const sourceFileOptions = getCreateSourceFileOptions(oldSourceFile.fileName);
         let newSourceFile = host.getSourceFileByPath ? host.getSourceFileByPath(
           oldSourceFile.fileName,
           oldSourceFile.resolvedPath,
@@ -118320,10 +118363,48 @@ ${lanes.join("\n")}
       (_b2 = tracing) == null ? void 0 : _b2.pop();
       return result;
     }
-    function getCreateSourceFileOptions(fileName, moduleResolutionCache2, host2, options2) {
-      const result = getImpliedNodeFormatForFileWorker(getNormalizedAbsolutePath(fileName, currentDirectory), moduleResolutionCache2 == null ? void 0 : moduleResolutionCache2.getPackageJsonInfoCache(), host2, options2);
-      const languageVersion = getEmitScriptTarget(options2);
-      const setExternalModuleIndicator2 = getSetExternalModuleIndicator(options2);
+    function getImpliedNodeFormatForFile2(fileName) {
+      let fileNameForModuleFormatDetection = getNormalizedAbsolutePath(fileName, currentDirectory);
+      if (moduleFormatNeedsPackageJsonLookup(fileName, options)) {
+        const projectReference = getResolvedProjectReferenceToRedirect(fileName);
+        if (projectReference) {
+          Debug.assert(useSourceOfProjectReferenceRedirect);
+          fileNameForModuleFormatDetection = getOutputDeclarationFileName(
+            fileNameForModuleFormatDetection,
+            projectReference.commandLine,
+            !host.useCaseSensitiveFileNames()
+          ) || getOutputJSFileName(
+            fileNameForModuleFormatDetection,
+            projectReference.commandLine,
+            !host.useCaseSensitiveFileNames()
+          ) || fileNameForModuleFormatDetection;
+        } else {
+          fileNameForModuleFormatDetection = getOutputDeclarationFileNameWithoutConfigFile(
+            fileNameForModuleFormatDetection,
+            options,
+            !host.useCaseSensitiveFileNames(),
+            currentDirectory,
+            getAssumedCommonSourceDirectory
+          ) || getOutputJSFileNameWithoutConfigFile(
+            fileNameForModuleFormatDetection,
+            options,
+            !host.useCaseSensitiveFileNames(),
+            currentDirectory,
+            getAssumedCommonSourceDirectory
+          ) || fileNameForModuleFormatDetection;
+        }
+      }
+      return getImpliedNodeFormatForFileWorker(
+        fileNameForModuleFormatDetection,
+        moduleResolutionCache == null ? void 0 : moduleResolutionCache.getPackageJsonInfoCache(),
+        host,
+        options
+      );
+    }
+    function getCreateSourceFileOptions(fileName) {
+      const result = getImpliedNodeFormatForFile2(fileName);
+      const languageVersion = getEmitScriptTarget(options);
+      const setExternalModuleIndicator2 = getSetExternalModuleIndicator(options);
       return typeof result === "object" ? { ...result, languageVersion, setExternalModuleIndicator: setExternalModuleIndicator2 } : { languageVersion, impliedNodeFormat: result, setExternalModuleIndicator: setExternalModuleIndicator2 };
     }
     function findSourceFileWorker(fileName, isDefaultLib, ignoreNoDefaultLib, reason, packageId) {
@@ -118395,7 +118476,7 @@ ${lanes.join("\n")}
           redirectedPath = toPath3(redirect);
         }
       }
-      const sourceFileOptions = getCreateSourceFileOptions(fileName, moduleResolutionCache, host, options);
+      const sourceFileOptions = getCreateSourceFileOptions(fileName);
       const file = host.getSourceFile(
         fileName,
         sourceFileOptions,
@@ -119018,6 +119099,9 @@ ${lanes.join("\n")}
           createDiagnosticForOptionName(Diagnostics.Cannot_find_the_common_subdirectory_path_for_the_input_files, "outDir");
         }
       }
+      if (assumedCommonSourceDirectory && assumedCommonSourceDirectory !== getCommonSourceDirectory2()) {
+        programDiagnostics.add(createCompilerDiagnostic(Diagnostics.The_project_root_is_ambiguous_but_is_required_to_determine_the_module_format_of_output_js_files_Supply_the_rootDir_compiler_option_to_disambiguate));
+      }
       if (options.useDefineForClassFields && languageVersion === 0 /* ES3 */) {
         createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_when_option_target_is_ES3, "useDefineForClassFields");
       }
@@ -181922,8 +182006,11 @@ ${e.message}`;
     getOriginalNodeId: () => getOriginalNodeId,
     getOriginalSourceFile: () => getOriginalSourceFile,
     getOutputDeclarationFileName: () => getOutputDeclarationFileName,
+    getOutputDeclarationFileNameWithoutConfigFile: () => getOutputDeclarationFileNameWithoutConfigFile,
     getOutputExtension: () => getOutputExtension,
     getOutputFileNames: () => getOutputFileNames,
+    getOutputJSFileName: () => getOutputJSFileName,
+    getOutputJSFileNameWithoutConfigFile: () => getOutputJSFileNameWithoutConfigFile,
     getOutputPathsFor: () => getOutputPathsFor,
     getOutputPathsForBundle: () => getOutputPathsForBundle,
     getOwnEmitOutputFilePath: () => getOwnEmitOutputFilePath,
@@ -184301,8 +184388,11 @@ ${e.message}`;
     getOriginalNodeId: () => getOriginalNodeId,
     getOriginalSourceFile: () => getOriginalSourceFile,
     getOutputDeclarationFileName: () => getOutputDeclarationFileName,
+    getOutputDeclarationFileNameWithoutConfigFile: () => getOutputDeclarationFileNameWithoutConfigFile,
     getOutputExtension: () => getOutputExtension,
     getOutputFileNames: () => getOutputFileNames,
+    getOutputJSFileName: () => getOutputJSFileName,
+    getOutputJSFileNameWithoutConfigFile: () => getOutputJSFileNameWithoutConfigFile,
     getOutputPathsFor: () => getOutputPathsFor,
     getOutputPathsForBundle: () => getOutputPathsForBundle,
     getOwnEmitOutputFilePath: () => getOwnEmitOutputFilePath,

package/lib/typescript.js

@@ -7452,6 +7452,7 @@ ${lanes.join("\n")}
         The_project_root_is_ambiguous_but_is_required_to_resolve_import_map_entry_0_in_file_1_Supply_the_rootDir_compiler_option_to_disambiguate: diag(2210, 1 /* Error */, "The_project_root_is_ambiguous_but_is_required_to_resolve_import_map_entry_0_in_file_1_Supply_the_roo_2210", "The project root is ambiguous, but is required to resolve import map entry '{0}' in file '{1}'. Supply the `rootDir` compiler option to disambiguate."),
         Add_extends_constraint: diag(2211, 3 /* Message */, "Add_extends_constraint_2211", "Add `extends` constraint."),
         Add_extends_constraint_to_all_type_parameters: diag(2212, 3 /* Message */, "Add_extends_constraint_to_all_type_parameters_2212", "Add `extends` constraint to all type parameters"),
+        The_project_root_is_ambiguous_but_is_required_to_determine_the_module_format_of_output_js_files_Supply_the_rootDir_compiler_option_to_disambiguate: diag(2213, 1 /* Error */, "The_project_root_is_ambiguous_but_is_required_to_determine_the_module_format_of_output_js_files_Supp_2213", "The project root is ambiguous, but is required to determine the module format of output '.js' files. Supply the `rootDir` compiler option to disambiguate."),
         Duplicate_identifier_0: diag(2300, 1 /* Error */, "Duplicate_identifier_0_2300", "Duplicate identifier '{0}'."),
         Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: diag(2301, 1 /* Error */, "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor."),
         Static_members_cannot_reference_class_type_parameters: diag(2302, 1 /* Error */, "Static_members_cannot_reference_class_type_parameters_2302", "Static members cannot reference class type parameters."),
@@ -55096,13 +55097,19 @@ ${lanes.join("\n")}
       if (getObjectFlags(type) & 4 /* Reference */) {
         const target = type.target;
         const typeArguments = getTypeArguments(type);
-        return length(target.typeParameters) === length(typeArguments) ? createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType])) : type;
+        if (length(target.typeParameters) === length(typeArguments)) {
+          const ref = createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType]));
+          return needApparentType ? getApparentType(ref) : ref;
+        }
       } else if (type.flags & 2097152 /* Intersection */) {
         const types = sameMap(type.types, (t) => getTypeWithThisArgument(t, thisArgument, needApparentType));
         return types !== type.types ? getIntersectionType(types) : type;
       }
       return needApparentType ? getApparentType(type) : type;
     }
+    function getThisArgument(type) {
+      return getObjectFlags(type) & 4 /* Reference */ && length(getTypeArguments(type)) > getTypeReferenceArity(type) ? last(getTypeArguments(type)) : type;
+    }
     function resolveObjectTypeMembers(type, source, typeParameters, typeArguments) {
       let mapper;
       let members;
@@ -56168,7 +56175,7 @@ ${lanes.join("\n")}
         return type.resolvedBaseConstraint;
       }
       const stack = [];
-      return type.resolvedBaseConstraint = getImmediateBaseConstraint(type);
+      return type.resolvedBaseConstraint = getTypeWithThisArgument(getImmediateBaseConstraint(type), getThisArgument(type));
       function getImmediateBaseConstraint(t) {
         if (!t.immediateBaseConstraint) {
           if (!pushTypeResolution(t, 4 /* ImmediateBaseConstraint */)) {
@@ -56260,18 +56267,18 @@ ${lanes.join("\n")}
         }
         if (isGenericTupleType(t)) {
           const newElements = map(getElementTypes(t), (v, i) => {
-            const constraint = v.flags & 262144 /* TypeParameter */ && t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
-            return constraint !== v && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
+            const constraint = t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
+            return constraint && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
           });
           return createTupleType(newElements, t.target.elementFlags, t.target.readonly, t.target.labeledElementDeclarations);
         }
         return t;
       }
     }
-    function getApparentTypeOfIntersectionType(type, thisArgument) {
+    function getApparentTypeOfIntersectionType(type) {
       return type.resolvedApparentType || (type.resolvedApparentType = getTypeWithThisArgument(
         type,
-        thisArgument,
+        type,
         /*needApparentType*/
         true
       ));
@@ -56322,9 +56329,8 @@ ${lanes.join("\n")}
       return !!(type.flags & 8388608 /* IndexedAccess */ && getObjectFlags(objectType = type.objectType) & 32 /* Mapped */ && !isGenericMappedType(objectType) && isGenericIndexType(type.indexType) && !(getMappedTypeModifiers(objectType) & 8 /* ExcludeOptional */) && !objectType.declaration.nameType);
     }
     function getApparentType(type) {
-      const t = type.flags & 465829888 /* Instantiable */ ? getBaseConstraintOfType(type) || unknownType : type;
-      const objectFlags = getObjectFlags(t);
-      return objectFlags & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : objectFlags & 4 /* Reference */ && t !== type ? getTypeWithThisArgument(t, type) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t, type) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
+      const t = !(type.flags & 465829888 /* Instantiable */) ? type : getBaseConstraintOfType(type) || unknownType;
+      return getObjectFlags(t) & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
     }
     function getReducedApparentType(type) {
       return getReducedType(getApparentType(getReducedType(type)));
@@ -60532,7 +60538,10 @@ ${lanes.join("\n")}
           const newMapper = createTypeMapper(typeParameters, typeArguments);
           result = target.objectFlags & 4 /* Reference */ ? createDeferredTypeReference(type.target, type.node, newMapper, newAliasSymbol, newAliasTypeArguments) : target.objectFlags & 32 /* Mapped */ ? instantiateMappedType(target, newMapper, newAliasSymbol, newAliasTypeArguments) : instantiateAnonymousType(target, newMapper, newAliasSymbol, newAliasTypeArguments);
           if (result.flags & 138117121 /* ObjectFlagsType */ && !(result.objectFlags & 524288 /* CouldContainTypeVariablesComputed */)) {
-            result.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (some(typeArguments, couldContainTypeVariables) ? 1048576 /* CouldContainTypeVariables */ : 0);
+            const resultCouldContainTypeVariables = some(typeArguments, couldContainTypeVariables);
+            if (!(result.objectFlags & 524288 /* CouldContainTypeVariablesComputed */)) {
+              result.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (resultCouldContainTypeVariables ? 1048576 /* CouldContainTypeVariables */ : 0);
+            }
           }
           target.instantiations.set(id, result);
         }
@@ -63145,7 +63154,7 @@ ${lanes.join("\n")}
             return 3 /* Maybe */;
           }
           const c = target2;
-          if (!c.root.inferTypeParameters && !isDistributionDependent(c.root) && !(source2.flags & 16777216 /* Conditional */ && source2.root === c.root)) {
+          if (!c.root.inferTypeParameters && !isDistributionDependent(c.root)) {
             const skipTrue = !isTypeAssignableTo(getPermissiveInstantiation(c.checkType), getPermissiveInstantiation(c.extendsType));
             const skipFalse = !skipTrue && isTypeAssignableTo(getRestrictiveInstantiation(c.checkType), getRestrictiveInstantiation(c.extendsType));
             if (result2 = skipTrue ? -1 /* True */ : isRelatedTo(
@@ -110078,6 +110087,15 @@ ${lanes.join("\n")}
       getDeclarationEmitExtensionForPath(inputFileName)
     );
   }
+  function getOutputDeclarationFileNameWithoutConfigFile(inputFileName, options, ignoreCase, currentDirectory, getCommonSourceDirectory2) {
+    const directory = options.declarationDir || options.outDir ? getNormalizedAbsolutePath(options.declarationDir || options.outDir, currentDirectory) : void 0;
+    const outputPathWithoutChangedExtension = directory ? resolvePath(directory, getRelativePathFromDirectory(getCommonSourceDirectory2(), inputFileName, ignoreCase)) : inputFileName;
+    const outputFileName = changeExtension(
+      outputPathWithoutChangedExtension,
+      getDeclarationEmitExtensionForPath(inputFileName)
+    );
+    return outputFileName;
+  }
   function getOutputJSFileName(inputFileName, configFile, ignoreCase, getCommonSourceDirectory2) {
     if (configFile.options.emitDeclarationOnly)
       return void 0;
@@ -110088,6 +110106,18 @@ ${lanes.join("\n")}
     );
     return !isJsonFile || comparePaths(inputFileName, outputFileName, Debug.checkDefined(configFile.options.configFilePath), ignoreCase) !== 0 /* EqualTo */ ? outputFileName : void 0;
   }
+  function getOutputJSFileNameWithoutConfigFile(inputFileName, options, ignoreCase, currentDirectory, getCommonSourceDirectory2) {
+    if (options.emitDeclarationOnly)
+      return void 0;
+    const isJsonFile = fileExtensionIs(inputFileName, ".json" /* Json */);
+    const outDir = options.outDir ? getNormalizedAbsolutePath(options.outDir, currentDirectory) : void 0;
+    const outputPathWithoutChangedExtension = outDir ? resolvePath(outDir, getRelativePathFromDirectory(getCommonSourceDirectory2(), inputFileName, ignoreCase)) : inputFileName;
+    const outputFileName = changeExtension(
+      outputPathWithoutChangedExtension,
+      getOutputExtension(inputFileName, options)
+    );
+    return !isJsonFile || !options.configFilePath || comparePaths(inputFileName, outputFileName, options.configFilePath, ignoreCase) !== 0 /* EqualTo */ ? outputFileName : void 0;
+  }
   function createAddOutput() {
     let outputs;
     return { addOutput, getOutputs };
@@ -116618,6 +116648,15 @@ ${lanes.join("\n")}
       return { impliedNodeFormat, packageJsonLocations, packageJsonScope };
     }
   }
+  function moduleFormatNeedsPackageJsonLookup(fileName, options) {
+    switch (getEmitModuleResolutionKind(options)) {
+      case 3 /* Node16 */:
+      case 99 /* NodeNext */:
+        return fileExtensionIsOneOf(fileName, [".d.ts" /* Dts */, ".ts" /* Ts */, ".tsx" /* Tsx */, ".js" /* Js */, ".jsx" /* Jsx */]);
+      default:
+        return false;
+    }
+  }
   function shouldProgramCreateNewSourceFiles(program, newOptions) {
     if (!program)
       return false;
@@ -116644,6 +116683,7 @@ ${lanes.join("\n")}
     let files;
     let symlinks;
     let commonSourceDirectory;
+    let assumedCommonSourceDirectory;
     let typeChecker;
     let classifiableNames;
     const ambientModuleNameToUnmodifiedFileName = /* @__PURE__ */ new Map();
@@ -117135,6 +117175,9 @@ ${lanes.join("\n")}
       }
       return commonSourceDirectory;
     }
+    function getAssumedCommonSourceDirectory() {
+      return commonSourceDirectory ?? (assumedCommonSourceDirectory ?? (assumedCommonSourceDirectory = getCommonSourceDirectory(options, () => rootNames, host.getCurrentDirectory(), getCanonicalFileName)));
+    }
     function getClassifiableNames() {
       var _a2;
       if (!classifiableNames) {
@@ -117358,7 +117401,7 @@ ${lanes.join("\n")}
       })(SeenPackageName || (SeenPackageName = {}));
       const seenPackageNames = /* @__PURE__ */ new Map();
       for (const oldSourceFile of oldSourceFiles) {
-        const sourceFileOptions = getCreateSourceFileOptions(oldSourceFile.fileName, moduleResolutionCache, host, options);
+        const sourceFileOptions = getCreateSourceFileOptions(oldSourceFile.fileName);
         let newSourceFile = host.getSourceFileByPath ? host.getSourceFileByPath(
           oldSourceFile.fileName,
           oldSourceFile.resolvedPath,
@@ -118320,10 +118363,48 @@ ${lanes.join("\n")}
       (_b2 = tracing) == null ? void 0 : _b2.pop();
       return result;
     }
-    function getCreateSourceFileOptions(fileName, moduleResolutionCache2, host2, options2) {
-      const result = getImpliedNodeFormatForFileWorker(getNormalizedAbsolutePath(fileName, currentDirectory), moduleResolutionCache2 == null ? void 0 : moduleResolutionCache2.getPackageJsonInfoCache(), host2, options2);
-      const languageVersion = getEmitScriptTarget(options2);
-      const setExternalModuleIndicator2 = getSetExternalModuleIndicator(options2);
+    function getImpliedNodeFormatForFile2(fileName) {
+      let fileNameForModuleFormatDetection = getNormalizedAbsolutePath(fileName, currentDirectory);
+      if (moduleFormatNeedsPackageJsonLookup(fileName, options)) {
+        const projectReference = getResolvedProjectReferenceToRedirect(fileName);
+        if (projectReference) {
+          Debug.assert(useSourceOfProjectReferenceRedirect);
+          fileNameForModuleFormatDetection = getOutputDeclarationFileName(
+            fileNameForModuleFormatDetection,
+            projectReference.commandLine,
+            !host.useCaseSensitiveFileNames()
+          ) || getOutputJSFileName(
+            fileNameForModuleFormatDetection,
+            projectReference.commandLine,
+            !host.useCaseSensitiveFileNames()
+          ) || fileNameForModuleFormatDetection;
+        } else {
+          fileNameForModuleFormatDetection = getOutputDeclarationFileNameWithoutConfigFile(
+            fileNameForModuleFormatDetection,
+            options,
+            !host.useCaseSensitiveFileNames(),
+            currentDirectory,
+            getAssumedCommonSourceDirectory
+          ) || getOutputJSFileNameWithoutConfigFile(
+            fileNameForModuleFormatDetection,
+            options,
+            !host.useCaseSensitiveFileNames(),
+            currentDirectory,
+            getAssumedCommonSourceDirectory
+          ) || fileNameForModuleFormatDetection;
+        }
+      }
+      return getImpliedNodeFormatForFileWorker(
+        fileNameForModuleFormatDetection,
+        moduleResolutionCache == null ? void 0 : moduleResolutionCache.getPackageJsonInfoCache(),
+        host,
+        options
+      );
+    }
+    function getCreateSourceFileOptions(fileName) {
+      const result = getImpliedNodeFormatForFile2(fileName);
+      const languageVersion = getEmitScriptTarget(options);
+      const setExternalModuleIndicator2 = getSetExternalModuleIndicator(options);
       return typeof result === "object" ? { ...result, languageVersion, setExternalModuleIndicator: setExternalModuleIndicator2 } : { languageVersion, impliedNodeFormat: result, setExternalModuleIndicator: setExternalModuleIndicator2 };
     }
     function findSourceFileWorker(fileName, isDefaultLib, ignoreNoDefaultLib, reason, packageId) {
@@ -118395,7 +118476,7 @@ ${lanes.join("\n")}
           redirectedPath = toPath3(redirect);
         }
       }
-      const sourceFileOptions = getCreateSourceFileOptions(fileName, moduleResolutionCache, host, options);
+      const sourceFileOptions = getCreateSourceFileOptions(fileName);
       const file = host.getSourceFile(
         fileName,
         sourceFileOptions,
@@ -119018,6 +119099,9 @@ ${lanes.join("\n")}
           createDiagnosticForOptionName(Diagnostics.Cannot_find_the_common_subdirectory_path_for_the_input_files, "outDir");
         }
       }
+      if (assumedCommonSourceDirectory && assumedCommonSourceDirectory !== getCommonSourceDirectory2()) {
+        programDiagnostics.add(createCompilerDiagnostic(Diagnostics.The_project_root_is_ambiguous_but_is_required_to_determine_the_module_format_of_output_js_files_Supply_the_rootDir_compiler_option_to_disambiguate));
+      }
       if (options.useDefineForClassFields && languageVersion === 0 /* ES3 */) {
         createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_when_option_target_is_ES3, "useDefineForClassFields");
       }
@@ -170560,8 +170644,11 @@ ${options.prefix}` : "\n" : options.prefix
     getOriginalNodeId: () => getOriginalNodeId,
     getOriginalSourceFile: () => getOriginalSourceFile,
     getOutputDeclarationFileName: () => getOutputDeclarationFileName,
+    getOutputDeclarationFileNameWithoutConfigFile: () => getOutputDeclarationFileNameWithoutConfigFile,
     getOutputExtension: () => getOutputExtension,
     getOutputFileNames: () => getOutputFileNames,
+    getOutputJSFileName: () => getOutputJSFileName,
+    getOutputJSFileNameWithoutConfigFile: () => getOutputJSFileNameWithoutConfigFile,
     getOutputPathsFor: () => getOutputPathsFor,
     getOutputPathsForBundle: () => getOutputPathsForBundle,
     getOwnEmitOutputFilePath: () => getOwnEmitOutputFilePath,

package/lib/typingsInstaller.js

@@ -5512,6 +5512,7 @@ var Diagnostics = {
   The_project_root_is_ambiguous_but_is_required_to_resolve_import_map_entry_0_in_file_1_Supply_the_rootDir_compiler_option_to_disambiguate: diag(2210, 1 /* Error */, "The_project_root_is_ambiguous_but_is_required_to_resolve_import_map_entry_0_in_file_1_Supply_the_roo_2210", "The project root is ambiguous, but is required to resolve import map entry '{0}' in file '{1}'. Supply the `rootDir` compiler option to disambiguate."),
   Add_extends_constraint: diag(2211, 3 /* Message */, "Add_extends_constraint_2211", "Add `extends` constraint."),
   Add_extends_constraint_to_all_type_parameters: diag(2212, 3 /* Message */, "Add_extends_constraint_to_all_type_parameters_2212", "Add `extends` constraint to all type parameters"),
+  The_project_root_is_ambiguous_but_is_required_to_determine_the_module_format_of_output_js_files_Supply_the_rootDir_compiler_option_to_disambiguate: diag(2213, 1 /* Error */, "The_project_root_is_ambiguous_but_is_required_to_determine_the_module_format_of_output_js_files_Supp_2213", "The project root is ambiguous, but is required to determine the module format of output '.js' files. Supply the `rootDir` compiler option to disambiguate."),
   Duplicate_identifier_0: diag(2300, 1 /* Error */, "Duplicate_identifier_0_2300", "Duplicate identifier '{0}'."),
   Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: diag(2301, 1 /* Error */, "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor."),
   Static_members_cannot_reference_class_type_parameters: diag(2302, 1 /* Error */, "Static_members_cannot_reference_class_type_parameters_2302", "Static members cannot reference class type parameters."),

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.2.0-pr-54536-13",
+  "version": "5.2.0-pr-54546-4",
   "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": "014d2271f382640d52e637d4b56b59776ff166fa"
+  "gitHead": "446ee953056bfa863934a25998e0655dfd8cbac3"
 }