@typescript-deploys/pr-build 5.4.0-pr-56681-3 → 5.4.0-pr-56680-2

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-insiders.20231205`;
+var version = `${versionMajorMinor}.0-insiders.20231206`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -7353,9 +7353,6 @@ var Diagnostics = {
   Specify_emit_Slashchecking_behavior_for_imports_that_are_only_used_for_types: diag(6718, 3 /* Message */, "Specify_emit_Slashchecking_behavior_for_imports_that_are_only_used_for_types_6718", "Specify emit/checking behavior for imports that are only used for types."),
   Default_catch_clause_variables_as_unknown_instead_of_any: diag(6803, 3 /* Message */, "Default_catch_clause_variables_as_unknown_instead_of_any_6803", "Default catch clause variables as 'unknown' instead of 'any'."),
   Do_not_transform_or_elide_any_imports_or_exports_not_marked_as_type_only_ensuring_they_are_written_in_the_output_file_s_format_based_on_the_module_setting: diag(6804, 3 /* Message */, "Do_not_transform_or_elide_any_imports_or_exports_not_marked_as_type_only_ensuring_they_are_written_i_6804", "Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting."),
-  Specify_how_files_are_determined_to_be_ECMAScript_modules_or_CommonJS_modules: diag(6805, 3 /* Message */, "Specify_how_files_are_determined_to_be_ECMAScript_modules_or_CommonJS_modules_6805", "Specify how files are determined to be ECMAScript modules or CommonJS modules."),
-  Specify_the_target_runtime_s_rules_for_ESM_CommonJS_interoperation: diag(6806, 3 /* Message */, "Specify_the_target_runtime_s_rules_for_ESM_CommonJS_interoperation_6806", "Specify the target runtime's rules for ESM-CommonJS interoperation."),
-  Specify_defaults_for_module_options_suited_for_common_runtimes_and_bundlers: diag(6807, 3 /* Message */, "Specify_defaults_for_module_options_suited_for_common_runtimes_and_bundlers_6807", "Specify defaults for module options suited for common runtimes and bundlers."),
   one_of_Colon: diag(6900, 3 /* Message */, "one_of_Colon_6900", "one of:"),
   one_or_more_Colon: diag(6901, 3 /* Message */, "one_or_more_Colon_6901", "one or more:"),
   type_Colon: diag(6902, 3 /* Message */, "type_Colon_6902", "type:"),
@@ -7388,8 +7385,6 @@ var Diagnostics = {
   Compiles_the_current_project_with_additional_settings: diag(6929, 3 /* Message */, "Compiles_the_current_project_with_additional_settings_6929", "Compiles the current project, with additional settings."),
   true_for_ES2022_and_above_including_ESNext: diag(6930, 3 /* Message */, "true_for_ES2022_and_above_including_ESNext_6930", "`true` for ES2022 and above, including ESNext."),
   List_of_file_name_suffixes_to_search_when_resolving_a_module: diag(6931, 1 /* Error */, "List_of_file_name_suffixes_to_search_when_resolving_a_module_6931", "List of file name suffixes to search when resolving a module."),
-  node16_when_module_is_node16_nodenext_when_module_is_nodenext_none_otherwise: diag(6932, 3 /* Message */, "node16_when_module_is_node16_nodenext_when_module_is_nodenext_none_otherwise_6932", "'node16' when 'module' is 'node16'; 'nodenext' when 'module' is 'nodenext'; 'none' otherwise."),
-  node16_when_module_is_node16_nodenext_when_module_is_nodenext_babel_otherwise: diag(6933, 3 /* Message */, "node16_when_module_is_node16_nodenext_when_module_is_nodenext_babel_otherwise_6933", "'node16' when 'module' is 'node16'; 'nodenext' when 'module' is 'nodenext'; 'babel' otherwise."),
   Variable_0_implicitly_has_an_1_type: diag(7005, 1 /* Error */, "Variable_0_implicitly_has_an_1_type_7005", "Variable '{0}' implicitly has an '{1}' type."),
   Parameter_0_implicitly_has_an_1_type: diag(7006, 1 /* Error */, "Parameter_0_implicitly_has_an_1_type_7006", "Parameter '{0}' implicitly has an '{1}' type."),
   Member_0_implicitly_has_an_1_type: diag(7008, 1 /* Error */, "Member_0_implicitly_has_an_1_type_7008", "Member '{0}' implicitly has an '{1}' type."),
@@ -13871,12 +13866,12 @@ function canHaveJSDoc(node) {
 function getJSDocCommentsAndTags(hostNode, noCache) {
   let result;
   if (isVariableLike(hostNode) && hasInitializer(hostNode) && hasJSDocNodes(hostNode.initializer)) {
-    result = addRange(result, filterOwnedJSDocTags(hostNode, last(hostNode.initializer.jsDoc)));
+    result = addRange(result, filterOwnedJSDocTags(hostNode, hostNode.initializer.jsDoc));
   }
   let node = hostNode;
   while (node && node.parent) {
     if (hasJSDocNodes(node)) {
-      result = addRange(result, filterOwnedJSDocTags(hostNode, last(node.jsDoc)));
+      result = addRange(result, filterOwnedJSDocTags(hostNode, node.jsDoc));
     }
     if (node.kind === 169 /* Parameter */) {
       result = addRange(result, (noCache ? getJSDocParameterTagsNoCache : getJSDocParameterTags)(node));
@@ -13890,12 +13885,16 @@ function getJSDocCommentsAndTags(hostNode, noCache) {
   }
   return result || emptyArray;
 }
-function filterOwnedJSDocTags(hostNode, jsDoc) {
-  if (isJSDoc(jsDoc)) {
-    const ownedTags = filter(jsDoc.tags, (tag) => ownsJSDocTag(hostNode, tag));
-    return jsDoc.tags === ownedTags ? [jsDoc] : ownedTags;
-  }
-  return ownsJSDocTag(hostNode, jsDoc) ? [jsDoc] : void 0;
+function filterOwnedJSDocTags(hostNode, comments) {
+  const lastJsDoc = last(comments);
+  return flatMap(comments, (jsDoc) => {
+    if (jsDoc === lastJsDoc) {
+      const ownedTags = filter(jsDoc.tags, (tag) => ownsJSDocTag(hostNode, tag));
+      return jsDoc.tags === ownedTags ? [jsDoc] : ownedTags;
+    } else {
+      return filter(jsDoc.tags, isJSDocOverloadTag);
+    }
+  });
 }
 function ownsJSDocTag(hostNode, tag) {
   return !(isJSDocTypeTag(tag) || isJSDocSatisfiesTag(tag)) || !tag.parent || !isJSDoc(tag.parent) || !isParenthesizedExpression(tag.parent.parent) || tag.parent.parent === hostNode;
@@ -13934,6 +13933,9 @@ function getEffectiveContainerForJSDocTemplateTag(node) {
   }
   return getHostSignatureFromJSDoc(node);
 }
+function getJSDocOverloadTags(node) {
+  return getAllJSDocTags(node, isJSDocOverloadTag);
+}
 function getHostSignatureFromJSDoc(node) {
   const host = getEffectiveJSDocHost(node);
   if (host) {
@@ -16364,46 +16366,11 @@ function getEmitScriptTarget(compilerOptions) {
   return compilerOptions.target ?? (compilerOptions.module === 100 /* Node16 */ && 9 /* ES2022 */ || compilerOptions.module === 199 /* NodeNext */ && 99 /* ESNext */ || 1 /* ES5 */);
 }
 function getEmitModuleKind(compilerOptions) {
-  if (typeof compilerOptions.module === "object" && compilerOptions.module.emit !== void 0) {
-    return compilerOptions.module.emit;
-  }
   return typeof compilerOptions.module === "number" ? compilerOptions.module : getEmitScriptTarget(compilerOptions) >= 2 /* ES2015 */ ? 5 /* ES2015 */ : 1 /* CommonJS */;
 }
 function emitModuleKindIsNonNodeESM(moduleKind) {
   return moduleKind >= 5 /* ES2015 */ && moduleKind <= 99 /* ESNext */;
 }
-function getModulePreset(compilerOptions) {
-  if (typeof compilerOptions.module === "object") {
-    return compilerOptions.module.preset;
-  }
-  return compilerOptions.module;
-}
-function getModuleFormatDetectionKind(compilerOptions) {
-  if (typeof compilerOptions.module === "object" && compilerOptions.module.formatDetection !== void 0) {
-    return compilerOptions.module.formatDetection;
-  }
-  switch (getModulePreset(compilerOptions)) {
-    case 100 /* Node16 */:
-      return 100 /* Node16 */;
-    case 199 /* NodeNext */:
-      return 199 /* NodeNext */;
-    default:
-      return 0 /* None */;
-  }
-}
-function getModuleFormatInteropKind(compilerOptions) {
-  if (typeof compilerOptions.module === "object" && compilerOptions.module.formatInterop !== void 0) {
-    return compilerOptions.module.formatInterop;
-  }
-  switch (getModulePreset(compilerOptions)) {
-    case 100 /* Node16 */:
-      return 100 /* Node16 */;
-    case 199 /* NodeNext */:
-      return 199 /* NodeNext */;
-    default:
-      return 1 /* Babel */;
-  }
-}
 function getEmitModuleResolutionKind(compilerOptions) {
   let moduleResolution = compilerOptions.moduleResolution;
   if (moduleResolution === void 0) {
@@ -17566,6 +17533,10 @@ function hasResolutionModeOverride(node) {
   }
   return !!getResolutionModeOverride(node.attributes);
 }
+var stringReplace = String.prototype.replace;
+function replaceFirstStar(s, replacement) {
+  return stringReplace.call(s, "*", replacement);
+}
 
 // src/compiler/factory/baseNodeFactory.ts
 function createBaseNodeFactory() {
@@ -34234,79 +34205,23 @@ var targetOptionDeclaration = {
   description: Diagnostics.Set_the_JavaScript_language_version_for_emitted_JavaScript_and_include_compatible_library_declarations,
   defaultValueDescription: 1 /* ES5 */
 };
-var moduleKindMap = new Map(Object.entries({
-  none: 0 /* None */,
-  commonjs: 1 /* CommonJS */,
-  amd: 2 /* AMD */,
-  system: 4 /* System */,
-  umd: 3 /* UMD */,
-  es6: 5 /* ES2015 */,
-  es2015: 5 /* ES2015 */,
-  es2020: 6 /* ES2020 */,
-  es2022: 7 /* ES2022 */,
-  esnext: 99 /* ESNext */,
-  node16: 100 /* Node16 */,
-  nodenext: 199 /* NodeNext */
-}));
-var moduleSubOptionDeclarations = [
-  {
-    name: "preset",
-    type: moduleKindMap,
-    affectsSourceFile: true,
-    affectsBuildInfo: true,
-    affectsEmit: true,
-    affectsSemanticDiagnostics: true,
-    category: Diagnostics.Modules,
-    description: Diagnostics.Specify_defaults_for_module_options_suited_for_common_runtimes_and_bundlers,
-    defaultValueDescription: void 0,
-    getParentOption: getModuleOptionDeclaration
-  },
-  {
-    name: "formatDetection",
-    type: new Map(Object.entries({
-      none: 0 /* None */,
-      bundler: 1 /* Bundler */,
-      node16: 100 /* Node16 */,
-      nodenext: 199 /* NodeNext */
-    })),
-    affectsModuleResolution: true,
-    affectsSemanticDiagnostics: true,
-    affectsEmit: true,
-    category: Diagnostics.Modules,
-    description: Diagnostics.Specify_how_files_are_determined_to_be_ECMAScript_modules_or_CommonJS_modules,
-    defaultValueDescription: Diagnostics.node16_when_module_is_node16_nodenext_when_module_is_nodenext_none_otherwise,
-    getParentOption: getModuleOptionDeclaration
-  },
-  {
-    name: "formatInterop",
-    type: new Map(Object.entries({
-      babel: 1 /* Babel */,
-      bundlernode: 2 /* BundlerNode */,
-      node16: 100 /* Node16 */,
-      nodenext: 199 /* NodeNext */
-    })),
-    affectsSemanticDiagnostics: true,
-    category: Diagnostics.Modules,
-    description: Diagnostics.Specify_the_target_runtime_s_rules_for_ESM_CommonJS_interoperation,
-    defaultValueDescription: Diagnostics.node16_when_module_is_node16_nodenext_when_module_is_nodenext_babel_otherwise,
-    getParentOption: getModuleOptionDeclaration
-  },
-  {
-    name: "emit",
-    type: moduleKindMap,
-    affectsEmit: true,
-    category: Diagnostics.Modules,
-    description: Diagnostics.Specify_what_module_code_is_generated,
-    defaultValueDescription: void 0,
-    getParentOption: getModuleOptionDeclaration
-  }
-];
 var moduleOptionDeclaration = {
   name: "module",
   shortName: "m",
-  type: "objectOrShorthand",
-  shorthandType: moduleKindMap,
-  elementOptions: commandLineOptionsToMap(moduleSubOptionDeclarations),
+  type: new Map(Object.entries({
+    none: 0 /* None */,
+    commonjs: 1 /* CommonJS */,
+    amd: 2 /* AMD */,
+    system: 4 /* System */,
+    umd: 3 /* UMD */,
+    es6: 5 /* ES2015 */,
+    es2015: 5 /* ES2015 */,
+    es2020: 6 /* ES2020 */,
+    es2022: 7 /* ES2022 */,
+    esnext: 99 /* ESNext */,
+    node16: 100 /* Node16 */,
+    nodenext: 199 /* NodeNext */
+  })),
   affectsSourceFile: true,
   affectsModuleResolution: true,
   affectsEmit: true,
@@ -34317,9 +34232,6 @@ var moduleOptionDeclaration = {
   description: Diagnostics.Specify_what_module_code_is_generated,
   defaultValueDescription: void 0
 };
-function getModuleOptionDeclaration() {
-  return moduleOptionDeclaration;
-}
 var commandOptionsWithoutBuild = [
   // CommandLine only options
   {
@@ -34386,9 +34298,6 @@ var commandOptionsWithoutBuild = [
   // Basic
   targetOptionDeclaration,
   moduleOptionDeclaration,
-  // HEAD
-  //
-  // parent of 19e60f1a19 (Fix showConfig)
   {
     name: "lib",
     type: "list",
@@ -35385,16 +35294,10 @@ function createOptionNameMap(optionDeclarations2) {
   const optionsNameMap = /* @__PURE__ */ new Map();
   const shortOptionNames = /* @__PURE__ */ new Map();
   forEach(optionDeclarations2, (option) => {
-    const lowerCaseName = option.name.toLowerCase();
-    optionsNameMap.set(lowerCaseName, option);
+    optionsNameMap.set(option.name.toLowerCase(), option);
     if (option.shortName) {
       shortOptionNames.set(option.shortName, option.name);
     }
-    if (option.type === "objectOrShorthand") {
-      forEachEntry(option.elementOptions, (subOption, subOptionName) => {
-        optionsNameMap.set(`${lowerCaseName}.${subOptionName.toLowerCase()}`, subOption);
-      });
-    }
   });
   return { optionsNameMap, shortOptionNames };
 }
@@ -35415,8 +35318,7 @@ var defaultInitCompilerOptions = {
   skipLibCheck: true
 };
 function createDiagnosticForInvalidCustomType(opt, createDiagnostic) {
-  const type = opt.type === "objectOrShorthand" ? opt.shorthandType : opt.type;
-  const namesOfType = arrayFrom(type.keys());
+  const namesOfType = arrayFrom(opt.type.keys());
   const stringNames = (opt.deprecatedKeys ? namesOfType.filter((k) => !opt.deprecatedKeys.has(k)) : namesOfType).map((key) => `'${key}'`).join(", ");
   return createDiagnostic(Diagnostics.Argument_for_0_option_must_be_Colon_1, `--${opt.name}`, stringNames);
 }
@@ -35539,7 +35441,6 @@ function parseCommandLineWorker(diagnostics, commandLine, readFile) {
   }
 }
 function parseOptionValue(args, i, diagnostics, opt, options, errors) {
-  var _a;
   if (opt.isTSConfigOnly) {
     const optValue = args[i];
     if (optValue === "null") {
@@ -35568,46 +35469,40 @@ function parseOptionValue(args, i, diagnostics, opt, options, errors) {
     if (!args[i] && opt.type !== "boolean") {
       errors.push(createCompilerDiagnostic(diagnostics.optionTypeMismatchDiagnostic, opt.name, getCompilerOptionValueTypeString(opt)));
     }
-    const parentOption = (_a = opt.getParentOption) == null ? void 0 : _a.call(opt);
-    const [base = {}, name] = parentOption ? [options[parentOption.name], opt.name] : [options, opt.name];
-    if (parentOption) {
-      options[parentOption.name] = base;
-    }
     if (args[i] !== "null") {
-      switch (opt.type === "objectOrShorthand" ? opt.shorthandType : opt.type) {
+      switch (opt.type) {
         case "number":
-          base[name] = validateJsonOptionValue(opt, parseInt(args[i]), errors);
+          options[opt.name] = validateJsonOptionValue(opt, parseInt(args[i]), errors);
           i++;
           break;
         case "boolean":
           const optValue = args[i];
-          base[name] = validateJsonOptionValue(opt, optValue !== "false", errors);
+          options[opt.name] = validateJsonOptionValue(opt, optValue !== "false", errors);
           if (optValue === "false" || optValue === "true") {
             i++;
           }
           break;
         case "string":
-          base[name] = validateJsonOptionValue(opt, args[i] || "", errors);
+          options[opt.name] = validateJsonOptionValue(opt, args[i] || "", errors);
           i++;
           break;
         case "list":
           const result = parseListTypeOption(opt, args[i], errors);
-          base[name] = result || [];
+          options[opt.name] = result || [];
           if (result) {
             i++;
           }
           break;
-        case "object":
         case "listOrElement":
-          Debug.fail("listOrElement, object, and objectOrShorthand not supported here");
+          Debug.fail("listOrElement not supported here");
           break;
         default:
-          base[name] = parseCustomTypeOption(opt, args[i], errors);
+          options[opt.name] = parseCustomTypeOption(opt, args[i], errors);
           i++;
           break;
       }
     } else {
-      base[name] = void 0;
+      options[opt.name] = void 0;
       i++;
     }
   }
@@ -35973,23 +35868,17 @@ function isCompilerOptionsValue(option, value) {
   if (option) {
     if (isNullOrUndefined(value))
       return !option.disallowNullOrUndefined;
-    if (option.type === "listOrElement") {
-      return isCompilerOptionsValueWorker("list", value) || isCompilerOptionsValue(option.element, value);
+    if (option.type === "list") {
+      return isArray(value);
     }
-    if (option.type === "objectOrShorthand") {
-      return isCompilerOptionsValueWorker(option.shorthandType, value) || typeof value === "object";
+    if (option.type === "listOrElement") {
+      return isArray(value) || isCompilerOptionsValue(option.element, value);
     }
-    return isCompilerOptionsValueWorker(option.type, value);
+    const expectedType = isString(option.type) ? option.type : "string";
+    return typeof value === expectedType;
   }
   return false;
 }
-function isCompilerOptionsValueWorker(type, value) {
-  if (type === "list") {
-    return isArray(value);
-  }
-  const expectedType = isString(type) ? type : "string";
-  return typeof value === expectedType;
-}
 function convertToTSConfig(configParseResult, configFileName, host) {
   var _a, _b, _c;
   const getCanonicalFileName = createGetCanonicalFileName(host.useCaseSensitiveFileNames);
@@ -36073,8 +35962,6 @@ function getCustomTypeMapOfCommandLineOption(optionDefinition) {
     case "list":
     case "listOrElement":
       return getCustomTypeMapOfCommandLineOption(optionDefinition.element);
-    case "objectOrShorthand":
-      return typeof optionDefinition.shorthandType === "object" ? optionDefinition.shorthandType : void 0;
     default:
       return optionDefinition.type;
   }
@@ -36573,7 +36460,6 @@ function parseOwnConfigOfJsonSourceFile(sourceFile, host, basePath, configFileNa
   const options = getDefaultCompilerOptions(configFileName);
   let typeAcquisition;
   let watchOptions;
-  let moduleOption;
   let extendedConfigPath;
   let rootCompilerOptions;
   const rootOptions = getTsconfigRootOptionsMap();
@@ -36601,8 +36487,6 @@ function parseOwnConfigOfJsonSourceFile(sourceFile, host, basePath, configFileNa
           currentOption = watchOptions ?? (watchOptions = {});
         else if (parentOption === typeAcquisitionDeclaration)
           currentOption = typeAcquisition ?? (typeAcquisition = getDefaultTypeAcquisition(configFileName));
-        else if (parentOption === moduleOptionDeclaration)
-          currentOption = moduleOption ?? (moduleOption = {});
         else
           Debug.fail("Unknown option");
         currentOption[option.name] = value;
@@ -36764,16 +36648,6 @@ function convertJsonOption(opt, value, basePath, errors, propertyAssignment, val
       return convertJsonOptionOfListType(opt, value, basePath, errors, propertyAssignment, valueExpression, sourceFile);
     } else if (optType === "listOrElement") {
       return isArray(value) ? convertJsonOptionOfListType(opt, value, basePath, errors, propertyAssignment, valueExpression, sourceFile) : convertJsonOption(opt.element, value, basePath, errors, propertyAssignment, valueExpression, sourceFile);
-    } else if (optType === "objectOrShorthand") {
-      if (!value || typeof value !== "object") {
-        if (!isString(opt.shorthandType)) {
-          return convertJsonOptionOfCustomType(opt, value, errors, valueExpression, sourceFile);
-        }
-        const validatedValue2 = validateJsonOptionValue(opt, value, errors, valueExpression, sourceFile);
-        return isNullOrUndefined(validatedValue2) ? validatedValue2 : normalizeNonListOptionValue(opt, basePath, validatedValue2);
-      } else {
-        return {};
-      }
     } else if (!isString(opt.type)) {
       return convertJsonOptionOfCustomType(opt, value, errors, valueExpression, sourceFile);
     }
@@ -36806,8 +36680,7 @@ function convertJsonOptionOfCustomType(opt, value, errors, valueExpression, sour
   if (isNullOrUndefined(value))
     return void 0;
   const key = value.toLowerCase();
-  const type = opt.type === "objectOrShorthand" ? opt.shorthandType : opt.type;
-  const val = type.get(key);
+  const val = opt.type.get(key);
   if (val !== void 0) {
     return validateJsonOptionValue(opt, val, errors, valueExpression, sourceFile);
   } else {
@@ -37034,8 +36907,7 @@ function removeWildcardFilesWithLowerPriorityExtension(file, wildcardFiles, exte
   }
 }
 function getDefaultValueForOption(option) {
-  const type = option.type === "objectOrShorthand" ? option.shorthandType : option.type;
-  switch (type) {
+  switch (option.type) {
     case "number":
       return 1;
     case "boolean":
@@ -39295,7 +39167,7 @@ function tryLoadModuleUsingPaths(extensions, moduleName, baseDirectory, paths, p
       trace(state.host, Diagnostics.Module_name_0_matched_pattern_1, moduleName, matchedPatternText);
     }
     const resolved = forEach(paths[matchedPatternText], (subst) => {
-      const path = matchedStar ? subst.replace("*", matchedStar) : subst;
+      const path = matchedStar ? replaceFirstStar(subst, matchedStar) : subst;
       const candidate = normalizePath(combinePaths(baseDirectory, path));
       if (state.traceEnabled) {
         trace(state.host, Diagnostics.Trying_substitution_0_candidate_module_location_Colon_1, subst, path);
@@ -42932,7 +42804,7 @@ function tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, hos
           if (value.length >= prefix.length + suffix.length && startsWith(value, prefix) && endsWith(value, suffix) && validateEnding({ ending, value })) {
             const matchedStar = value.substring(prefix.length, value.length - suffix.length);
             if (!pathIsRelative(matchedStar)) {
-              return key.replace("*", matchedStar);
+              return replaceFirstStar(key, matchedStar);
             }
           }
         }
@@ -42980,11 +42852,11 @@ function tryGetModuleNameFromExports(options, targetFilePath, packageDirectory,
         const trailingSlice = pathOrPattern.slice(starPos + 1);
         if (startsWith(targetFilePath, leadingSlice) && endsWith(targetFilePath, trailingSlice)) {
           const starReplacement = targetFilePath.slice(leadingSlice.length, targetFilePath.length - trailingSlice.length);
-          return { moduleFileToTry: packageName.replace("*", starReplacement) };
+          return { moduleFileToTry: replaceFirstStar(packageName, starReplacement) };
         }
         if (extensionSwappedTarget && startsWith(extensionSwappedTarget, leadingSlice) && endsWith(extensionSwappedTarget, trailingSlice)) {
           const starReplacement = extensionSwappedTarget.slice(leadingSlice.length, extensionSwappedTarget.length - trailingSlice.length);
-          return { moduleFileToTry: packageName.replace("*", starReplacement) };
+          return { moduleFileToTry: replaceFirstStar(packageName, starReplacement) };
         }
         break;
     }
@@ -45772,16 +45644,19 @@ function createTypeChecker(host) {
     return isStringLiteralLike(usage) ? getModeForUsageLocation(getSourceFileOfNode(usage), usage) : void 0;
   }
   function isESMFormatImportImportingCommonjsFormatFile(usageMode, targetMode) {
-    return usageMode === 99 /* ESNext */ && targetMode !== 99 /* ESNext */;
+    return usageMode === 99 /* ESNext */ && targetMode === 1 /* CommonJS */;
   }
   function isOnlyImportedAsDefault(usage) {
     const usageMode = getUsageModeForExpression(usage);
     return usageMode === 99 /* ESNext */ && endsWith(usage.text, ".json" /* Json */);
   }
   function canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, usage) {
-    const usageMode = file && getModuleFormatInteropKind(compilerOptions) !== 1 /* Babel */ && getUsageModeForExpression(usage);
-    if (usageMode === 99 /* ESNext */) {
-      return isESMFormatImportImportingCommonjsFormatFile(usageMode, file.impliedNodeFormat);
+    const usageMode = file && getUsageModeForExpression(usage);
+    if (file && usageMode !== void 0) {
+      const result = isESMFormatImportImportingCommonjsFormatFile(usageMode, file.impliedNodeFormat);
+      if (usageMode === 99 /* ESNext */ || result) {
+        return result;
+      }
     }
     if (!allowSyntheticDefaultImports) {
       return false;
@@ -46674,7 +46549,6 @@ function createTypeChecker(host) {
     const contextSpecifier = isStringLiteralLike(location) ? location : ((_a = findAncestor(location, isImportCall)) == null ? void 0 : _a.arguments[0]) || ((_b = findAncestor(location, isImportDeclaration)) == null ? void 0 : _b.moduleSpecifier) || ((_c = findAncestor(location, isExternalModuleImportEqualsDeclaration)) == null ? void 0 : _c.moduleReference.expression) || ((_d = findAncestor(location, isExportDeclaration)) == null ? void 0 : _d.moduleSpecifier) || ((_e = isModuleDeclaration(location) ? location : location.parent && isModuleDeclaration(location.parent) && location.parent.name === location ? location.parent : void 0) == null ? void 0 : _e.name) || ((_f = isLiteralImportTypeNode(location) ? location : void 0) == null ? void 0 : _f.argument.literal);
     const mode = contextSpecifier && isStringLiteralLike(contextSpecifier) ? getModeForUsageLocation(currentSourceFile, contextSpecifier) : currentSourceFile.impliedNodeFormat;
     const moduleResolutionKind = getEmitModuleResolutionKind(compilerOptions);
-    const moduleFormatInterop = getModuleFormatInteropKind(compilerOptions);
     const resolvedModule = (_g = host.getResolvedModule(currentSourceFile, moduleReference, mode)) == null ? void 0 : _g.resolvedModule;
     const resolutionDiagnostic = resolvedModule && getResolutionDiagnostic(compilerOptions, resolvedModule, currentSourceFile);
     const sourceFile = resolvedModule && (!resolutionDiagnostic || resolutionDiagnostic === Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set) && host.getSourceFile(resolvedModule.resolvedFileName);
@@ -46710,7 +46584,7 @@ function createTypeChecker(host) {
             moduleReference
           );
         }
-        if (moduleFormatInterop === 100 /* Node16 */ || moduleFormatInterop === 199 /* NodeNext */) {
+        if (moduleResolutionKind === 3 /* Node16 */ || moduleResolutionKind === 99 /* NodeNext */) {
           const isSyncImport = currentSourceFile.impliedNodeFormat === 1 /* CommonJS */ && !findAncestor(location, isImportCall) || !!findAncestor(location, isImportEqualsDeclaration);
           const overrideHost = findAncestor(location, (l) => isImportTypeNode(l) || isExportDeclaration(l) || isImportDeclaration(l));
           if (isSyncImport && sourceFile.impliedNodeFormat === 99 /* ESNext */ && !hasResolutionModeOverride(overrideHost)) {
@@ -55627,22 +55501,15 @@ function createTypeChecker(host) {
         }
       }
       if (isInJSFile(decl) && decl.jsDoc) {
-        let hasJSDocOverloads = false;
-        for (const node of decl.jsDoc) {
-          if (node.tags) {
-            for (const tag of node.tags) {
-              if (isJSDocOverloadTag(tag)) {
-                const jsDocSignature = tag.typeExpression;
-                if (jsDocSignature.type === void 0 && !isConstructorDeclaration(decl)) {
-                  reportImplicitAny(jsDocSignature, anyType);
-                }
-                result.push(getSignatureFromDeclaration(jsDocSignature));
-                hasJSDocOverloads = true;
-              }
+        const tags = getJSDocOverloadTags(decl);
+        if (length(tags)) {
+          for (const tag of tags) {
+            const jsDocSignature = tag.typeExpression;
+            if (jsDocSignature.type === void 0 && !isConstructorDeclaration(decl)) {
+              reportImplicitAny(jsDocSignature, anyType);
             }
+            result.push(getSignatureFromDeclaration(jsDocSignature));
           }
-        }
-        if (hasJSDocOverloads) {
           continue;
         }
       }
@@ -76793,15 +76660,7 @@ function createTypeChecker(host) {
           }
         }
         if (isInJSFile(current) && isFunctionLike(current) && current.jsDoc) {
-          for (const node2 of current.jsDoc) {
-            if (node2.tags) {
-              for (const tag of node2.tags) {
-                if (isJSDocOverloadTag(tag)) {
-                  hasOverloads = true;
-                }
-              }
-            }
-          }
+          hasOverloads = length(getJSDocOverloadTags(current)) > 0;
         }
       }
     }
@@ -107484,7 +107343,7 @@ function transformECMAScriptModule(context) {
     return node.isExportEquals ? void 0 : node;
   }
   function visitExportDeclaration(node) {
-    if (getEmitModuleKind(compilerOptions) > 5 /* ES2015 */) {
+    if (compilerOptions.module !== void 0 && compilerOptions.module > 5 /* ES2015 */) {
       return node;
     }
     if (!node.exportClause || !isNamespaceExport(node.exportClause) || !node.moduleSpecifier) {
@@ -116674,25 +116533,20 @@ function getConfigFileParsingDiagnostics(configFileParseResult) {
   return configFileParseResult.options.configFile ? [...configFileParseResult.options.configFile.parseDiagnostics, ...configFileParseResult.errors] : configFileParseResult.errors;
 }
 function getImpliedNodeFormatForFileWorker(fileName, packageJsonInfoCache, host, options) {
-  const formatDetection = getModuleFormatDetectionKind(options);
-  switch (formatDetection) {
-    case 1 /* Bundler */:
-    case 100 /* Node16 */:
-    case 199 /* NodeNext */:
-    case 2 /* DefaultModule */:
-    case 3 /* DefaultCommonJS */:
-      const defaultFormat = formatDetection === 1 /* Bundler */ ? void 0 : formatDetection === 2 /* DefaultModule */ ? 99 /* ESNext */ : 1 /* CommonJS */;
-      return fileExtensionIsOneOf(fileName, [".d.mts" /* Dmts */, ".mts" /* Mts */, ".mjs" /* Mjs */]) ? 99 /* ESNext */ : fileExtensionIsOneOf(fileName, [".d.cts" /* Dcts */, ".cts" /* Cts */, ".cjs" /* Cjs */]) ? 1 /* CommonJS */ : fileExtensionIsOneOf(fileName, [".d.ts" /* Dts */, ".ts" /* Ts */, ".tsx" /* Tsx */, ".js" /* Js */, ".jsx" /* Jsx */]) ? lookupFromPackageJson(defaultFormat) : void 0;
+  switch (getEmitModuleResolutionKind(options)) {
+    case 3 /* Node16 */:
+    case 99 /* NodeNext */:
+      return fileExtensionIsOneOf(fileName, [".d.mts" /* Dmts */, ".mts" /* Mts */, ".mjs" /* Mjs */]) ? 99 /* ESNext */ : fileExtensionIsOneOf(fileName, [".d.cts" /* Dcts */, ".cts" /* Cts */, ".cjs" /* Cjs */]) ? 1 /* CommonJS */ : fileExtensionIsOneOf(fileName, [".d.ts" /* Dts */, ".ts" /* Ts */, ".tsx" /* Tsx */, ".js" /* Js */, ".jsx" /* Jsx */]) ? lookupFromPackageJson() : void 0;
     default:
       return void 0;
   }
-  function lookupFromPackageJson(defaultFormat) {
+  function lookupFromPackageJson() {
     const state = getTemporaryModuleResolutionState(packageJsonInfoCache, host, options);
     const packageJsonLocations = [];
     state.failedLookupLocations = packageJsonLocations;
     state.affectingLocations = packageJsonLocations;
     const packageJsonScope = getPackageScopeForPath(fileName, state);
-    const impliedNodeFormat = (packageJsonScope == null ? void 0 : packageJsonScope.contents.packageJsonContent.type) === "module" ? 99 /* ESNext */ : (packageJsonScope == null ? void 0 : packageJsonScope.contents.packageJsonContent.type) === "commonjs" ? 1 /* CommonJS */ : defaultFormat;
+    const impliedNodeFormat = (packageJsonScope == null ? void 0 : packageJsonScope.contents.packageJsonContent.type) === "module" ? 99 /* ESNext */ : 1 /* CommonJS */;
     return { impliedNodeFormat, packageJsonLocations, packageJsonScope };
   }
 }
@@ -126471,12 +126325,11 @@ function generateOptionOutput(sys2, option, rightAlignOfLeft, leftAlignOfRight)
     }
     function getPossibleValues(option3) {
       let possibleValues;
-      const type = option3.type === "objectOrShorthand" ? option3.shorthandType : option3.type;
-      switch (type) {
+      switch (option3.type) {
         case "string":
         case "number":
         case "boolean":
-          possibleValues = type;
+          possibleValues = option3.type;
           break;
         case "list":
         case "listOrElement":
@@ -126487,7 +126340,7 @@ function generateOptionOutput(sys2, option, rightAlignOfLeft, leftAlignOfRight)
           break;
         default:
           const inverted = {};
-          type.forEach((value, name2) => {
+          option3.type.forEach((value, name2) => {
             var _a2;
             if (!((_a2 = option3.deprecatedKeys) == null ? void 0 : _a2.has(name2))) {
               (inverted[value] || (inverted[value] = [])).push(name2);