@typescript-deploys/pr-build 5.2.0-pr-54507-7 → 5.2.0-pr-54546-4

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,
@@ -2304,7 +2307,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-insiders.20230602`;
+var version = `${versionMajorMinor}.0-insiders.20230605`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -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."),
@@ -47309,10 +47313,11 @@ var CheckMode = /* @__PURE__ */ ((CheckMode3) => {
   CheckMode3[CheckMode3["Inferential"] = 2] = "Inferential";
   CheckMode3[CheckMode3["SkipContextSensitive"] = 4] = "SkipContextSensitive";
   CheckMode3[CheckMode3["SkipGenericFunctions"] = 8] = "SkipGenericFunctions";
-  CheckMode3[CheckMode3["IsForSignatureHelp"] = 16] = "IsForSignatureHelp";
-  CheckMode3[CheckMode3["IsForStringLiteralArgumentCompletions"] = 32] = "IsForStringLiteralArgumentCompletions";
-  CheckMode3[CheckMode3["RestBindingElement"] = 64] = "RestBindingElement";
-  CheckMode3[CheckMode3["TypeOnly"] = 128] = "TypeOnly";
+  CheckMode3[CheckMode3["SkipAddingIntraExpressionSites"] = 16] = "SkipAddingIntraExpressionSites";
+  CheckMode3[CheckMode3["IsForSignatureHelp"] = 32] = "IsForSignatureHelp";
+  CheckMode3[CheckMode3["IsForStringLiteralArgumentCompletions"] = 64] = "IsForStringLiteralArgumentCompletions";
+  CheckMode3[CheckMode3["RestBindingElement"] = 128] = "RestBindingElement";
+  CheckMode3[CheckMode3["TypeOnly"] = 256] = "TypeOnly";
   return CheckMode3;
 })(CheckMode || {});
 var SignatureCheckMode = /* @__PURE__ */ ((SignatureCheckMode3) => {
@@ -47592,9 +47597,9 @@ function createTypeChecker(host) {
       candidatesOutArray,
       /*argumentCount*/
       void 0,
-      32 /* IsForStringLiteralArgumentCompletions */
+      64 /* IsForStringLiteralArgumentCompletions */
     )),
-    getResolvedSignatureForSignatureHelp: (node, candidatesOutArray, argumentCount) => runWithoutResolvedSignatureCaching(node, () => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 16 /* IsForSignatureHelp */)),
+    getResolvedSignatureForSignatureHelp: (node, candidatesOutArray, argumentCount) => runWithoutResolvedSignatureCaching(node, () => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 32 /* IsForSignatureHelp */)),
     getExpandedParameters,
     hasEffectiveRestParameter,
     containsArgumentsReference,
@@ -55549,7 +55554,7 @@ function createTypeChecker(host) {
     return type.flags & (128 /* StringLiteral */ | 256 /* NumberLiteral */) ? "" + type.value : void 0;
   }
   function getTypeForBindingElement(declaration) {
-    const checkMode = declaration.dotDotDotToken ? 64 /* RestBindingElement */ : 0 /* Normal */;
+    const checkMode = declaration.dotDotDotToken ? 128 /* RestBindingElement */ : 0 /* Normal */;
     const parentType = getTypeForBindingElementParent(declaration.parent.parent, checkMode);
     return parentType && getBindingElementTypeFromParentType(declaration, parentType);
   }
@@ -70449,7 +70454,7 @@ function createTypeChecker(host) {
     return type.flags & 2097152 /* Intersection */ ? some(type.types, isGenericTypeWithoutNullableConstraint) : !!(type.flags & 465829888 /* Instantiable */ && !maybeTypeOfKind(getBaseConstraintOrType(type), 98304 /* Nullable */));
   }
   function hasContextualTypeWithNoGenericTypes(node, checkMode) {
-    const contextualType = (isIdentifier(node) || isPropertyAccessExpression(node) || isElementAccessExpression(node)) && !((isJsxOpeningElement(node.parent) || isJsxSelfClosingElement(node.parent)) && node.parent.tagName === node) && (checkMode && checkMode & 64 /* RestBindingElement */ ? getContextualType2(node, 8 /* SkipBindingPatterns */) : getContextualType2(
+    const contextualType = (isIdentifier(node) || isPropertyAccessExpression(node) || isElementAccessExpression(node)) && !((isJsxOpeningElement(node.parent) || isJsxSelfClosingElement(node.parent)) && node.parent.tagName === node) && (checkMode && checkMode & 128 /* RestBindingElement */ ? getContextualType2(node, 8 /* SkipBindingPatterns */) : getContextualType2(
       node,
       /*contextFlags*/
       void 0
@@ -71206,7 +71211,7 @@ function createTypeChecker(host) {
   function getContextualTypeForBindingElement(declaration, contextFlags) {
     const parent2 = declaration.parent.parent;
     const name = declaration.propertyName || declaration.name;
-    const parentType = getContextualTypeForVariableLikeDeclaration(parent2, contextFlags) || parent2.kind !== 207 /* BindingElement */ && parent2.initializer && checkDeclarationInitializer(parent2, declaration.dotDotDotToken ? 64 /* RestBindingElement */ : 0 /* Normal */);
+    const parentType = getContextualTypeForVariableLikeDeclaration(parent2, contextFlags) || parent2.kind !== 207 /* BindingElement */ && parent2.initializer && checkDeclarationInitializer(parent2, declaration.dotDotDotToken ? 128 /* RestBindingElement */ : 0 /* Normal */);
     if (!parentType || isBindingPattern(name) || isComputedNonLiteralName(name))
       return void 0;
     if (parent2.name.kind === 206 /* ArrayBindingPattern */) {
@@ -72255,7 +72260,9 @@ function createTypeChecker(host) {
         elementTypes.push(undefinedOrMissingType);
         elementFlags.push(2 /* Optional */);
       } else {
-        const type = checkExpressionForMutableLocation(e, checkMode, forceTuple);
+        const shouldAddAsIntraExpressionInferenceSite = inTupleContext && checkMode && checkMode & 2 /* Inferential */ && !(checkMode & (4 /* SkipContextSensitive */ | 16 /* SkipAddingIntraExpressionSites */)) && isContextSensitive(e);
+        const elementCheckMode = (checkMode || 0 /* Normal */) | (shouldAddAsIntraExpressionInferenceSite ? 16 /* SkipAddingIntraExpressionSites */ : 0);
+        const type = checkExpressionForMutableLocation(e, elementCheckMode, forceTuple);
         elementTypes.push(addOptionality(
           type,
           /*isProperty*/
@@ -72263,7 +72270,7 @@ function createTypeChecker(host) {
           hasOmittedExpression
         ));
         elementFlags.push(hasOmittedExpression ? 2 /* Optional */ : 1 /* Required */);
-        if (inTupleContext && checkMode && checkMode & 2 /* Inferential */ && !(checkMode & 4 /* SkipContextSensitive */) && isContextSensitive(e)) {
+        if (shouldAddAsIntraExpressionInferenceSite) {
           const inferenceContext = getInferenceContext(node);
           Debug.assert(inferenceContext);
           addIntraExpressionInferenceSite(inferenceContext, e, type);
@@ -72404,11 +72411,13 @@ function createTypeChecker(host) {
       let member = getSymbolOfDeclaration(memberDecl);
       const computedNameType = memberDecl.name && memberDecl.name.kind === 166 /* ComputedPropertyName */ ? checkComputedPropertyName(memberDecl.name) : void 0;
       if (memberDecl.kind === 302 /* PropertyAssignment */ || memberDecl.kind === 303 /* ShorthandPropertyAssignment */ || isObjectLiteralMethod(memberDecl)) {
-        let type = memberDecl.kind === 302 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) : (
+        const shouldAddAsIntraExpressionInferenceSite = contextualType && checkMode & 2 /* Inferential */ && !(checkMode & (4 /* SkipContextSensitive */ | 16 /* SkipAddingIntraExpressionSites */)) && (memberDecl.kind === 302 /* PropertyAssignment */ || memberDecl.kind === 173 /* MethodDeclaration */) && isContextSensitive(memberDecl);
+        const propCheckMode = checkMode | (shouldAddAsIntraExpressionInferenceSite ? 16 /* SkipAddingIntraExpressionSites */ : 0);
+        let type = memberDecl.kind === 302 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, propCheckMode) : (
           // avoid resolving the left side of the ShorthandPropertyAssignment outside of the destructuring
           // for error recovery purposes. For example, if a user wrote `{ a = 100 }` instead of `{ a: 100 }`.
           // we don't want to say "could not find 'a'".
-          memberDecl.kind === 303 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(!inDestructuringPattern && memberDecl.objectAssignmentInitializer ? memberDecl.objectAssignmentInitializer : memberDecl.name, checkMode) : checkObjectLiteralMethod(memberDecl, checkMode)
+          memberDecl.kind === 303 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(!inDestructuringPattern && memberDecl.objectAssignmentInitializer ? memberDecl.objectAssignmentInitializer : memberDecl.name, propCheckMode) : checkObjectLiteralMethod(memberDecl, propCheckMode)
         );
         if (isInJavascript) {
           const jsDocType = getTypeForDeclarationFromJSDocComment(memberDecl);
@@ -72452,7 +72461,7 @@ function createTypeChecker(host) {
         prop.links.target = member;
         member = prop;
         allPropertiesTable == null ? void 0 : allPropertiesTable.set(prop.escapedName, prop);
-        if (contextualType && checkMode & 2 /* Inferential */ && !(checkMode & 4 /* SkipContextSensitive */) && (memberDecl.kind === 302 /* PropertyAssignment */ || memberDecl.kind === 173 /* MethodDeclaration */) && isContextSensitive(memberDecl)) {
+        if (shouldAddAsIntraExpressionInferenceSite) {
           const inferenceContext = getInferenceContext(node);
           Debug.assert(inferenceContext);
           const inferenceNode = memberDecl.kind === 302 /* PropertyAssignment */ ? memberDecl.initializer : memberDecl;
@@ -72625,7 +72634,9 @@ function createTypeChecker(host) {
     for (const attributeDecl of attributes.properties) {
       const member = attributeDecl.symbol;
       if (isJsxAttribute(attributeDecl)) {
-        const exprType = checkJsxAttribute(attributeDecl, checkMode);
+        const shouldAddAsIntraExpressionInferenceSite = contextualType && checkMode & 2 /* Inferential */ && !(checkMode & (4 /* SkipContextSensitive */ | 16 /* SkipAddingIntraExpressionSites */)) && isContextSensitive(attributeDecl);
+        const attributeCheckMode = checkMode | (shouldAddAsIntraExpressionInferenceSite ? 16 /* SkipAddingIntraExpressionSites */ : 0);
+        const exprType = checkJsxAttribute(attributeDecl, attributeCheckMode);
         objectFlags |= getObjectFlags(exprType) & 458752 /* PropagatingFlags */;
         const attributeSymbol = createSymbol(4 /* Property */ | member.flags, member.escapedName);
         attributeSymbol.declarations = member.declarations;
@@ -72646,7 +72657,7 @@ function createTypeChecker(host) {
             addDeprecatedSuggestion(attributeDecl.name, prop.declarations, attributeDecl.name.escapedText);
           }
         }
-        if (contextualType && checkMode & 2 /* Inferential */ && !(checkMode & 4 /* SkipContextSensitive */) && isContextSensitive(attributeDecl)) {
+        if (shouldAddAsIntraExpressionInferenceSite) {
           const inferenceContext = getInferenceContext(attributes);
           Debug.assert(inferenceContext);
           const inferenceNode = attributeDecl.initializer.expression;
@@ -74264,7 +74275,7 @@ function createTypeChecker(host) {
     }
     for (let i = 0; i < argCount; i++) {
       const arg = args[i];
-      if (arg.kind !== 231 /* OmittedExpression */ && !(checkMode & 32 /* IsForStringLiteralArgumentCompletions */ && hasSkipDirectInferenceFlag(arg))) {
+      if (arg.kind !== 231 /* OmittedExpression */ && !(checkMode & 64 /* IsForStringLiteralArgumentCompletions */ && hasSkipDirectInferenceFlag(arg))) {
         const paramType = getTypeAtPosition(signature, i);
         if (couldContainTypeVariables(paramType)) {
           const argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
@@ -74877,12 +74888,12 @@ function createTypeChecker(host) {
     const args = getEffectiveCallArguments(node);
     const isSingleNonGenericCandidate = candidates.length === 1 && !candidates[0].typeParameters;
     let argCheckMode = !isDecorator2 && !isSingleNonGenericCandidate && some(args, isContextSensitive) ? 4 /* SkipContextSensitive */ : 0 /* Normal */;
-    argCheckMode |= checkMode & 32 /* IsForStringLiteralArgumentCompletions */;
+    argCheckMode |= checkMode & 64 /* IsForStringLiteralArgumentCompletions */;
     let candidatesForArgumentError;
     let candidateForArgumentArityError;
     let candidateForTypeArgumentError;
     let result;
-    const signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 212 /* CallExpression */ && node.arguments.hasTrailingComma;
+    const signatureHelpTrailingComma = !!(checkMode & 32 /* IsForSignatureHelp */) && node.kind === 212 /* CallExpression */ && node.arguments.hasTrailingComma;
     if (candidates.length > 1) {
       result = chooseOverload(candidates, subtypeRelation, isSingleNonGenericCandidate, signatureHelpTrailingComma);
     }
@@ -75101,7 +75112,7 @@ function createTypeChecker(host) {
           continue;
         }
         if (argCheckMode) {
-          argCheckMode = checkMode & 32 /* IsForStringLiteralArgumentCompletions */;
+          argCheckMode = checkMode & 64 /* IsForStringLiteralArgumentCompletions */;
           if (inferenceContext) {
             const typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext);
             checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, isInJSFile(candidate.declaration), inferenceContext.inferredTypeParameters);
@@ -78179,7 +78190,7 @@ function createTypeChecker(host) {
       case 36 /* ExclamationEqualsToken */:
       case 37 /* EqualsEqualsEqualsToken */:
       case 38 /* ExclamationEqualsEqualsToken */:
-        if (!(checkMode && checkMode & 128 /* TypeOnly */)) {
+        if (!(checkMode && checkMode & 256 /* TypeOnly */)) {
           if (isLiteralExpressionOfObject(left) || isLiteralExpressionOfObject(right)) {
             const eqType = operator === 35 /* EqualsEqualsToken */ || operator === 37 /* EqualsEqualsEqualsToken */;
             error(errorNode, Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value, eqType ? "false" : "true");
@@ -78838,7 +78849,7 @@ function createTypeChecker(host) {
       }
     }
     const startInvocationCount = flowInvocationCount;
-    const type = checkExpression(node, 128 /* TypeOnly */);
+    const type = checkExpression(node, 256 /* TypeOnly */);
     if (flowInvocationCount !== startInvocationCount) {
       const cache = flowTypeCache || (flowTypeCache = []);
       cache[getNodeId(node)] = type;
@@ -81309,7 +81320,7 @@ function createTypeChecker(host) {
         checkComputedPropertyName(node.propertyName);
       }
       const parent2 = node.parent.parent;
-      const parentCheckMode = node.dotDotDotToken ? 64 /* RestBindingElement */ : 0 /* Normal */;
+      const parentCheckMode = node.dotDotDotToken ? 128 /* RestBindingElement */ : 0 /* Normal */;
       const parentType = getTypeForBindingElementParent(parent2, parentCheckMode);
       const name = node.propertyName || node.name;
       if (parentType && !isBindingPattern(name)) {
@@ -111976,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;
@@ -111986,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 };
@@ -118526,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,
@@ -118646,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();
@@ -119137,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) {
@@ -119360,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,
@@ -120322,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) {
@@ -120397,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,
@@ -121020,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");
     }
@@ -162744,13 +162830,29 @@ function provideInlayHints(context) {
     if (!signature || !candidates.length) {
       return;
     }
-    for (let i = 0; i < args.length; ++i) {
-      const originalArg = args[i];
+    let signatureParamPos = 0;
+    for (const originalArg of args) {
       const arg = skipParentheses(originalArg);
       if (shouldShowLiteralParameterNameHintsOnly(preferences) && !isHintableLiteral(arg)) {
         continue;
       }
-      const identifierNameInfo = checker.getParameterIdentifierNameAtPosition(signature, i);
+      let spreadArgs = 0;
+      if (isSpreadElement(arg)) {
+        const spreadType = checker.getTypeAtLocation(arg.expression);
+        if (checker.isTupleType(spreadType)) {
+          const { elementFlags, fixedLength } = spreadType.target;
+          if (fixedLength === 0) {
+            continue;
+          }
+          const firstOptionalIndex = findIndex(elementFlags, (f) => !(f & 1 /* Required */));
+          const requiredArgs = firstOptionalIndex < 0 ? fixedLength : firstOptionalIndex;
+          if (requiredArgs > 0) {
+            spreadArgs = firstOptionalIndex < 0 ? fixedLength : firstOptionalIndex;
+          }
+        }
+      }
+      const identifierNameInfo = checker.getParameterIdentifierNameAtPosition(signature, signatureParamPos);
+      signatureParamPos = signatureParamPos + (spreadArgs || 1);
       if (identifierNameInfo) {
         const [parameterName, isFirstVariadicArgument] = identifierNameInfo;
         const isParameterNameNotSameAsArgument = preferences.includeInlayParameterNameHintsWhenArgumentMatchesName || !identifierOrAccessExpressionPostfixMatchesParameterName(arg, parameterName);
@@ -170784,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,
@@ -185257,8 +185362,11 @@ start(initializeNodeSystem(), require("os").platform());
   getOriginalNodeId,
   getOriginalSourceFile,
   getOutputDeclarationFileName,
+  getOutputDeclarationFileNameWithoutConfigFile,
   getOutputExtension,
   getOutputFileNames,
+  getOutputJSFileName,
+  getOutputJSFileNameWithoutConfigFile,
   getOutputPathsFor,
   getOutputPathsForBundle,
   getOwnEmitOutputFilePath,