typescript 5.0.2 → 5.0.4

package/lib/lib.decorators.legacy.d.ts

@@ -19,4 +19,4 @@ and limitations under the License.
 declare type ClassDecorator = <TFunction extends Function>(target: TFunction) => TFunction | void;
 declare type PropertyDecorator = (target: Object, propertyKey: string | symbol) => void;
 declare type MethodDecorator = <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T> | void;
-declare type ParameterDecorator = (target: Object, propertyKey: string | symbol, parameterIndex: number) => void;
+declare type ParameterDecorator = (target: Object, propertyKey: string | symbol | undefined, parameterIndex: number) => void;

package/lib/tsc.js

@@ -23,7 +23,7 @@ var __export = (target, all) => {
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.0";
-var version = "5.0.2";
+var version = "5.0.4";
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -16192,6 +16192,9 @@ function getAllowSyntheticDefaultImports(compilerOptions) {
 function moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution) {
   return moduleResolution >= 3 /* Node16 */ && moduleResolution <= 99 /* NodeNext */ || moduleResolution === 100 /* Bundler */;
 }
+function shouldResolveJsRequire(compilerOptions) {
+  return !!compilerOptions.noDtsResolution || getEmitModuleResolutionKind(compilerOptions) !== 100 /* Bundler */;
+}
 function getResolvePackageJsonExports(compilerOptions) {
   const moduleResolution = getEmitModuleResolutionKind(compilerOptions);
   if (!moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution)) {
@@ -29242,6 +29245,12 @@ var Parser;
         if (languageVariant === 1 /* JSX */) {
           return parseJsxElementOrSelfClosingElementOrFragment(
             /*inExpressionContext*/
+            true,
+            /*topInvalidNodePosition*/
+            void 0,
+            /*openingTag*/
+            void 0,
+            /*mustBeUnary*/
             true
           );
         }
@@ -29346,7 +29355,7 @@ var Parser;
       true
     )), pos);
   }
-  function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag) {
+  function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag, mustBeUnary = false) {
     const pos = getNodePos();
     const opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
     let result;
@@ -29384,7 +29393,7 @@ var Parser;
       Debug.assert(opening.kind === 282 /* JsxSelfClosingElement */);
       result = opening;
     }
