@typescript-deploys/pr-build 5.4.0-pr-56506-20 → 5.4.0-pr-56681-3

package/lib/tsc.js

@@ -7353,6 +7353,9 @@ 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:"),
@@ -7385,6 +7388,8 @@ 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."),
@@ -16359,11 +16364,46 @@ 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) {
@@ -34194,23 +34234,79 @@ 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: 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 */
-  })),
+  type: "objectOrShorthand",
+  shorthandType: moduleKindMap,
+  elementOptions: commandLineOptionsToMap(moduleSubOptionDeclarations),
   affectsSourceFile: true,
   affectsModuleResolution: true,
   affectsEmit: true,
@@ -34221,6 +34317,9 @@ var moduleOptionDeclaration = {
   description: Diagnostics.Specify_what_module_code_is_generated,
   defaultValueDescription: void 0
 };
+function getModuleOptionDeclaration() {
+  return moduleOptionDeclaration;
+}
 var commandOptionsWithoutBuild = [
   // CommandLine only options
   {
@@ -34287,6 +34386,9 @@ var commandOptionsWithoutBuild = [
   // Basic
   targetOptionDeclaration,
   moduleOptionDeclaration,
+  // HEAD
+  //
+  // parent of 19e60f1a19 (Fix showConfig)
   {
     name: "lib",
     type: "list",
@@ -35283,10 +35385,16 @@ function createOptionNameMap(optionDeclarations2) {
   const optionsNameMap = /* @__PURE__ */ new Map();
   const shortOptionNames = /* @__PURE__ */ new Map();
   forEach(optionDeclarations2, (option) => {
-    optionsNameMap.set(option.name.toLowerCase(), option);
+    const lowerCaseName = option.name.toLowerCase();
+    optionsNameMap.set(lowerCaseName, 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 };
 }
@@ -35307,7 +35415,8 @@ var defaultInitCompilerOptions = {
   skipLibCheck: true
 };
 function createDiagnosticForInvalidCustomType(opt, createDiagnostic) {
-  const namesOfType = arrayFrom(opt.type.keys());
+  const type = opt.type === "objectOrShorthand" ? opt.shorthandType : opt.type;
+  const namesOfType = arrayFrom(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);
 }
@@ -35430,6 +35539,7 @@ 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") {
@@ -35458,40 +35568,46 @@ 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) {
+      switch (opt.type === "objectOrShorthand" ? opt.shorthandType : opt.type) {
         case "number":
-          options[opt.name] = validateJsonOptionValue(opt, parseInt(args[i]), errors);
+          base[name] = validateJsonOptionValue(opt, parseInt(args[i]), errors);
           i++;
           break;
         case "boolean":
           const optValue = args[i];
-          options[opt.name] = validateJsonOptionValue(opt, optValue !== "false", errors);
+          base[name] = validateJsonOptionValue(opt, optValue !== "false", errors);
           if (optValue === "false" || optValue === "true") {
             i++;
           }
           break;
         case "string":
-          options[opt.name] = validateJsonOptionValue(opt, args[i] || "", errors);
+          base[name] = validateJsonOptionValue(opt, args[i] || "", errors);
           i++;
           break;
         case "list":
           const result = parseListTypeOption(opt, args[i], errors);
-          options[opt.name] = result || [];
+          base[name] = result || [];
           if (result) {
             i++;
           }
           break;
+        case "object":
         case "listOrElement":
-          Debug.fail("listOrElement not supported here");
+          Debug.fail("listOrElement, object, and objectOrShorthand not supported here");
           break;
         default:
-          options[opt.name] = parseCustomTypeOption(opt, args[i], errors);
+          base[name] = parseCustomTypeOption(opt, args[i], errors);
           i++;
           break;
       }
     } else {
-      options[opt.name] = void 0;
+      base[name] = void 0;
       i++;
     }
   }
@@ -35857,17 +35973,23 @@ function isCompilerOptionsValue(option, value) {
   if (option) {
     if (isNullOrUndefined(value))
       return !option.disallowNullOrUndefined;
-    if (option.type === "list") {
-      return isArray(value);
-    }
     if (option.type === "listOrElement") {
-      return isArray(value) || isCompilerOptionsValue(option.element, value);
+      return isCompilerOptionsValueWorker("list", value) || isCompilerOptionsValue(option.element, value);
     }
-    const expectedType = isString(option.type) ? option.type : "string";
-    return typeof value === expectedType;
+    if (option.type === "objectOrShorthand") {
+      return isCompilerOptionsValueWorker(option.shorthandType, value) || typeof value === "object";
+    }
+    return isCompilerOptionsValueWorker(option.type, value);
   }
   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);
@@ -35951,6 +36073,8 @@ 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;
   }
@@ -36449,6 +36573,7 @@ function parseOwnConfigOfJsonSourceFile(sourceFile, host, basePath, configFileNa
   const options = getDefaultCompilerOptions(configFileName);
   let typeAcquisition;
   let watchOptions;
+  let moduleOption;
   let extendedConfigPath;
   let rootCompilerOptions;
   const rootOptions = getTsconfigRootOptionsMap();
@@ -36476,6 +36601,8 @@ 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;
@@ -36637,6 +36764,16 @@ 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);
     }
@@ -36669,7 +36806,8 @@ function convertJsonOptionOfCustomType(opt, value, errors, valueExpression, sour
   if (isNullOrUndefined(value))
     return void 0;
   const key = value.toLowerCase();
-  const val = opt.type.get(key);
+  const type = opt.type === "objectOrShorthand" ? opt.shorthandType : opt.type;
+  const val = type.get(key);
   if (val !== void 0) {
     return validateJsonOptionValue(opt, val, errors, valueExpression, sourceFile);
   } else {
@@ -36896,7 +37034,8 @@ function removeWildcardFilesWithLowerPriorityExtension(file, wildcardFiles, exte
   }
 }
 function getDefaultValueForOption(option) {
-  switch (option.type) {
+  const type = option.type === "objectOrShorthand" ? option.shorthandType : option.type;
+  switch (type) {
     case "number":
       return 1;
     case "boolean":
@@ -45633,19 +45772,16 @@ function createTypeChecker(host) {
     return isStringLiteralLike(usage) ? getModeForUsageLocation(getSourceFileOfNode(usage), usage) : void 0;
   }
   function isESMFormatImportImportingCommonjsFormatFile(usageMode, targetMode) {
-    return usageMode === 99 /* ESNext */ && targetMode === 1 /* CommonJS */;
+    return usageMode === 99 /* ESNext */ && targetMode !== 99 /* ESNext */;
   }
   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 && getUsageModeForExpression(usage);
-    if (file && usageMode !== void 0) {
-      const result = isESMFormatImportImportingCommonjsFormatFile(usageMode, file.impliedNodeFormat);
-      if (usageMode === 99 /* ESNext */ || result) {
-        return result;
-      }
+    const usageMode = file && getModuleFormatInteropKind(compilerOptions) !== 1 /* Babel */ && getUsageModeForExpression(usage);
+    if (usageMode === 99 /* ESNext */) {
+      return isESMFormatImportImportingCommonjsFormatFile(usageMode, file.impliedNodeFormat);
     }
     if (!allowSyntheticDefaultImports) {
       return false;
@@ -46538,6 +46674,7 @@ 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);
@@ -46573,7 +46710,7 @@ function createTypeChecker(host) {
             moduleReference
           );
         }
-        if (moduleResolutionKind === 3 /* Node16 */ || moduleResolutionKind === 99 /* NodeNext */) {
+        if (moduleFormatInterop === 100 /* Node16 */ || moduleFormatInterop === 199 /* 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)) {
@@ -107347,7 +107484,7 @@ function transformECMAScriptModule(context) {
     return node.isExportEquals ? void 0 : node;
   }
   function visitExportDeclaration(node) {
-    if (compilerOptions.module !== void 0 && compilerOptions.module > 5 /* ES2015 */) {
+    if (getEmitModuleKind(compilerOptions) > 5 /* ES2015 */) {
       return node;
     }
     if (!node.exportClause || !isNamespaceExport(node.exportClause) || !node.moduleSpecifier) {
@@ -116537,20 +116674,25 @@ function getConfigFileParsingDiagnostics(configFileParseResult) {
   return configFileParseResult.options.configFile ? [...configFileParseResult.options.configFile.parseDiagnostics, ...configFileParseResult.errors] : configFileParseResult.errors;
 }
 function getImpliedNodeFormatForFileWorker(fileName, packageJsonInfoCache, host, options) {
-  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;
+  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;
     default:
       return void 0;
   }
-  function lookupFromPackageJson() {
+  function lookupFromPackageJson(defaultFormat) {
     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 */ : 1 /* CommonJS */;
+    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;
     return { impliedNodeFormat, packageJsonLocations, packageJsonScope };
   }
 }
@@ -126329,11 +126471,12 @@ function generateOptionOutput(sys2, option, rightAlignOfLeft, leftAlignOfRight)
     }
     function getPossibleValues(option3) {
       let possibleValues;
-      switch (option3.type) {
+      const type = option3.type === "objectOrShorthand" ? option3.shorthandType : option3.type;
+      switch (type) {
         case "string":
         case "number":
         case "boolean":
-          possibleValues = option3.type;
+          possibleValues = type;
           break;
         case "list":
         case "listOrElement":
@@ -126344,7 +126487,7 @@ function generateOptionOutput(sys2, option, rightAlignOfLeft, leftAlignOfRight)
           break;
         default:
           const inverted = {};
-          option3.type.forEach((value, name2) => {
+          type.forEach((value, name2) => {
             var _a2;
             if (!((_a2 = option3.deprecatedKeys) == null ? void 0 : _a2.has(name2))) {
               (inverted[value] || (inverted[value] = [])).push(name2);