-    if (inExpressionContext && token() === 29 /* LessThanToken */) {
+    if (!mustBeUnary && inExpressionContext && token() === 29 /* LessThanToken */) {
       const topBadPos = typeof topInvalidNodePosition === "undefined" ? result.pos : topInvalidNodePosition;
       const invalidElement = tryParse(() => parseJsxElementOrSelfClosingElementOrFragment(
         /*inExpressionContext*/
@@ -34074,7 +34083,8 @@ var commandOptionsWithoutBuild = [
     affectsSemanticDiagnostics: true,
     category: Diagnostics.Modules,
     description: Diagnostics.Allow_imports_to_include_TypeScript_file_extensions_Requires_moduleResolution_bundler_and_either_noEmit_or_emitDeclarationOnly_to_be_set,
-    defaultValueDescription: false
+    defaultValueDescription: false,
+    transpileOptionValue: void 0
   },
   {
     name: "resolvePackageJsonExports",
@@ -37424,7 +37434,7 @@ function nodeModuleNameResolver(moduleName, containingFile, compilerOptions, hos
 }
 function nodeNextJsonConfigResolver(moduleName, containingFile, host) {
   return nodeModuleNameResolverWorker(
-    8 /* Exports */,
+    30 /* NodeNextDefault */,
     moduleName,
     getDirectoryPath(containingFile),
     { moduleResolution: 99 /* NodeNext */ },
@@ -41311,7 +41321,7 @@ function createBinder() {
     }
     if (!isBindingPattern(node.name)) {
       const possibleVariableDecl = node.kind === 257 /* VariableDeclaration */ ? node : node.parent.parent;
-      if (isInJSFile(node) && getEmitModuleResolutionKind(options) !== 100 /* Bundler */ && isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) && !getJSDocTypeTag(node) && !(getCombinedModifierFlags(node) & 1 /* Export */)) {
+      if (isInJSFile(node) && shouldResolveJsRequire(options) && isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) && !getJSDocTypeTag(node) && !(getCombinedModifierFlags(node) & 1 /* Export */)) {
         declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
       } else if (isBlockOrCatchScoped(node)) {
         bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 111551 /* BlockScopedVariableExcludes */);
@@ -44849,7 +44859,7 @@ function createTypeChecker(host) {
     const hasDefaultOnly = isOnlyImportedAsDefault(specifier);
     const hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, specifier);
     if (!exportDefaultSymbol && !hasSyntheticDefault && !hasDefaultOnly) {
-      if (hasExportAssignmentSymbol(moduleSymbol) && !(getAllowSyntheticDefaultImports(compilerOptions) || getESModuleInterop(compilerOptions))) {
+      if (hasExportAssignmentSymbol(moduleSymbol) && !allowSyntheticDefaultImports) {
         const compilerOptionName = moduleKind >= 5 /* ES2015 */ ? "allowSyntheticDefaultImports" : "esModuleInterop";
         const exportEqualsSymbol = moduleSymbol.exports.get("export=" /* ExportEquals */);
         const exportAssignment = exportEqualsSymbol.valueDeclaration;
@@ -45017,7 +45027,7 @@ function createTypeChecker(host) {
     if (!isIdentifier(name)) {
       return void 0;
     }
-    const suppressInteropError = name.escapedText === "default" /* Default */ && !!(compilerOptions.allowSyntheticDefaultImports || getESModuleInterop(compilerOptions));
+    const suppressInteropError = name.escapedText === "default" /* Default */ && allowSyntheticDefaultImports;
     const targetSymbol = resolveESModuleSymbol(
       moduleSymbol,
       moduleSpecifier,
@@ -49646,7 +49656,7 @@ function createTypeChecker(host) {
           return;
         }
         let verbatimTargetName = isShorthandAmbientModuleSymbol(target) && getSomeTargetNameFromDeclarations(symbol.declarations) || unescapeLeadingUnderscores(target.escapedName);
-        if (verbatimTargetName === "export=" /* ExportEquals */ && (getESModuleInterop(compilerOptions) || compilerOptions.allowSyntheticDefaultImports)) {
+        if (verbatimTargetName === "export=" /* ExportEquals */ && allowSyntheticDefaultImports) {
           verbatimTargetName = "default" /* Default */;
         }
         const targetName = getInternalSymbolName(target, verbatimTargetName);
@@ -53129,9 +53139,10 @@ function createTypeChecker(host) {
     setStructuredTypeMembers(type, emptySymbols, emptyArray, emptyArray, emptyArray);
     const typeParameter = getTypeParameterFromMappedType(type);
     const constraintType = getConstraintTypeFromMappedType(type);
-    const nameType = getNameTypeFromMappedType(type.target || type);
-    const isFilteringMappedType = nameType && isTypeAssignableTo(nameType, typeParameter);
-    const templateType = getTemplateTypeFromMappedType(type.target || type);
+    const mappedType = type.target || type;
+    const nameType = getNameTypeFromMappedType(mappedType);
+    const shouldLinkPropDeclarations = !nameType || isFilteringMappedType(mappedType);
+    const templateType = getTemplateTypeFromMappedType(mappedType);
     const modifiersType = getApparentType(getModifiersTypeFromMappedType(type));
     const templateModifiers = getMappedTypeModifiers(type);
     const include = keyofStringsOnly ? 128 /* StringLiteral */ : 8576 /* StringOrNumberLiteralOrUnique */;
@@ -53168,7 +53179,7 @@ function createTypeChecker(host) {
           prop.links.keyType = keyType;
           if (modifiersProp) {
             prop.links.syntheticOrigin = modifiersProp;
-            prop.declarations = !nameType || isFilteringMappedType ? modifiersProp.declarations : void 0;
+            prop.declarations = shouldLinkPropDeclarations ? modifiersProp.declarations : void 0;
           }
           members.set(propName, prop);
         }
@@ -53274,6 +53285,10 @@ function createTypeChecker(host) {
     }
     return false;
   }
+  function isFilteringMappedType(type) {
+    const nameType = getNameTypeFromMappedType(type);
+    return !!nameType && isTypeAssignableTo(nameType, getTypeParameterFromMappedType(type));
+  }
   function resolveStructuredTypeMembers(type) {
     if (!type.members) {
       if (type.flags & 524288 /* Object */) {
@@ -55778,6 +55793,12 @@ function createTypeChecker(host) {
       i--;
       const source = types[i];
       if (hasEmptyObject || source.flags & 469499904 /* StructuredOrInstantiable */) {
+        if (source.flags & 262144 /* TypeParameter */ && getBaseConstraintOrType(source).flags & 1048576 /* Union */) {
+          if (isTypeRelatedTo(source, getUnionType(map(types, (t) => t === source ? neverType : t)), strictSubtypeRelation)) {
+            orderedRemoveItemAt(types, i);
+          }
+          continue;
+        }
         const keyProperty = source.flags & (524288 /* Object */ | 2097152 /* Intersection */ | 58982400 /* InstantiableNonPrimitive */) ? find(getPropertiesOfType(source), (p) => isUnitType(getTypeOfSymbol(p))) : void 0;
         const keyPropertyType = keyProperty && getRegularTypeOfLiteralType(getTypeOfSymbol(keyProperty));
         for (const target of types) {
@@ -56815,8 +56836,7 @@ function createTypeChecker(host) {
       }
     }
     if (isGenericMappedType(objectType)) {
-      const nameType = getNameTypeFromMappedType(objectType);
-      if (!nameType || isTypeAssignableTo(nameType, getTypeParameterFromMappedType(objectType))) {
+      if (!getNameTypeFromMappedType(objectType) || isFilteringMappedType(objectType)) {
         return type[cache] = mapType(substituteIndexedMappedType(objectType, type.indexType), (t) => getSimplifiedType(t, writing));
       }
     }
@@ -61315,7 +61335,7 @@ function createTypeChecker(host) {
       const targetHasStringIndex = some(indexInfos, (info) => info.keyType === stringType);
       let result2 = -1 /* True */;
       for (const targetInfo of indexInfos) {
-        const related = !sourceIsPrimitive && targetHasStringIndex && targetInfo.type.flags & 1 /* Any */ ? -1 /* True */ : isGenericMappedType(source2) && targetHasStringIndex ? isRelatedTo(getTemplateTypeFromMappedType(source2), targetInfo.type, 3 /* Both */, reportErrors2) : typeRelatedToIndexInfo(source2, targetInfo, reportErrors2, intersectionState);
+        const related = relation !== strictSubtypeRelation && !sourceIsPrimitive && targetHasStringIndex && targetInfo.type.flags & 1 /* Any */ ? -1 /* True */ : isGenericMappedType(source2) && targetHasStringIndex ? isRelatedTo(getTemplateTypeFromMappedType(source2), targetInfo.type, 3 /* Both */, reportErrors2) : typeRelatedToIndexInfo(source2, targetInfo, reportErrors2, intersectionState);
         if (!related) {
           return 0 /* False */;
         }
@@ -70727,7 +70747,7 @@ function createTypeChecker(host) {
         return anyType;
       }
     }
-    if (isInJSFile(node) && getEmitModuleResolutionKind(compilerOptions) !== 100 /* Bundler */ && isCommonJsRequire(node)) {
+    if (isInJSFile(node) && shouldResolveJsRequire(compilerOptions) && isCommonJsRequire(node)) {
       return resolveExternalModuleTypeByLiteral(node.arguments[0]);
     }
     const returnType = getReturnTypeOfSignature(signature);
@@ -78983,14 +79003,14 @@ function createTypeChecker(host) {
         markAliasReferenced(sym, id);
         if (getAllSymbolFlags(sym) & 111551 /* Value */) {
           checkExpressionCached(id);
-          if (!isIllegalExportDefaultInCJS && compilerOptions.verbatimModuleSyntax && getTypeOnlyAliasDeclaration(sym, 111551 /* Value */)) {
+          if (!isIllegalExportDefaultInCJS && !(node.flags & 16777216 /* Ambient */) && compilerOptions.verbatimModuleSyntax && getTypeOnlyAliasDeclaration(sym, 111551 /* Value */)) {
             error(
               id,
               node.isExportEquals ? Diagnostics.An_export_declaration_must_reference_a_real_value_when_verbatimModuleSyntax_is_enabled_but_0_resolves_to_a_type_only_declaration : Diagnostics.An_export_default_must_reference_a_real_value_when_verbatimModuleSyntax_is_enabled_but_0_resolves_to_a_type_only_declaration,
               idText(id)
             );
           }
-        } else if (!isIllegalExportDefaultInCJS && compilerOptions.verbatimModuleSyntax) {
+        } else if (!isIllegalExportDefaultInCJS && !(node.flags & 16777216 /* Ambient */) && compilerOptions.verbatimModuleSyntax) {
           error(
             id,
             node.isExportEquals ? Diagnostics.An_export_declaration_must_reference_a_value_when_verbatimModuleSyntax_is_enabled_but_0_only_refers_to_a_type : Diagnostics.An_export_default_must_reference_a_value_when_verbatimModuleSyntax_is_enabled_but_0_only_refers_to_a_type,
@@ -89230,11 +89250,12 @@ function transformClassFields(context) {
     return visitEachChild(node, visitor, context);
   }
   function visitArrayAssignmentElement(node) {
-    Debug.assertNode(node, isArrayBindingOrAssignmentElement);
-    if (isSpreadElement(node))
-      return visitAssignmentRestElement(node);
-    if (!isOmittedExpression(node))
-      return visitAssignmentElement(node);
+    if (isArrayBindingOrAssignmentElement(node)) {
+      if (isSpreadElement(node))
+        return visitAssignmentRestElement(node);
+      if (!isOmittedExpression(node))
+        return visitAssignmentElement(node);
+    }
     return visitEachChild(node, visitor, context);
   }
   function visitAssignmentProperty(node) {
@@ -91030,10 +91051,14 @@ function transformESDecorators(context) {
           visitor
         );
         const superStatementIndex = findSuperStatementIndex(node.body.statements, nonPrologueStart);
-        const indexOfFirstStatementAfterSuper = superStatementIndex >= 0 ? superStatementIndex + 1 : void 0;
-        addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, indexOfFirstStatementAfterSuper ? indexOfFirstStatementAfterSuper - nonPrologueStart : void 0));
-        addRange(statements, initializerStatements);
-        addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, indexOfFirstStatementAfterSuper));
+        if (superStatementIndex >= 0) {
+          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, superStatementIndex + 1 - nonPrologueStart));
+          addRange(statements, initializerStatements);
+          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, superStatementIndex + 1));
+        } else {
+          addRange(statements, initializerStatements);
+          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement));
+        }
         body = factory2.createBlock(
           statements,
           /*multiLine*/
@@ -114343,7 +114368,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
         false
       );
     }
-    const shouldProcessRequires = isJavaScriptFile && getEmitModuleResolutionKind(options) !== 100 /* Bundler */;
+    const shouldProcessRequires = isJavaScriptFile && shouldResolveJsRequire(options);
     if (file.flags & 2097152 /* PossiblyContainsDynamicImport */ || shouldProcessRequires) {
       collectDynamicImportOrRequireCalls(file);
     }
@@ -115271,9 +115296,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       if (moduleKind === 2 /* AMD */ || moduleKind === 3 /* UMD */ || moduleKind === 4 /* System */) {
         createDiagnosticForOptionName(Diagnostics.Option_verbatimModuleSyntax_cannot_be_used_when_module_is_set_to_UMD_AMD_or_System, "verbatimModuleSyntax");
       }
-      if (options.isolatedModules) {
-        createRedundantOptionDiagnostic("isolatedModules", "verbatimModuleSyntax");
-      }
       if (options.preserveValueImports) {
         createRedundantOptionDiagnostic("preserveValueImports", "verbatimModuleSyntax");
       }
@@ -119815,7 +119837,6 @@ function createWatchProgram(host) {
     );
   }
   function updateExtendedConfigFilesWatches(forProjectPath, options, watchOptions2, watchType) {
-    Debug.assert(configFileName);
     updateSharedExtendedConfigFileWatcher(
       forProjectPath,
       options,
@@ -119831,7 +119852,7 @@ function createWatchProgram(host) {
           if (!(projects == null ? void 0 : projects.size))
             return;
           projects.forEach((projectPath) => {
-            if (toPath3(configFileName) === projectPath) {
+            if (configFileName && toPath3(configFileName) === projectPath) {
               reloadLevel = 2 /* Full */;
             } else {
               const config = parsedConfigs == null ? void 0 : parsedConfigs.get(projectPath);

package/lib/tsserver.js

@@ -2070,6 +2070,7 @@ __export(server_exports, {
   setValueDeclaration: () => setValueDeclaration,
   shouldAllowImportingTsExtension: () => shouldAllowImportingTsExtension,
   shouldPreserveConstEnums: () => shouldPreserveConstEnums,
+  shouldResolveJsRequire: () => shouldResolveJsRequire,
   shouldUseUriStyleNodeCoreModules: () => shouldUseUriStyleNodeCoreModules,
   showModuleSpecifier: () => showModuleSpecifier,
   signatureHasLiteralTypes: () => signatureHasLiteralTypes,
@@ -2286,7 +2287,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.0";
-var version = "5.0.2";
+var version = "5.0.4";
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -20263,6 +20264,9 @@ function getAllowSyntheticDefaultImports(compilerOptions) {
 function moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution) {
   return moduleResolution >= 3 /* Node16 */ && moduleResolution <= 99 /* NodeNext */ || moduleResolution === 100 /* Bundler */;
 }
+function shouldResolveJsRequire(compilerOptions) {
+  return !!compilerOptions.noDtsResolution || getEmitModuleResolutionKind(compilerOptions) !== 100 /* Bundler */;
+}
 function getResolvePackageJsonExports(compilerOptions) {
   const moduleResolution = getEmitModuleResolutionKind(compilerOptions);
   if (!moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution)) {
@@ -33580,6 +33584,12 @@ var Parser;
         if (languageVariant === 1 /* JSX */) {
           return parseJsxElementOrSelfClosingElementOrFragment(
             /*inExpressionContext*/
+            true,
+            /*topInvalidNodePosition*/
+            void 0,
+            /*openingTag*/
+            void 0,
+            /*mustBeUnary*/
             true
           );
         }
@@ -33684,7 +33694,7 @@ var Parser;
       true
     )), pos);
   }
-  function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag) {
+  function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag, mustBeUnary = false) {
     const pos = getNodePos();
     const opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
     let result;
@@ -33722,7 +33732,7 @@ var Parser;
       Debug.assert(opening.kind === 282 /* JsxSelfClosingElement */);
       result = opening;
     }
-    if (inExpressionContext && token() === 29 /* LessThanToken */) {
+    if (!mustBeUnary && inExpressionContext && token() === 29 /* LessThanToken */) {
       const topBadPos = typeof topInvalidNodePosition === "undefined" ? result.pos : topInvalidNodePosition;
       const invalidElement = tryParse(() => parseJsxElementOrSelfClosingElementOrFragment(
         /*inExpressionContext*/
@@ -38412,7 +38422,8 @@ var commandOptionsWithoutBuild = [
     affectsSemanticDiagnostics: true,
     category: Diagnostics.Modules,
     description: Diagnostics.Allow_imports_to_include_TypeScript_file_extensions_Requires_moduleResolution_bundler_and_either_noEmit_or_emitDeclarationOnly_to_be_set,
-    defaultValueDescription: false
+    defaultValueDescription: false,
+    transpileOptionValue: void 0
   },
   {
     name: "resolvePackageJsonExports",
@@ -41868,7 +41879,7 @@ function nodeModuleNameResolver(moduleName, containingFile, compilerOptions, hos
 }
 function nodeNextJsonConfigResolver(moduleName, containingFile, host) {
   return nodeModuleNameResolverWorker(
-    8 /* Exports */,
+    30 /* NodeNextDefault */,
     moduleName,
     getDirectoryPath(containingFile),
     { moduleResolution: 99 /* NodeNext */ },
@@ -45862,7 +45873,7 @@ function createBinder() {
     }
     if (!isBindingPattern(node.name)) {
       const possibleVariableDecl = node.kind === 257 /* VariableDeclaration */ ? node : node.parent.parent;
-      if (isInJSFile(node) && getEmitModuleResolutionKind(options) !== 100 /* Bundler */ && isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) && !getJSDocTypeTag(node) && !(getCombinedModifierFlags(node) & 1 /* Export */)) {
+      if (isInJSFile(node) && shouldResolveJsRequire(options) && isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) && !getJSDocTypeTag(node) && !(getCombinedModifierFlags(node) & 1 /* Export */)) {
         declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
       } else if (isBlockOrCatchScoped(node)) {
         bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 111551 /* BlockScopedVariableExcludes */);
@@ -49448,7 +49459,7 @@ function createTypeChecker(host) {
     const hasDefaultOnly = isOnlyImportedAsDefault(specifier);
     const hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, specifier);
     if (!exportDefaultSymbol && !hasSyntheticDefault && !hasDefaultOnly) {
-      if (hasExportAssignmentSymbol(moduleSymbol) && !(getAllowSyntheticDefaultImports(compilerOptions) || getESModuleInterop(compilerOptions))) {
+      if (hasExportAssignmentSymbol(moduleSymbol) && !allowSyntheticDefaultImports) {
         const compilerOptionName = moduleKind >= 5 /* ES2015 */ ? "allowSyntheticDefaultImports" : "esModuleInterop";
         const exportEqualsSymbol = moduleSymbol.exports.get("export=" /* ExportEquals */);
         const exportAssignment = exportEqualsSymbol.valueDeclaration;
@@ -49616,7 +49627,7 @@ function createTypeChecker(host) {
     if (!isIdentifier(name)) {
       return void 0;
     }
-    const suppressInteropError = name.escapedText === "default" /* Default */ && !!(compilerOptions.allowSyntheticDefaultImports || getESModuleInterop(compilerOptions));
+    const suppressInteropError = name.escapedText === "default" /* Default */ && allowSyntheticDefaultImports;
     const targetSymbol = resolveESModuleSymbol(
       moduleSymbol,
       moduleSpecifier,
@@ -54245,7 +54256,7 @@ function createTypeChecker(host) {
           return;
         }
         let verbatimTargetName = isShorthandAmbientModuleSymbol(target) && getSomeTargetNameFromDeclarations(symbol.declarations) || unescapeLeadingUnderscores(target.escapedName);
-        if (verbatimTargetName === "export=" /* ExportEquals */ && (getESModuleInterop(compilerOptions) || compilerOptions.allowSyntheticDefaultImports)) {
+        if (verbatimTargetName === "export=" /* ExportEquals */ && allowSyntheticDefaultImports) {
           verbatimTargetName = "default" /* Default */;
         }
         const targetName = getInternalSymbolName(target, verbatimTargetName);
@@ -57728,9 +57739,10 @@ function createTypeChecker(host) {
     setStructuredTypeMembers(type, emptySymbols, emptyArray, emptyArray, emptyArray);
     const typeParameter = getTypeParameterFromMappedType(type);
     const constraintType = getConstraintTypeFromMappedType(type);
-    const nameType = getNameTypeFromMappedType(type.target || type);
-    const isFilteringMappedType = nameType && isTypeAssignableTo(nameType, typeParameter);
-    const templateType = getTemplateTypeFromMappedType(type.target || type);
+    const mappedType = type.target || type;
+    const nameType = getNameTypeFromMappedType(mappedType);
+    const shouldLinkPropDeclarations = !nameType || isFilteringMappedType(mappedType);
+    const templateType = getTemplateTypeFromMappedType(mappedType);
     const modifiersType = getApparentType(getModifiersTypeFromMappedType(type));
     const templateModifiers = getMappedTypeModifiers(type);
     const include = keyofStringsOnly ? 128 /* StringLiteral */ : 8576 /* StringOrNumberLiteralOrUnique */;
@@ -57767,7 +57779,7 @@ function createTypeChecker(host) {
           prop.links.keyType = keyType;
           if (modifiersProp) {
             prop.links.syntheticOrigin = modifiersProp;
-            prop.declarations = !nameType || isFilteringMappedType ? modifiersProp.declarations : void 0;
+            prop.declarations = shouldLinkPropDeclarations ? modifiersProp.declarations : void 0;
           }
           members.set(propName, prop);
         }
@@ -57873,6 +57885,10 @@ function createTypeChecker(host) {
     }
     return false;
   }
+  function isFilteringMappedType(type) {
+    const nameType = getNameTypeFromMappedType(type);
+    return !!nameType && isTypeAssignableTo(nameType, getTypeParameterFromMappedType(type));
+  }
   function resolveStructuredTypeMembers(type) {
     if (!type.members) {
       if (type.flags & 524288 /* Object */) {
@@ -60377,6 +60393,12 @@ function createTypeChecker(host) {
       i--;
       const source = types[i];
       if (hasEmptyObject || source.flags & 469499904 /* StructuredOrInstantiable */) {
+        if (source.flags & 262144 /* TypeParameter */ && getBaseConstraintOrType(source).flags & 1048576 /* Union */) {
+          if (isTypeRelatedTo(source, getUnionType(map(types, (t) => t === source ? neverType : t)), strictSubtypeRelation)) {
+            orderedRemoveItemAt(types, i);
+          }
+          continue;
+        }
         const keyProperty = source.flags & (524288 /* Object */ | 2097152 /* Intersection */ | 58982400 /* InstantiableNonPrimitive */) ? find(getPropertiesOfType(source), (p) => isUnitType(getTypeOfSymbol(p))) : void 0;
         const keyPropertyType = keyProperty && getRegularTypeOfLiteralType(getTypeOfSymbol(keyProperty));
         for (const target of types) {
@@ -61414,8 +61436,7 @@ function createTypeChecker(host) {
       }
     }
     if (isGenericMappedType(objectType)) {
-      const nameType = getNameTypeFromMappedType(objectType);
-      if (!nameType || isTypeAssignableTo(nameType, getTypeParameterFromMappedType(objectType))) {
+      if (!getNameTypeFromMappedType(objectType) || isFilteringMappedType(objectType)) {
         return type[cache] = mapType(substituteIndexedMappedType(objectType, type.indexType), (t) => getSimplifiedType(t, writing));
       }
     }
@@ -65914,7 +65935,7 @@ function createTypeChecker(host) {
       const targetHasStringIndex = some(indexInfos, (info) => info.keyType === stringType);
       let result2 = -1 /* True */;
       for (const targetInfo of indexInfos) {
-        const related = !sourceIsPrimitive && targetHasStringIndex && targetInfo.type.flags & 1 /* Any */ ? -1 /* True */ : isGenericMappedType(source2) && targetHasStringIndex ? isRelatedTo(getTemplateTypeFromMappedType(source2), targetInfo.type, 3 /* Both */, reportErrors2) : typeRelatedToIndexInfo(source2, targetInfo, reportErrors2, intersectionState);
+        const related = relation !== strictSubtypeRelation && !sourceIsPrimitive && targetHasStringIndex && targetInfo.type.flags & 1 /* Any */ ? -1 /* True */ : isGenericMappedType(source2) && targetHasStringIndex ? isRelatedTo(getTemplateTypeFromMappedType(source2), targetInfo.type, 3 /* Both */, reportErrors2) : typeRelatedToIndexInfo(source2, targetInfo, reportErrors2, intersectionState);
         if (!related) {
           return 0 /* False */;
         }
@@ -75326,7 +75347,7 @@ function createTypeChecker(host) {
         return anyType;
       }
     }
-    if (isInJSFile(node) && getEmitModuleResolutionKind(compilerOptions) !== 100 /* Bundler */ && isCommonJsRequire(node)) {
+    if (isInJSFile(node) && shouldResolveJsRequire(compilerOptions) && isCommonJsRequire(node)) {
       return resolveExternalModuleTypeByLiteral(node.arguments[0]);
     }
     const returnType = getReturnTypeOfSignature(signature);
@@ -83582,14 +83603,14 @@ function createTypeChecker(host) {
         markAliasReferenced(sym, id);
         if (getAllSymbolFlags(sym) & 111551 /* Value */) {
           checkExpressionCached(id);
-          if (!isIllegalExportDefaultInCJS && compilerOptions.verbatimModuleSyntax && getTypeOnlyAliasDeclaration(sym, 111551 /* Value */)) {
+          if (!isIllegalExportDefaultInCJS && !(node.flags & 16777216 /* Ambient */) && compilerOptions.verbatimModuleSyntax && getTypeOnlyAliasDeclaration(sym, 111551 /* Value */)) {
             error(
               id,
               node.isExportEquals ? Diagnostics.An_export_declaration_must_reference_a_real_value_when_verbatimModuleSyntax_is_enabled_but_0_resolves_to_a_type_only_declaration : Diagnostics.An_export_default_must_reference_a_real_value_when_verbatimModuleSyntax_is_enabled_but_0_resolves_to_a_type_only_declaration,
               idText(id)
             );
           }
-        } else if (!isIllegalExportDefaultInCJS && compilerOptions.verbatimModuleSyntax) {
+        } else if (!isIllegalExportDefaultInCJS && !(node.flags & 16777216 /* Ambient */) && compilerOptions.verbatimModuleSyntax) {
           error(
             id,
             node.isExportEquals ? Diagnostics.An_export_declaration_must_reference_a_value_when_verbatimModuleSyntax_is_enabled_but_0_only_refers_to_a_type : Diagnostics.An_export_default_must_reference_a_value_when_verbatimModuleSyntax_is_enabled_but_0_only_refers_to_a_type,
@@ -94000,11 +94021,12 @@ function transformClassFields(context) {
     return visitEachChild(node, visitor, context);
   }
   function visitArrayAssignmentElement(node) {
-    Debug.assertNode(node, isArrayBindingOrAssignmentElement);
-    if (isSpreadElement(node))
-      return visitAssignmentRestElement(node);
-    if (!isOmittedExpression(node))
-      return visitAssignmentElement(node);
+    if (isArrayBindingOrAssignmentElement(node)) {
+      if (isSpreadElement(node))
+        return visitAssignmentRestElement(node);
+      if (!isOmittedExpression(node))
+        return visitAssignmentElement(node);
+    }
     return visitEachChild(node, visitor, context);
   }
   function visitAssignmentProperty(node) {
@@ -95800,10 +95822,14 @@ function transformESDecorators(context) {
           visitor
         );
         const superStatementIndex = findSuperStatementIndex(node.body.statements, nonPrologueStart);
-        const indexOfFirstStatementAfterSuper = superStatementIndex >= 0 ? superStatementIndex + 1 : void 0;
-        addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, indexOfFirstStatementAfterSuper ? indexOfFirstStatementAfterSuper - nonPrologueStart : void 0));
-        addRange(statements, initializerStatements);
-        addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, indexOfFirstStatementAfterSuper));
+        if (superStatementIndex >= 0) {
+          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, superStatementIndex + 1 - nonPrologueStart));
+          addRange(statements, initializerStatements);
+          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, superStatementIndex + 1));
+        } else {
+          addRange(statements, initializerStatements);
+          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement));
+        }
         body = factory2.createBlock(
           statements,
           /*multiLine*/
@@ -119178,7 +119204,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
         false
       );
     }
-    const shouldProcessRequires = isJavaScriptFile && getEmitModuleResolutionKind(options) !== 100 /* Bundler */;
+    const shouldProcessRequires = isJavaScriptFile && shouldResolveJsRequire(options);
     if (file.flags & 2097152 /* PossiblyContainsDynamicImport */ || shouldProcessRequires) {
       collectDynamicImportOrRequireCalls(file);
     }
@@ -120106,9 +120132,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       if (moduleKind === 2 /* AMD */ || moduleKind === 3 /* UMD */ || moduleKind === 4 /* System */) {
         createDiagnosticForOptionName(Diagnostics.Option_verbatimModuleSyntax_cannot_be_used_when_module_is_set_to_UMD_AMD_or_System, "verbatimModuleSyntax");
       }
-      if (options.isolatedModules) {
-        createRedundantOptionDiagnostic("isolatedModules", "verbatimModuleSyntax");
-      }
       if (options.preserveValueImports) {
         createRedundantOptionDiagnostic("preserveValueImports", "verbatimModuleSyntax");
       }
@@ -124707,7 +124730,6 @@ function createWatchProgram(host) {
     );
   }
   function updateExtendedConfigFilesWatches(forProjectPath, options, watchOptions2, watchType) {
-    Debug.assert(configFileName);
     updateSharedExtendedConfigFileWatcher(
       forProjectPath,
       options,
@@ -124723,7 +124745,7 @@ function createWatchProgram(host) {
           if (!(projects == null ? void 0 : projects.size))
             return;
           projects.forEach((projectPath) => {
-            if (toPath3(configFileName) === projectPath) {
+            if (configFileName && toPath3(configFileName) === projectPath) {
               reloadLevel = 2 /* Full */;
             } else {
               const config = parsedConfigs == null ? void 0 : parsedConfigs.get(projectPath);
@@ -152027,7 +152049,7 @@ function getStringLiteralCompletionEntries(sourceFile, node, position, typeCheck
       const literals = contextualTypes.types.filter((literal) => !tracker.hasValue(literal.value));
       return { kind: 2 /* Types */, types: literals, isNewIdentifier: false };
     default:
-      return fromContextualType();
+      return fromContextualType() || fromContextualType(0 /* None */);
   }
   function fromContextualType(contextFlags = 4 /* Completions */) {
     const types = getStringLiteralTypes(getContextualTypeFromParent(node, typeChecker, contextFlags));
@@ -169767,6 +169789,7 @@ __export(ts_exports3, {
   setValueDeclaration: () => setValueDeclaration,
   shouldAllowImportingTsExtension: () => shouldAllowImportingTsExtension,
   shouldPreserveConstEnums: () => shouldPreserveConstEnums,
+  shouldResolveJsRequire: () => shouldResolveJsRequire,
   shouldUseUriStyleNodeCoreModules: () => shouldUseUriStyleNodeCoreModules,
   showModuleSpecifier: () => showModuleSpecifier,
   signatureHasLiteralTypes: () => signatureHasLiteralTypes,
@@ -183714,6 +183737,7 @@ start(initializeNodeSystem(), require("os").platform());
   setValueDeclaration,
   shouldAllowImportingTsExtension,
   shouldPreserveConstEnums,
+  shouldResolveJsRequire,
   shouldUseUriStyleNodeCoreModules,
   showModuleSpecifier,
   signatureHasLiteralTypes,

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.0";
-      version = "5.0.2";
+      version = "5.0.4";
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -17991,6 +17991,9 @@ ${lanes.join("\n")}
   function moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution) {
     return moduleResolution >= 3 /* Node16 */ && moduleResolution <= 99 /* NodeNext */ || moduleResolution === 100 /* Bundler */;
   }
+  function shouldResolveJsRequire(compilerOptions) {
+    return !!compilerOptions.noDtsResolution || getEmitModuleResolutionKind(compilerOptions) !== 100 /* Bundler */;
+  }
   function getResolvePackageJsonExports(compilerOptions) {
     const moduleResolution = getEmitModuleResolutionKind(compilerOptions);
     if (!moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution)) {
@@ -31692,6 +31695,12 @@ ${lanes.join("\n")}
               if (languageVariant === 1 /* JSX */) {
                 return parseJsxElementOrSelfClosingElementOrFragment(
                   /*inExpressionContext*/
+                  true,
+                  /*topInvalidNodePosition*/
+                  void 0,
+                  /*openingTag*/
+                  void 0,
+                  /*mustBeUnary*/
                   true
                 );
               }
@@ -31796,7 +31805,7 @@ ${lanes.join("\n")}
             true
           )), pos);
         }
-        function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag) {
+        function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag, mustBeUnary = false) {
           const pos = getNodePos();
           const opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
           let result;
@@ -31834,7 +31843,7 @@ ${lanes.join("\n")}
             Debug.assert(opening.kind === 282 /* JsxSelfClosingElement */);
             result = opening;
           }
-          if (inExpressionContext && token() === 29 /* LessThanToken */) {
+          if (!mustBeUnary && inExpressionContext && token() === 29 /* LessThanToken */) {
             const topBadPos = typeof topInvalidNodePosition === "undefined" ? result.pos : topInvalidNodePosition;
             const invalidElement = tryParse(() => parseJsxElementOrSelfClosingElementOrFragment(
               /*inExpressionContext*/
@@ -38066,7 +38075,8 @@ ${lanes.join("\n")}
           affectsSemanticDiagnostics: true,
           category: Diagnostics.Modules,
           description: Diagnostics.Allow_imports_to_include_TypeScript_file_extensions_Requires_moduleResolution_bundler_and_either_noEmit_or_emitDeclarationOnly_to_be_set,
-          defaultValueDescription: false
+          defaultValueDescription: false,
+          transpileOptionValue: void 0
         },
         {
           name: "resolvePackageJsonExports",
@@ -39756,7 +39766,7 @@ ${lanes.join("\n")}
   }
   function nodeNextJsonConfigResolver(moduleName, containingFile, host) {
     return nodeModuleNameResolverWorker(
-      8 /* Exports */,
+      30 /* NodeNextDefault */,
       moduleName,
       getDirectoryPath(containingFile),
       { moduleResolution: 99 /* NodeNext */ },
@@ -43764,7 +43774,7 @@ ${lanes.join("\n")}
       }
       if (!isBindingPattern(node.name)) {
         const possibleVariableDecl = node.kind === 257 /* VariableDeclaration */ ? node : node.parent.parent;
-        if (isInJSFile(node) && getEmitModuleResolutionKind(options) !== 100 /* Bundler */ && isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) && !getJSDocTypeTag(node) && !(getCombinedModifierFlags(node) & 1 /* Export */)) {
+        if (isInJSFile(node) && shouldResolveJsRequire(options) && isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) && !getJSDocTypeTag(node) && !(getCombinedModifierFlags(node) & 1 /* Export */)) {
           declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
         } else if (isBlockOrCatchScoped(node)) {
           bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 111551 /* BlockScopedVariableExcludes */);
@@ -47258,7 +47268,7 @@ ${lanes.join("\n")}
       const hasDefaultOnly = isOnlyImportedAsDefault(specifier);
       const hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, specifier);
       if (!exportDefaultSymbol && !hasSyntheticDefault && !hasDefaultOnly) {
-        if (hasExportAssignmentSymbol(moduleSymbol) && !(getAllowSyntheticDefaultImports(compilerOptions) || getESModuleInterop(compilerOptions))) {
+        if (hasExportAssignmentSymbol(moduleSymbol) && !allowSyntheticDefaultImports) {
           const compilerOptionName = moduleKind >= 5 /* ES2015 */ ? "allowSyntheticDefaultImports" : "esModuleInterop";
           const exportEqualsSymbol = moduleSymbol.exports.get("export=" /* ExportEquals */);
           const exportAssignment = exportEqualsSymbol.valueDeclaration;
@@ -47426,7 +47436,7 @@ ${lanes.join("\n")}
       if (!isIdentifier(name)) {
         return void 0;
       }
-      const suppressInteropError = name.escapedText === "default" /* Default */ && !!(compilerOptions.allowSyntheticDefaultImports || getESModuleInterop(compilerOptions));
+      const suppressInteropError = name.escapedText === "default" /* Default */ && allowSyntheticDefaultImports;
       const targetSymbol = resolveESModuleSymbol(
         moduleSymbol,
         moduleSpecifier,
@@ -52055,7 +52065,7 @@ ${lanes.join("\n")}
             return;
           }
           let verbatimTargetName = isShorthandAmbientModuleSymbol(target) && getSomeTargetNameFromDeclarations(symbol.declarations) || unescapeLeadingUnderscores(target.escapedName);
-          if (verbatimTargetName === "export=" /* ExportEquals */ && (getESModuleInterop(compilerOptions) || compilerOptions.allowSyntheticDefaultImports)) {
+          if (verbatimTargetName === "export=" /* ExportEquals */ && allowSyntheticDefaultImports) {
             verbatimTargetName = "default" /* Default */;
           }
           const targetName = getInternalSymbolName(target, verbatimTargetName);
@@ -55538,9 +55548,10 @@ ${lanes.join("\n")}
       setStructuredTypeMembers(type, emptySymbols, emptyArray, emptyArray, emptyArray);
       const typeParameter = getTypeParameterFromMappedType(type);
       const constraintType = getConstraintTypeFromMappedType(type);
-      const nameType = getNameTypeFromMappedType(type.target || type);
-      const isFilteringMappedType = nameType && isTypeAssignableTo(nameType, typeParameter);
-      const templateType = getTemplateTypeFromMappedType(type.target || type);
+      const mappedType = type.target || type;
+      const nameType = getNameTypeFromMappedType(mappedType);
+      const shouldLinkPropDeclarations = !nameType || isFilteringMappedType(mappedType);
+      const templateType = getTemplateTypeFromMappedType(mappedType);
       const modifiersType = getApparentType(getModifiersTypeFromMappedType(type));
       const templateModifiers = getMappedTypeModifiers(type);
       const include = keyofStringsOnly ? 128 /* StringLiteral */ : 8576 /* StringOrNumberLiteralOrUnique */;
@@ -55577,7 +55588,7 @@ ${lanes.join("\n")}
             prop.links.keyType = keyType;
             if (modifiersProp) {
               prop.links.syntheticOrigin = modifiersProp;
-              prop.declarations = !nameType || isFilteringMappedType ? modifiersProp.declarations : void 0;
+              prop.declarations = shouldLinkPropDeclarations ? modifiersProp.declarations : void 0;
             }
             members.set(propName, prop);
           }
@@ -55683,6 +55694,10 @@ ${lanes.join("\n")}
       }
       return false;
     }
+    function isFilteringMappedType(type) {
+      const nameType = getNameTypeFromMappedType(type);
+      return !!nameType && isTypeAssignableTo(nameType, getTypeParameterFromMappedType(type));
+    }
     function resolveStructuredTypeMembers(type) {
       if (!type.members) {
         if (type.flags & 524288 /* Object */) {
@@ -58187,6 +58202,12 @@ ${lanes.join("\n")}
         i--;
         const source = types[i];
         if (hasEmptyObject || source.flags & 469499904 /* StructuredOrInstantiable */) {
+          if (source.flags & 262144 /* TypeParameter */ && getBaseConstraintOrType(source).flags & 1048576 /* Union */) {
+            if (isTypeRelatedTo(source, getUnionType(map(types, (t) => t === source ? neverType : t)), strictSubtypeRelation)) {
+              orderedRemoveItemAt(types, i);
+            }
+            continue;
+          }
           const keyProperty = source.flags & (524288 /* Object */ | 2097152 /* Intersection */ | 58982400 /* InstantiableNonPrimitive */) ? find(getPropertiesOfType(source), (p) => isUnitType(getTypeOfSymbol(p))) : void 0;
           const keyPropertyType = keyProperty && getRegularTypeOfLiteralType(getTypeOfSymbol(keyProperty));
           for (const target of types) {
@@ -59224,8 +59245,7 @@ ${lanes.join("\n")}
         }
       }
       if (isGenericMappedType(objectType)) {
-        const nameType = getNameTypeFromMappedType(objectType);
-        if (!nameType || isTypeAssignableTo(nameType, getTypeParameterFromMappedType(objectType))) {
+        if (!getNameTypeFromMappedType(objectType) || isFilteringMappedType(objectType)) {
           return type[cache] = mapType(substituteIndexedMappedType(objectType, type.indexType), (t) => getSimplifiedType(t, writing));
         }
       }
@@ -63724,7 +63744,7 @@ ${lanes.join("\n")}
         const targetHasStringIndex = some(indexInfos, (info) => info.keyType === stringType);
         let result2 = -1 /* True */;
         for (const targetInfo of indexInfos) {
-          const related = !sourceIsPrimitive && targetHasStringIndex && targetInfo.type.flags & 1 /* Any */ ? -1 /* True */ : isGenericMappedType(source2) && targetHasStringIndex ? isRelatedTo(getTemplateTypeFromMappedType(source2), targetInfo.type, 3 /* Both */, reportErrors2) : typeRelatedToIndexInfo(source2, targetInfo, reportErrors2, intersectionState);
+          const related = relation !== strictSubtypeRelation && !sourceIsPrimitive && targetHasStringIndex && targetInfo.type.flags & 1 /* Any */ ? -1 /* True */ : isGenericMappedType(source2) && targetHasStringIndex ? isRelatedTo(getTemplateTypeFromMappedType(source2), targetInfo.type, 3 /* Both */, reportErrors2) : typeRelatedToIndexInfo(source2, targetInfo, reportErrors2, intersectionState);
           if (!related) {
             return 0 /* False */;
           }
@@ -73136,7 +73156,7 @@ ${lanes.join("\n")}
           return anyType;
         }
       }
-      if (isInJSFile(node) && getEmitModuleResolutionKind(compilerOptions) !== 100 /* Bundler */ && isCommonJsRequire(node)) {
+      if (isInJSFile(node) && shouldResolveJsRequire(compilerOptions) && isCommonJsRequire(node)) {
         return resolveExternalModuleTypeByLiteral(node.arguments[0]);
       }
       const returnType = getReturnTypeOfSignature(signature);
@@ -81392,14 +81412,14 @@ ${lanes.join("\n")}
           markAliasReferenced(sym, id);
           if (getAllSymbolFlags(sym) & 111551 /* Value */) {
             checkExpressionCached(id);
-            if (!isIllegalExportDefaultInCJS && compilerOptions.verbatimModuleSyntax && getTypeOnlyAliasDeclaration(sym, 111551 /* Value */)) {
+            if (!isIllegalExportDefaultInCJS && !(node.flags & 16777216 /* Ambient */) && compilerOptions.verbatimModuleSyntax && getTypeOnlyAliasDeclaration(sym, 111551 /* Value */)) {
               error(
                 id,
                 node.isExportEquals ? Diagnostics.An_export_declaration_must_reference_a_real_value_when_verbatimModuleSyntax_is_enabled_but_0_resolves_to_a_type_only_declaration : Diagnostics.An_export_default_must_reference_a_real_value_when_verbatimModuleSyntax_is_enabled_but_0_resolves_to_a_type_only_declaration,
                 idText(id)
               );
             }
-          } else if (!isIllegalExportDefaultInCJS && compilerOptions.verbatimModuleSyntax) {
+          } else if (!isIllegalExportDefaultInCJS && !(node.flags & 16777216 /* Ambient */) && compilerOptions.verbatimModuleSyntax) {
             error(
               id,
               node.isExportEquals ? Diagnostics.An_export_declaration_must_reference_a_value_when_verbatimModuleSyntax_is_enabled_but_0_only_refers_to_a_type : Diagnostics.An_export_default_must_reference_a_value_when_verbatimModuleSyntax_is_enabled_but_0_only_refers_to_a_type,
@@ -91985,11 +92005,12 @@ ${lanes.join("\n")}
       return visitEachChild(node, visitor, context);
     }
     function visitArrayAssignmentElement(node) {
-      Debug.assertNode(node, isArrayBindingOrAssignmentElement);
-      if (isSpreadElement(node))
-        return visitAssignmentRestElement(node);
-      if (!isOmittedExpression(node))
-        return visitAssignmentElement(node);
+      if (isArrayBindingOrAssignmentElement(node)) {
+        if (isSpreadElement(node))
+          return visitAssignmentRestElement(node);
+        if (!isOmittedExpression(node))
+          return visitAssignmentElement(node);
+      }
       return visitEachChild(node, visitor, context);
     }
     function visitAssignmentProperty(node) {
@@ -93803,10 +93824,14 @@ ${lanes.join("\n")}
             visitor
           );
           const superStatementIndex = findSuperStatementIndex(node.body.statements, nonPrologueStart);
-          const indexOfFirstStatementAfterSuper = superStatementIndex >= 0 ? superStatementIndex + 1 : void 0;
-          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, indexOfFirstStatementAfterSuper ? indexOfFirstStatementAfterSuper - nonPrologueStart : void 0));
-          addRange(statements, initializerStatements);
-          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, indexOfFirstStatementAfterSuper));
+          if (superStatementIndex >= 0) {
+            addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, superStatementIndex + 1 - nonPrologueStart));
+            addRange(statements, initializerStatements);
+            addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, superStatementIndex + 1));
+          } else {
+            addRange(statements, initializerStatements);
+            addRange(statements, visitNodes2(node.body.statements, visitor, isStatement));
+          }
           body = factory2.createBlock(
             statements,
             /*multiLine*/
@@ -117196,7 +117221,7 @@ ${lanes.join("\n")}
           false
         );
       }
-      const shouldProcessRequires = isJavaScriptFile && getEmitModuleResolutionKind(options) !== 100 /* Bundler */;
+      const shouldProcessRequires = isJavaScriptFile && shouldResolveJsRequire(options);
       if (file.flags & 2097152 /* PossiblyContainsDynamicImport */ || shouldProcessRequires) {
         collectDynamicImportOrRequireCalls(file);
       }
@@ -118124,9 +118149,6 @@ ${lanes.join("\n")}
         if (moduleKind === 2 /* AMD */ || moduleKind === 3 /* UMD */ || moduleKind === 4 /* System */) {
           createDiagnosticForOptionName(Diagnostics.Option_verbatimModuleSyntax_cannot_be_used_when_module_is_set_to_UMD_AMD_or_System, "verbatimModuleSyntax");
         }
-        if (options.isolatedModules) {
-          createRedundantOptionDiagnostic("isolatedModules", "verbatimModuleSyntax");
-        }
         if (options.preserveValueImports) {
           createRedundantOptionDiagnostic("preserveValueImports", "verbatimModuleSyntax");
         }
@@ -122897,7 +122919,6 @@ ${lanes.join("\n")}
       );
     }
     function updateExtendedConfigFilesWatches(forProjectPath, options, watchOptions2, watchType) {
-      Debug.assert(configFileName);
       updateSharedExtendedConfigFileWatcher(
         forProjectPath,
         options,
@@ -122913,7 +122934,7 @@ ${lanes.join("\n")}
             if (!(projects == null ? void 0 : projects.size))
               return;
             projects.forEach((projectPath) => {
-              if (toPath3(configFileName) === projectPath) {
+              if (configFileName && toPath3(configFileName) === projectPath) {
                 reloadLevel = 2 /* Full */;
               } else {
                 const config = parsedConfigs == null ? void 0 : parsedConfigs.get(projectPath);
@@ -151124,7 +151145,7 @@ ${lanes.join("\n")}
         const literals = contextualTypes.types.filter((literal) => !tracker.hasValue(literal.value));
         return { kind: 2 /* Types */, types: literals, isNewIdentifier: false };
       default:
-        return fromContextualType();
+        return fromContextualType() || fromContextualType(0 /* None */);
     }
     function fromContextualType(contextFlags = 4 /* Completions */) {
       const types = getStringLiteralTypes(getContextualTypeFromParent(node, typeChecker, contextFlags));
@@ -180354,6 +180375,7 @@ ${e.message}`;
     setValueDeclaration: () => setValueDeclaration,
     shouldAllowImportingTsExtension: () => shouldAllowImportingTsExtension,
     shouldPreserveConstEnums: () => shouldPreserveConstEnums,
+    shouldResolveJsRequire: () => shouldResolveJsRequire,
     shouldUseUriStyleNodeCoreModules: () => shouldUseUriStyleNodeCoreModules,
     showModuleSpecifier: () => showModuleSpecifier,
     signatureHasLiteralTypes: () => signatureHasLiteralTypes,
@@ -182712,6 +182734,7 @@ ${e.message}`;
     setValueDeclaration: () => setValueDeclaration,
     shouldAllowImportingTsExtension: () => shouldAllowImportingTsExtension,
     shouldPreserveConstEnums: () => shouldPreserveConstEnums,
+    shouldResolveJsRequire: () => shouldResolveJsRequire,
     shouldUseUriStyleNodeCoreModules: () => shouldUseUriStyleNodeCoreModules,
     showModuleSpecifier: () => showModuleSpecifier,
     signatureHasLiteralTypes: () => signatureHasLiteralTypes,

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.0";
-      version = "5.0.2";
+      version = "5.0.4";
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -17991,6 +17991,9 @@ ${lanes.join("\n")}
   function moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution) {
     return moduleResolution >= 3 /* Node16 */ && moduleResolution <= 99 /* NodeNext */ || moduleResolution === 100 /* Bundler */;
   }
+  function shouldResolveJsRequire(compilerOptions) {
+    return !!compilerOptions.noDtsResolution || getEmitModuleResolutionKind(compilerOptions) !== 100 /* Bundler */;
+  }
   function getResolvePackageJsonExports(compilerOptions) {
     const moduleResolution = getEmitModuleResolutionKind(compilerOptions);
     if (!moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution)) {
@@ -31692,6 +31695,12 @@ ${lanes.join("\n")}
               if (languageVariant === 1 /* JSX */) {
                 return parseJsxElementOrSelfClosingElementOrFragment(
                   /*inExpressionContext*/
+                  true,
+                  /*topInvalidNodePosition*/
+                  void 0,
+                  /*openingTag*/
+                  void 0,
+                  /*mustBeUnary*/
                   true
                 );
               }
@@ -31796,7 +31805,7 @@ ${lanes.join("\n")}
             true
           )), pos);
         }
-        function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag) {
+        function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag, mustBeUnary = false) {
           const pos = getNodePos();
           const opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
           let result;
@@ -31834,7 +31843,7 @@ ${lanes.join("\n")}
             Debug.assert(opening.kind === 282 /* JsxSelfClosingElement */);
             result = opening;
           }
-          if (inExpressionContext && token() === 29 /* LessThanToken */) {
+          if (!mustBeUnary && inExpressionContext && token() === 29 /* LessThanToken */) {
             const topBadPos = typeof topInvalidNodePosition === "undefined" ? result.pos : topInvalidNodePosition;
             const invalidElement = tryParse(() => parseJsxElementOrSelfClosingElementOrFragment(
               /*inExpressionContext*/
@@ -38066,7 +38075,8 @@ ${lanes.join("\n")}
           affectsSemanticDiagnostics: true,
           category: Diagnostics.Modules,
           description: Diagnostics.Allow_imports_to_include_TypeScript_file_extensions_Requires_moduleResolution_bundler_and_either_noEmit_or_emitDeclarationOnly_to_be_set,
-          defaultValueDescription: false
+          defaultValueDescription: false,
+          transpileOptionValue: void 0
         },
         {
           name: "resolvePackageJsonExports",
@@ -39756,7 +39766,7 @@ ${lanes.join("\n")}
   }
   function nodeNextJsonConfigResolver(moduleName, containingFile, host) {
     return nodeModuleNameResolverWorker(
-      8 /* Exports */,
+      30 /* NodeNextDefault */,
       moduleName,
       getDirectoryPath(containingFile),
       { moduleResolution: 99 /* NodeNext */ },
@@ -43764,7 +43774,7 @@ ${lanes.join("\n")}
       }
       if (!isBindingPattern(node.name)) {
         const possibleVariableDecl = node.kind === 257 /* VariableDeclaration */ ? node : node.parent.parent;
-        if (isInJSFile(node) && getEmitModuleResolutionKind(options) !== 100 /* Bundler */ && isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) && !getJSDocTypeTag(node) && !(getCombinedModifierFlags(node) & 1 /* Export */)) {
+        if (isInJSFile(node) && shouldResolveJsRequire(options) && isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) && !getJSDocTypeTag(node) && !(getCombinedModifierFlags(node) & 1 /* Export */)) {
           declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
         } else if (isBlockOrCatchScoped(node)) {
           bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 111551 /* BlockScopedVariableExcludes */);
@@ -47258,7 +47268,7 @@ ${lanes.join("\n")}
       const hasDefaultOnly = isOnlyImportedAsDefault(specifier);
       const hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, specifier);
       if (!exportDefaultSymbol && !hasSyntheticDefault && !hasDefaultOnly) {
-        if (hasExportAssignmentSymbol(moduleSymbol) && !(getAllowSyntheticDefaultImports(compilerOptions) || getESModuleInterop(compilerOptions))) {
+        if (hasExportAssignmentSymbol(moduleSymbol) && !allowSyntheticDefaultImports) {
           const compilerOptionName = moduleKind >= 5 /* ES2015 */ ? "allowSyntheticDefaultImports" : "esModuleInterop";
           const exportEqualsSymbol = moduleSymbol.exports.get("export=" /* ExportEquals */);
           const exportAssignment = exportEqualsSymbol.valueDeclaration;
@@ -47426,7 +47436,7 @@ ${lanes.join("\n")}
       if (!isIdentifier(name)) {
         return void 0;
       }
-      const suppressInteropError = name.escapedText === "default" /* Default */ && !!(compilerOptions.allowSyntheticDefaultImports || getESModuleInterop(compilerOptions));
+      const suppressInteropError = name.escapedText === "default" /* Default */ && allowSyntheticDefaultImports;
       const targetSymbol = resolveESModuleSymbol(
         moduleSymbol,
         moduleSpecifier,
@@ -52055,7 +52065,7 @@ ${lanes.join("\n")}
             return;
           }
           let verbatimTargetName = isShorthandAmbientModuleSymbol(target) && getSomeTargetNameFromDeclarations(symbol.declarations) || unescapeLeadingUnderscores(target.escapedName);
-          if (verbatimTargetName === "export=" /* ExportEquals */ && (getESModuleInterop(compilerOptions) || compilerOptions.allowSyntheticDefaultImports)) {
+          if (verbatimTargetName === "export=" /* ExportEquals */ && allowSyntheticDefaultImports) {
             verbatimTargetName = "default" /* Default */;
           }
           const targetName = getInternalSymbolName(target, verbatimTargetName);
@@ -55538,9 +55548,10 @@ ${lanes.join("\n")}
       setStructuredTypeMembers(type, emptySymbols, emptyArray, emptyArray, emptyArray);
       const typeParameter = getTypeParameterFromMappedType(type);
       const constraintType = getConstraintTypeFromMappedType(type);
-      const nameType = getNameTypeFromMappedType(type.target || type);
-      const isFilteringMappedType = nameType && isTypeAssignableTo(nameType, typeParameter);
-      const templateType = getTemplateTypeFromMappedType(type.target || type);
+      const mappedType = type.target || type;
+      const nameType = getNameTypeFromMappedType(mappedType);
+      const shouldLinkPropDeclarations = !nameType || isFilteringMappedType(mappedType);
+      const templateType = getTemplateTypeFromMappedType(mappedType);
       const modifiersType = getApparentType(getModifiersTypeFromMappedType(type));
       const templateModifiers = getMappedTypeModifiers(type);
       const include = keyofStringsOnly ? 128 /* StringLiteral */ : 8576 /* StringOrNumberLiteralOrUnique */;
@@ -55577,7 +55588,7 @@ ${lanes.join("\n")}
             prop.links.keyType = keyType;
             if (modifiersProp) {
               prop.links.syntheticOrigin = modifiersProp;
-              prop.declarations = !nameType || isFilteringMappedType ? modifiersProp.declarations : void 0;
+              prop.declarations = shouldLinkPropDeclarations ? modifiersProp.declarations : void 0;
             }
             members.set(propName, prop);
           }
@@ -55683,6 +55694,10 @@ ${lanes.join("\n")}
       }
       return false;
     }
+    function isFilteringMappedType(type) {
+      const nameType = getNameTypeFromMappedType(type);
+      return !!nameType && isTypeAssignableTo(nameType, getTypeParameterFromMappedType(type));
+    }
     function resolveStructuredTypeMembers(type) {
       if (!type.members) {
         if (type.flags & 524288 /* Object */) {
@@ -58187,6 +58202,12 @@ ${lanes.join("\n")}
         i--;
         const source = types[i];
         if (hasEmptyObject || source.flags & 469499904 /* StructuredOrInstantiable */) {
+          if (source.flags & 262144 /* TypeParameter */ && getBaseConstraintOrType(source).flags & 1048576 /* Union */) {
+            if (isTypeRelatedTo(source, getUnionType(map(types, (t) => t === source ? neverType : t)), strictSubtypeRelation)) {
+              orderedRemoveItemAt(types, i);
+            }
+            continue;
+          }
           const keyProperty = source.flags & (524288 /* Object */ | 2097152 /* Intersection */ | 58982400 /* InstantiableNonPrimitive */) ? find(getPropertiesOfType(source), (p) => isUnitType(getTypeOfSymbol(p))) : void 0;
           const keyPropertyType = keyProperty && getRegularTypeOfLiteralType(getTypeOfSymbol(keyProperty));
           for (const target of types) {
@@ -59224,8 +59245,7 @@ ${lanes.join("\n")}
         }
       }
       if (isGenericMappedType(objectType)) {
-        const nameType = getNameTypeFromMappedType(objectType);
-        if (!nameType || isTypeAssignableTo(nameType, getTypeParameterFromMappedType(objectType))) {
+        if (!getNameTypeFromMappedType(objectType) || isFilteringMappedType(objectType)) {
           return type[cache] = mapType(substituteIndexedMappedType(objectType, type.indexType), (t) => getSimplifiedType(t, writing));
         }
       }
@@ -63724,7 +63744,7 @@ ${lanes.join("\n")}
         const targetHasStringIndex = some(indexInfos, (info) => info.keyType === stringType);
         let result2 = -1 /* True */;
         for (const targetInfo of indexInfos) {
-          const related = !sourceIsPrimitive && targetHasStringIndex && targetInfo.type.flags & 1 /* Any */ ? -1 /* True */ : isGenericMappedType(source2) && targetHasStringIndex ? isRelatedTo(getTemplateTypeFromMappedType(source2), targetInfo.type, 3 /* Both */, reportErrors2) : typeRelatedToIndexInfo(source2, targetInfo, reportErrors2, intersectionState);
+          const related = relation !== strictSubtypeRelation && !sourceIsPrimitive && targetHasStringIndex && targetInfo.type.flags & 1 /* Any */ ? -1 /* True */ : isGenericMappedType(source2) && targetHasStringIndex ? isRelatedTo(getTemplateTypeFromMappedType(source2), targetInfo.type, 3 /* Both */, reportErrors2) : typeRelatedToIndexInfo(source2, targetInfo, reportErrors2, intersectionState);
           if (!related) {
             return 0 /* False */;
           }
@@ -73136,7 +73156,7 @@ ${lanes.join("\n")}
           return anyType;
         }
       }
-      if (isInJSFile(node) && getEmitModuleResolutionKind(compilerOptions) !== 100 /* Bundler */ && isCommonJsRequire(node)) {
+      if (isInJSFile(node) && shouldResolveJsRequire(compilerOptions) && isCommonJsRequire(node)) {
         return resolveExternalModuleTypeByLiteral(node.arguments[0]);
       }
       const returnType = getReturnTypeOfSignature(signature);
@@ -81392,14 +81412,14 @@ ${lanes.join("\n")}
           markAliasReferenced(sym, id);
           if (getAllSymbolFlags(sym) & 111551 /* Value */) {
             checkExpressionCached(id);
-            if (!isIllegalExportDefaultInCJS && compilerOptions.verbatimModuleSyntax && getTypeOnlyAliasDeclaration(sym, 111551 /* Value */)) {
+            if (!isIllegalExportDefaultInCJS && !(node.flags & 16777216 /* Ambient */) && compilerOptions.verbatimModuleSyntax && getTypeOnlyAliasDeclaration(sym, 111551 /* Value */)) {
               error(
                 id,
                 node.isExportEquals ? Diagnostics.An_export_declaration_must_reference_a_real_value_when_verbatimModuleSyntax_is_enabled_but_0_resolves_to_a_type_only_declaration : Diagnostics.An_export_default_must_reference_a_real_value_when_verbatimModuleSyntax_is_enabled_but_0_resolves_to_a_type_only_declaration,
                 idText(id)
               );
             }
-          } else if (!isIllegalExportDefaultInCJS && compilerOptions.verbatimModuleSyntax) {
+          } else if (!isIllegalExportDefaultInCJS && !(node.flags & 16777216 /* Ambient */) && compilerOptions.verbatimModuleSyntax) {
             error(
               id,
               node.isExportEquals ? Diagnostics.An_export_declaration_must_reference_a_value_when_verbatimModuleSyntax_is_enabled_but_0_only_refers_to_a_type : Diagnostics.An_export_default_must_reference_a_value_when_verbatimModuleSyntax_is_enabled_but_0_only_refers_to_a_type,
@@ -91985,11 +92005,12 @@ ${lanes.join("\n")}
       return visitEachChild(node, visitor, context);
     }
     function visitArrayAssignmentElement(node) {
-      Debug.assertNode(node, isArrayBindingOrAssignmentElement);
-      if (isSpreadElement(node))
-        return visitAssignmentRestElement(node);
-      if (!isOmittedExpression(node))
-        return visitAssignmentElement(node);
+      if (isArrayBindingOrAssignmentElement(node)) {
+        if (isSpreadElement(node))
+          return visitAssignmentRestElement(node);
+        if (!isOmittedExpression(node))
+          return visitAssignmentElement(node);
+      }
       return visitEachChild(node, visitor, context);
     }
     function visitAssignmentProperty(node) {
@@ -93803,10 +93824,14 @@ ${lanes.join("\n")}
             visitor
           );
           const superStatementIndex = findSuperStatementIndex(node.body.statements, nonPrologueStart);
-          const indexOfFirstStatementAfterSuper = superStatementIndex >= 0 ? superStatementIndex + 1 : void 0;
-          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, indexOfFirstStatementAfterSuper ? indexOfFirstStatementAfterSuper - nonPrologueStart : void 0));
-          addRange(statements, initializerStatements);
-          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, indexOfFirstStatementAfterSuper));
+          if (superStatementIndex >= 0) {
+            addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, superStatementIndex + 1 - nonPrologueStart));
+            addRange(statements, initializerStatements);
+            addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, superStatementIndex + 1));
+          } else {
+            addRange(statements, initializerStatements);
+            addRange(statements, visitNodes2(node.body.statements, visitor, isStatement));
+          }
           body = factory2.createBlock(
             statements,
             /*multiLine*/
@@ -117196,7 +117221,7 @@ ${lanes.join("\n")}
           false
         );
       }
-      const shouldProcessRequires = isJavaScriptFile && getEmitModuleResolutionKind(options) !== 100 /* Bundler */;
+      const shouldProcessRequires = isJavaScriptFile && shouldResolveJsRequire(options);
       if (file.flags & 2097152 /* PossiblyContainsDynamicImport */ || shouldProcessRequires) {
         collectDynamicImportOrRequireCalls(file);
       }
@@ -118124,9 +118149,6 @@ ${lanes.join("\n")}
         if (moduleKind === 2 /* AMD */ || moduleKind === 3 /* UMD */ || moduleKind === 4 /* System */) {
           createDiagnosticForOptionName(Diagnostics.Option_verbatimModuleSyntax_cannot_be_used_when_module_is_set_to_UMD_AMD_or_System, "verbatimModuleSyntax");
         }
-        if (options.isolatedModules) {
-          createRedundantOptionDiagnostic("isolatedModules", "verbatimModuleSyntax");
-        }
         if (options.preserveValueImports) {
           createRedundantOptionDiagnostic("preserveValueImports", "verbatimModuleSyntax");
         }
@@ -122897,7 +122919,6 @@ ${lanes.join("\n")}
       );
     }
     function updateExtendedConfigFilesWatches(forProjectPath, options, watchOptions2, watchType) {
-      Debug.assert(configFileName);
       updateSharedExtendedConfigFileWatcher(
         forProjectPath,
         options,
@@ -122913,7 +122934,7 @@ ${lanes.join("\n")}
             if (!(projects == null ? void 0 : projects.size))
               return;
             projects.forEach((projectPath) => {
-              if (toPath3(configFileName) === projectPath) {
+              if (configFileName && toPath3(configFileName) === projectPath) {
                 reloadLevel = 2 /* Full */;
               } else {
                 const config = parsedConfigs == null ? void 0 : parsedConfigs.get(projectPath);
@@ -151138,7 +151159,7 @@ ${lanes.join("\n")}
         const literals = contextualTypes.types.filter((literal) => !tracker.hasValue(literal.value));
         return { kind: 2 /* Types */, types: literals, isNewIdentifier: false };
       default:
-        return fromContextualType();
+        return fromContextualType() || fromContextualType(0 /* None */);
     }
     function fromContextualType(contextFlags = 4 /* Completions */) {
       const types = getStringLiteralTypes(getContextualTypeFromParent(node, typeChecker, contextFlags));
@@ -169535,6 +169556,7 @@ ${options.prefix}` : "\n" : options.prefix
     setValueDeclaration: () => setValueDeclaration,
     shouldAllowImportingTsExtension: () => shouldAllowImportingTsExtension,
     shouldPreserveConstEnums: () => shouldPreserveConstEnums,
+    shouldResolveJsRequire: () => shouldResolveJsRequire,
     shouldUseUriStyleNodeCoreModules: () => shouldUseUriStyleNodeCoreModules,
     showModuleSpecifier: () => showModuleSpecifier,
     signatureHasLiteralTypes: () => signatureHasLiteralTypes,

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.0";
-var version = "5.0.2";
+var version = "5.0.4";
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -11947,6 +11947,9 @@ function unusedLabelIsError(options) {
 function moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution) {
   return moduleResolution >= 3 /* Node16 */ && moduleResolution <= 99 /* NodeNext */ || moduleResolution === 100 /* Bundler */;
 }
+function shouldResolveJsRequire(compilerOptions) {
+  return !!compilerOptions.noDtsResolution || getEmitModuleResolutionKind(compilerOptions) !== 100 /* Bundler */;
+}
 function getResolveJsonModule(compilerOptions) {
   if (compilerOptions.resolveJsonModule !== void 0) {
     return compilerOptions.resolveJsonModule;
@@ -22092,6 +22095,12 @@ var Parser;
         if (languageVariant === 1 /* JSX */) {
           return parseJsxElementOrSelfClosingElementOrFragment(
             /*inExpressionContext*/
+            true,
+            /*topInvalidNodePosition*/
+            void 0,
+            /*openingTag*/
+            void 0,
+            /*mustBeUnary*/
             true
           );
         }
@@ -22196,7 +22205,7 @@ var Parser;
       true
     )), pos);
   }
-  function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag) {
+  function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag, mustBeUnary = false) {
     const pos = getNodePos();
     const opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
     let result;
@@ -22234,7 +22243,7 @@ var Parser;
       Debug.assert(opening.kind === 282 /* JsxSelfClosingElement */);
       result = opening;
     }
-    if (inExpressionContext && token() === 29 /* LessThanToken */) {
+    if (!mustBeUnary && inExpressionContext && token() === 29 /* LessThanToken */) {
       const topBadPos = typeof topInvalidNodePosition === "undefined" ? result.pos : topInvalidNodePosition;
       const invalidElement = tryParse(() => parseJsxElementOrSelfClosingElementOrFragment(
         /*inExpressionContext*/
@@ -26924,7 +26933,8 @@ var commandOptionsWithoutBuild = [
     affectsSemanticDiagnostics: true,
     category: Diagnostics.Modules,
     description: Diagnostics.Allow_imports_to_include_TypeScript_file_extensions_Requires_moduleResolution_bundler_and_either_noEmit_or_emitDeclarationOnly_to_be_set,
-    defaultValueDescription: false
+    defaultValueDescription: false,
+    transpileOptionValue: void 0
   },
   {
     name: "resolvePackageJsonExports",
@@ -32226,7 +32236,7 @@ function createBinder() {
     }
     if (!isBindingPattern(node.name)) {
       const possibleVariableDecl = node.kind === 257 /* VariableDeclaration */ ? node : node.parent.parent;
-      if (isInJSFile(node) && getEmitModuleResolutionKind(options) !== 100 /* Bundler */ && isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) && !getJSDocTypeTag(node) && !(getCombinedModifierFlags(node) & 1 /* Export */)) {
+      if (isInJSFile(node) && shouldResolveJsRequire(options) && isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) && !getJSDocTypeTag(node) && !(getCombinedModifierFlags(node) & 1 /* Export */)) {
         declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
       } else if (isBlockOrCatchScoped(node)) {
         bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 111551 /* BlockScopedVariableExcludes */);

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.0.2",
+    "version": "5.0.4",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [