typescript 5.2.0-dev.20230724 → 5.2.0-dev.20230726

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230724`;
+var version = `${versionMajorMinor}.0-dev.20230726`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -5764,6 +5764,7 @@ var Diagnostics = {
   Type_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method: diag(1062, 1 /* Error */, "Type_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method_1062", "Type is referenced directly or indirectly in the fulfillment callback of its own 'then' method."),
   An_export_assignment_cannot_be_used_in_a_namespace: diag(1063, 1 /* Error */, "An_export_assignment_cannot_be_used_in_a_namespace_1063", "An export assignment cannot be used in a namespace."),
   The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_write_Promise_0: diag(1064, 1 /* Error */, "The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_wri_1064", "The return type of an async function or method must be the global Promise<T> type. Did you mean to write 'Promise<{0}>'?"),
+  The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type: diag(1065, 1 /* Error */, "The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_1065", "The return type of an async function or method must be the global Promise<T> type."),
   In_ambient_enum_declarations_member_initializer_must_be_constant_expression: diag(1066, 1 /* Error */, "In_ambient_enum_declarations_member_initializer_must_be_constant_expression_1066", "In ambient enum declarations member initializer must be constant expression."),
   Unexpected_token_A_constructor_method_accessor_or_property_was_expected: diag(1068, 1 /* Error */, "Unexpected_token_A_constructor_method_accessor_or_property_was_expected_1068", "Unexpected token. A constructor, method, accessor, or property was expected."),
   Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces: diag(1069, 1 /* Error */, "Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces_1069", "Unexpected token. A type parameter name was expected without curly braces."),
@@ -39242,6 +39243,9 @@ function getModuleInstanceStateForAliasTarget(specifier, visited) {
           if (found === 1 /* Instantiated */) {
             return found;
           }
+          if (statement.kind === 271 /* ImportEqualsDeclaration */) {
+            found = 1 /* Instantiated */;
+          }
         }
       }
       if (found !== void 0) {
@@ -46187,7 +46191,7 @@ function createTypeChecker(host) {
     return isStringLiteralLike(moduleReferenceExpression) ? resolveExternalModule(location, moduleReferenceExpression.text, moduleNotFoundError, moduleReferenceExpression, isForAugmentation) : void 0;
   }
   function resolveExternalModule(location, moduleReference, moduleNotFoundError, errorNode, isForAugmentation = false) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     if (startsWith(moduleReference, "@types/")) {
       const diag2 = Diagnostics.Cannot_import_type_declaration_files_Consider_importing_0_instead_of_1;
       const withoutAtTypePrefix = removePrefix(moduleReference, "@types/");
@@ -46222,8 +46226,11 @@ function createTypeChecker(host) {
           );
         }
       } else if (resolvedModule.resolvedUsingTsExtension && !shouldAllowImportingTsExtension(compilerOptions, currentSourceFile.fileName)) {
-        const tsExtension = Debug.checkDefined(tryExtractTSExtension(moduleReference));
-        error(errorNode, Diagnostics.An_import_path_can_only_end_with_a_0_extension_when_allowImportingTsExtensions_is_enabled, tsExtension);
+        const importOrExport = ((_h = findAncestor(location, isImportDeclaration)) == null ? void 0 : _h.importClause) || findAncestor(location, or(isImportEqualsDeclaration, isExportDeclaration));
+        if (!((importOrExport == null ? void 0 : importOrExport.isTypeOnly) || findAncestor(location, isImportTypeNode))) {
+          const tsExtension = Debug.checkDefined(tryExtractTSExtension(moduleReference));
+          error(errorNode, Diagnostics.An_import_path_can_only_end_with_a_0_extension_when_allowImportingTsExtensions_is_enabled, tsExtension);
+        }
       }
       if (sourceFile.symbol) {
         if (resolvedModule.isExternalLibraryImport && !resolutionExtensionIsTSOrJson(resolvedModule.extension)) {
@@ -46240,7 +46247,7 @@ function createTypeChecker(host) {
         if (moduleResolutionKind === 3 /* Node16 */ || moduleResolutionKind === 99 /* NodeNext */) {
           const isSyncImport = currentSourceFile.impliedNodeFormat === 1 /* CommonJS */ && !findAncestor(location, isImportCall) || !!findAncestor(location, isImportEqualsDeclaration);
           const overrideClauseHost = findAncestor(location, (l) => isImportTypeNode(l) || isExportDeclaration(l) || isImportDeclaration(l));
-          const overrideClause = overrideClauseHost && isImportTypeNode(overrideClauseHost) ? (_h = overrideClauseHost.assertions) == null ? void 0 : _h.assertClause : overrideClauseHost == null ? void 0 : overrideClauseHost.assertClause;
+          const overrideClause = overrideClauseHost && isImportTypeNode(overrideClauseHost) ? (_i = overrideClauseHost.assertions) == null ? void 0 : _i.assertClause : overrideClauseHost == null ? void 0 : overrideClauseHost.assertClause;
           if (isSyncImport && sourceFile.impliedNodeFormat === 99 /* ESNext */ && !getResolutionModeOverrideForClause(overrideClause)) {
             if (findAncestor(location, isImportEqualsDeclaration)) {
               error(errorNode, Diagnostics.Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_cannot_be_imported_with_require_Use_an_ECMAScript_import_instead, moduleReference);
@@ -46343,7 +46350,7 @@ function createTypeChecker(host) {
           error(errorNode, Diagnostics.Cannot_find_module_0_Consider_using_resolveJsonModule_to_import_module_with_json_extension, moduleReference);
         } else if (mode === 99 /* ESNext */ && resolutionIsNode16OrNext && isExtensionlessRelativePathImport) {
           const absoluteRef = getNormalizedAbsolutePath(moduleReference, getDirectoryPath(currentSourceFile.path));
-          const suggestedExt = (_i = suggestedExtensions.find(([actualExt, _importExt]) => host.fileExists(absoluteRef + actualExt))) == null ? void 0 : _i[1];
+          const suggestedExt = (_j = suggestedExtensions.find(([actualExt, _importExt]) => host.fileExists(absoluteRef + actualExt))) == null ? void 0 : _j[1];
           if (suggestedExt) {
             error(
               errorNode,
@@ -47779,11 +47786,13 @@ function createTypeChecker(host) {
         return !!type2.target && isMappedTypeHomomorphic(type2.target) && !isMappedTypeHomomorphic(type2);
       }
       function createMappedTypeNodeFromType(type2) {
+        var _a2;
         Debug.assert(!!(type2.flags & 524288 /* Object */));
         const readonlyToken = type2.declaration.readonlyToken ? factory.createToken(type2.declaration.readonlyToken.kind) : void 0;
         const questionToken = type2.declaration.questionToken ? factory.createToken(type2.declaration.questionToken.kind) : void 0;
         let appropriateConstraintTypeNode;
         let newTypeVariable;
+        const needsModifierPreservingWrapper = !isMappedTypeWithKeyofConstraintDeclaration(type2) && !(getModifiersTypeFromMappedType(type2).flags & 2 /* Unknown */) && context.flags & 4 /* GenerateNamesForShadowedTypeParams */ && !(getConstraintTypeFromMappedType(type2).flags & 262144 /* TypeParameter */ && ((_a2 = getConstraintOfTypeParameter(getConstraintTypeFromMappedType(type2))) == null ? void 0 : _a2.flags) & 4194304 /* Index */);
         if (isMappedTypeWithKeyofConstraintDeclaration(type2)) {
           if (isHomomorphicMappedTypeWithNonHomomorphicInstantiation(type2) && context.flags & 4 /* GenerateNamesForShadowedTypeParams */) {
             const newParam = createTypeParameter(createSymbol(262144 /* TypeParameter */, "T"));
@@ -47791,6 +47800,11 @@ function createTypeChecker(host) {
             newTypeVariable = factory.createTypeReferenceNode(name);
           }
           appropriateConstraintTypeNode = factory.createTypeOperatorNode(143 /* KeyOfKeyword */, newTypeVariable || typeToTypeNodeHelper(getModifiersTypeFromMappedType(type2), context));
+        } else if (needsModifierPreservingWrapper) {
+          const newParam = createTypeParameter(createSymbol(262144 /* TypeParameter */, "T"));
+          const name = typeParameterToName(newParam, context);
+          newTypeVariable = factory.createTypeReferenceNode(name);
+          appropriateConstraintTypeNode = newTypeVariable;
         } else {
           appropriateConstraintTypeNode = typeToTypeNodeHelper(getConstraintTypeFromMappedType(type2), context);
         }
@@ -47821,6 +47835,18 @@ function createTypeChecker(host) {
             result,
             factory.createKeywordTypeNode(146 /* NeverKeyword */)
           );
+        } else if (needsModifierPreservingWrapper) {
+          return factory.createConditionalTypeNode(
+            typeToTypeNodeHelper(getConstraintTypeFromMappedType(type2), context),
+            factory.createInferTypeNode(factory.createTypeParameterDeclaration(
+              /*modifiers*/
+              void 0,
+              factory.cloneNode(newTypeVariable.typeName),
+              factory.createTypeOperatorNode(143 /* KeyOfKeyword */, typeToTypeNodeHelper(getModifiersTypeFromMappedType(type2), context))
+            )),
+            result,
+            factory.createKeywordTypeNode(146 /* NeverKeyword */)
+          );
         }
         return result;
       }
@@ -74961,7 +74987,18 @@ function createTypeChecker(host) {
     addLazyDiagnostic(checkSignatureDeclarationDiagnostics);
     function checkSignatureDeclarationDiagnostics() {
       checkCollisionWithArgumentsInGeneratedCode(node);
-      const returnTypeNode = getEffectiveReturnTypeNode(node);
+      let returnTypeNode = getEffectiveReturnTypeNode(node);
+      let returnTypeErrorLocation = returnTypeNode;
+      if (isInJSFile(node)) {
+        const typeTag = getJSDocTypeTag(node);
+        if (typeTag && typeTag.typeExpression && isTypeReferenceNode(typeTag.typeExpression.type)) {
+          const signature = getSingleCallSignature(getTypeFromTypeNode(typeTag.typeExpression));
+          if (signature && signature.declaration) {
+            returnTypeNode = getEffectiveReturnTypeNode(signature.declaration);
+            returnTypeErrorLocation = typeTag.typeExpression.type;
+          }
+        }
+      }
       if (noImplicitAny && !returnTypeNode) {
         switch (node.kind) {
           case 180 /* ConstructSignature */:
@@ -74972,21 +75009,21 @@ function createTypeChecker(host) {
             break;
         }
       }
-      if (returnTypeNode) {
+      if (returnTypeNode && returnTypeErrorLocation) {
         const functionFlags2 = getFunctionFlags(node);
         if ((functionFlags2 & (4 /* Invalid */ | 1 /* Generator */)) === 1 /* Generator */) {
           const returnType = getTypeFromTypeNode(returnTypeNode);
           if (returnType === voidType) {
-            error(returnTypeNode, Diagnostics.A_generator_cannot_have_a_void_type_annotation);
+            error(returnTypeErrorLocation, Diagnostics.A_generator_cannot_have_a_void_type_annotation);
           } else {
             const generatorYieldType = getIterationTypeOfGeneratorFunctionReturnType(0 /* Yield */, returnType, (functionFlags2 & 2 /* Async */) !== 0) || anyType;
             const generatorReturnType = getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, returnType, (functionFlags2 & 2 /* Async */) !== 0) || generatorYieldType;
             const generatorNextType = getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, returnType, (functionFlags2 & 2 /* Async */) !== 0) || unknownType;
             const generatorInstantiation = createGeneratorReturnType(generatorYieldType, generatorReturnType, generatorNextType, !!(functionFlags2 & 2 /* Async */));
-            checkTypeAssignableTo(generatorInstantiation, returnType, returnTypeNode);
+            checkTypeAssignableTo(generatorInstantiation, returnType, returnTypeErrorLocation);
           }
         } else if ((functionFlags2 & 3 /* AsyncGenerator */) === 2 /* Async */) {
-          checkAsyncFunctionReturnType(node, returnTypeNode);
+          checkAsyncFunctionReturnType(node, returnTypeNode, returnTypeErrorLocation);
         }
       }
       if (node.kind !== 181 /* IndexSignature */ && node.kind !== 324 /* JSDocFunctionType */) {
@@ -76068,7 +76105,7 @@ function createTypeChecker(host) {
     }
     return typeAsAwaitable.awaitedTypeOfType = type;
   }
-  function checkAsyncFunctionReturnType(node, returnTypeNode) {
+  function checkAsyncFunctionReturnType(node, returnTypeNode, returnTypeErrorLocation) {
     const returnType = getTypeFromTypeNode(returnTypeNode);
     if (languageVersion >= 2 /* ES2015 */) {
       if (isErrorType(returnType)) {
@@ -76079,7 +76116,7 @@ function createTypeChecker(host) {
         true
       );
       if (globalPromiseType !== emptyGenericType && !isReferenceToType(returnType, globalPromiseType)) {
-        error(returnTypeNode, Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_write_Promise_0, typeToString(getAwaitedTypeNoAlias(returnType) || voidType));
+        reportErrorForInvalidReturnType(Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_write_Promise_0, returnTypeNode, returnTypeErrorLocation, typeToString(getAwaitedTypeNoAlias(returnType) || voidType));
         return;
       }
     } else {
@@ -76089,7 +76126,7 @@ function createTypeChecker(host) {
       }
       const promiseConstructorName = getEntityNameFromTypeNode(returnTypeNode);
       if (promiseConstructorName === void 0) {
-        error(returnTypeNode, Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, typeToString(returnType));
+        reportErrorForInvalidReturnType(Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, returnTypeNode, returnTypeErrorLocation, typeToString(returnType));
         return;
       }
       const promiseConstructorSymbol = resolveEntityName(
@@ -76104,9 +76141,9 @@ function createTypeChecker(host) {
           /*reportErrors*/
           false
         )) {
-          error(returnTypeNode, Diagnostics.An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option);
+          error(returnTypeErrorLocation, Diagnostics.An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option);
         } else {
-          error(returnTypeNode, Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, entityNameToString(promiseConstructorName));
+          reportErrorForInvalidReturnType(Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, returnTypeNode, returnTypeErrorLocation, entityNameToString(promiseConstructorName));
         }
         return;
       }
@@ -76115,15 +76152,16 @@ function createTypeChecker(host) {
         true
       );
       if (globalPromiseConstructorLikeType === emptyObjectType) {
-        error(returnTypeNode, Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, entityNameToString(promiseConstructorName));
+        reportErrorForInvalidReturnType(Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, returnTypeNode, returnTypeErrorLocation, entityNameToString(promiseConstructorName));
         return;
       }
-      if (!checkTypeAssignableTo(
-        promiseConstructorType,
-        globalPromiseConstructorLikeType,
-        returnTypeNode,
-        Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value
-      )) {
+      const headMessage = Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value;
+      const errorInfo = () => returnTypeNode === returnTypeErrorLocation ? void 0 : chainDiagnosticMessages(
+        /*details*/
+        void 0,
+        Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type
+      );
+      if (!checkTypeAssignableTo(promiseConstructorType, globalPromiseConstructorLikeType, returnTypeErrorLocation, headMessage, errorInfo)) {
         return;
       }
       const rootName = promiseConstructorName && getFirstIdentifier(promiseConstructorName);
@@ -76145,6 +76183,14 @@ function createTypeChecker(host) {
       node,
       Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member
     );
+    function reportErrorForInvalidReturnType(message, returnTypeNode2, returnTypeErrorLocation2, typeName) {
+      if (returnTypeNode2 === returnTypeErrorLocation2) {
+        error(returnTypeErrorLocation2, message, typeName);
+      } else {
+        const diag2 = error(returnTypeErrorLocation2, Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
+        addRelatedInfo(diag2, createDiagnosticForNode(returnTypeNode2, message, typeName));
+      }
+    }
   }
   function checkDecorator(node) {
     const signature = getResolvedSignature(node);
@@ -122048,7 +122094,6 @@ function createWatchProgram(host) {
     if (hasChangedCompilerOptions) {
       newLine = updateNewLine();
       if (program && changesAffectModuleResolution(program.getCompilerOptions(), compilerOptions)) {
-        debugger;
         resolutionCache.onChangesAffectModuleResolution();
       }
     }

package/lib/tsserver.js

@@ -2329,7 +2329,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230724`;
+var version = `${versionMajorMinor}.0-dev.20230726`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -9287,6 +9287,7 @@ var Diagnostics = {
   Type_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method: diag(1062, 1 /* Error */, "Type_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method_1062", "Type is referenced directly or indirectly in the fulfillment callback of its own 'then' method."),
   An_export_assignment_cannot_be_used_in_a_namespace: diag(1063, 1 /* Error */, "An_export_assignment_cannot_be_used_in_a_namespace_1063", "An export assignment cannot be used in a namespace."),
   The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_write_Promise_0: diag(1064, 1 /* Error */, "The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_wri_1064", "The return type of an async function or method must be the global Promise<T> type. Did you mean to write 'Promise<{0}>'?"),
+  The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type: diag(1065, 1 /* Error */, "The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_1065", "The return type of an async function or method must be the global Promise<T> type."),
   In_ambient_enum_declarations_member_initializer_must_be_constant_expression: diag(1066, 1 /* Error */, "In_ambient_enum_declarations_member_initializer_must_be_constant_expression_1066", "In ambient enum declarations member initializer must be constant expression."),
   Unexpected_token_A_constructor_method_accessor_or_property_was_expected: diag(1068, 1 /* Error */, "Unexpected_token_A_constructor_method_accessor_or_property_was_expected_1068", "Unexpected token. A constructor, method, accessor, or property was expected."),
   Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces: diag(1069, 1 /* Error */, "Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces_1069", "Unexpected token. A type parameter name was expected without curly braces."),
@@ -43891,6 +43892,9 @@ function getModuleInstanceStateForAliasTarget(specifier, visited) {
           if (found === 1 /* Instantiated */) {
             return found;
           }
+          if (statement.kind === 271 /* ImportEqualsDeclaration */) {
+            found = 1 /* Instantiated */;
+          }
         }
       }
       if (found !== void 0) {
@@ -50896,7 +50900,7 @@ function createTypeChecker(host) {
     return isStringLiteralLike(moduleReferenceExpression) ? resolveExternalModule(location, moduleReferenceExpression.text, moduleNotFoundError, moduleReferenceExpression, isForAugmentation) : void 0;
   }
   function resolveExternalModule(location, moduleReference, moduleNotFoundError, errorNode, isForAugmentation = false) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     if (startsWith(moduleReference, "@types/")) {
       const diag2 = Diagnostics.Cannot_import_type_declaration_files_Consider_importing_0_instead_of_1;
       const withoutAtTypePrefix = removePrefix(moduleReference, "@types/");
@@ -50931,8 +50935,11 @@ function createTypeChecker(host) {
           );
         }
       } else if (resolvedModule.resolvedUsingTsExtension && !shouldAllowImportingTsExtension(compilerOptions, currentSourceFile.fileName)) {
-        const tsExtension = Debug.checkDefined(tryExtractTSExtension(moduleReference));
-        error2(errorNode, Diagnostics.An_import_path_can_only_end_with_a_0_extension_when_allowImportingTsExtensions_is_enabled, tsExtension);
+        const importOrExport = ((_h = findAncestor(location, isImportDeclaration)) == null ? void 0 : _h.importClause) || findAncestor(location, or(isImportEqualsDeclaration, isExportDeclaration));
+        if (!((importOrExport == null ? void 0 : importOrExport.isTypeOnly) || findAncestor(location, isImportTypeNode))) {
+          const tsExtension = Debug.checkDefined(tryExtractTSExtension(moduleReference));
+          error2(errorNode, Diagnostics.An_import_path_can_only_end_with_a_0_extension_when_allowImportingTsExtensions_is_enabled, tsExtension);
+        }
       }
       if (sourceFile.symbol) {
         if (resolvedModule.isExternalLibraryImport && !resolutionExtensionIsTSOrJson(resolvedModule.extension)) {
@@ -50949,7 +50956,7 @@ function createTypeChecker(host) {
         if (moduleResolutionKind === 3 /* Node16 */ || moduleResolutionKind === 99 /* NodeNext */) {
           const isSyncImport = currentSourceFile.impliedNodeFormat === 1 /* CommonJS */ && !findAncestor(location, isImportCall) || !!findAncestor(location, isImportEqualsDeclaration);
           const overrideClauseHost = findAncestor(location, (l) => isImportTypeNode(l) || isExportDeclaration(l) || isImportDeclaration(l));
-          const overrideClause = overrideClauseHost && isImportTypeNode(overrideClauseHost) ? (_h = overrideClauseHost.assertions) == null ? void 0 : _h.assertClause : overrideClauseHost == null ? void 0 : overrideClauseHost.assertClause;
+          const overrideClause = overrideClauseHost && isImportTypeNode(overrideClauseHost) ? (_i = overrideClauseHost.assertions) == null ? void 0 : _i.assertClause : overrideClauseHost == null ? void 0 : overrideClauseHost.assertClause;
           if (isSyncImport && sourceFile.impliedNodeFormat === 99 /* ESNext */ && !getResolutionModeOverrideForClause(overrideClause)) {
             if (findAncestor(location, isImportEqualsDeclaration)) {
               error2(errorNode, Diagnostics.Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_cannot_be_imported_with_require_Use_an_ECMAScript_import_instead, moduleReference);
@@ -51052,7 +51059,7 @@ function createTypeChecker(host) {
           error2(errorNode, Diagnostics.Cannot_find_module_0_Consider_using_resolveJsonModule_to_import_module_with_json_extension, moduleReference);
         } else if (mode === 99 /* ESNext */ && resolutionIsNode16OrNext && isExtensionlessRelativePathImport) {
           const absoluteRef = getNormalizedAbsolutePath(moduleReference, getDirectoryPath(currentSourceFile.path));
-          const suggestedExt = (_i = suggestedExtensions.find(([actualExt, _importExt]) => host.fileExists(absoluteRef + actualExt))) == null ? void 0 : _i[1];
+          const suggestedExt = (_j = suggestedExtensions.find(([actualExt, _importExt]) => host.fileExists(absoluteRef + actualExt))) == null ? void 0 : _j[1];
           if (suggestedExt) {
             error2(
               errorNode,
@@ -52488,11 +52495,13 @@ function createTypeChecker(host) {
         return !!type2.target && isMappedTypeHomomorphic(type2.target) && !isMappedTypeHomomorphic(type2);
       }
       function createMappedTypeNodeFromType(type2) {
+        var _a2;
         Debug.assert(!!(type2.flags & 524288 /* Object */));
         const readonlyToken = type2.declaration.readonlyToken ? factory.createToken(type2.declaration.readonlyToken.kind) : void 0;
         const questionToken = type2.declaration.questionToken ? factory.createToken(type2.declaration.questionToken.kind) : void 0;
         let appropriateConstraintTypeNode;
         let newTypeVariable;
+        const needsModifierPreservingWrapper = !isMappedTypeWithKeyofConstraintDeclaration(type2) && !(getModifiersTypeFromMappedType(type2).flags & 2 /* Unknown */) && context.flags & 4 /* GenerateNamesForShadowedTypeParams */ && !(getConstraintTypeFromMappedType(type2).flags & 262144 /* TypeParameter */ && ((_a2 = getConstraintOfTypeParameter(getConstraintTypeFromMappedType(type2))) == null ? void 0 : _a2.flags) & 4194304 /* Index */);
         if (isMappedTypeWithKeyofConstraintDeclaration(type2)) {
           if (isHomomorphicMappedTypeWithNonHomomorphicInstantiation(type2) && context.flags & 4 /* GenerateNamesForShadowedTypeParams */) {
             const newParam = createTypeParameter(createSymbol(262144 /* TypeParameter */, "T"));
@@ -52500,6 +52509,11 @@ function createTypeChecker(host) {
             newTypeVariable = factory.createTypeReferenceNode(name);
           }
           appropriateConstraintTypeNode = factory.createTypeOperatorNode(143 /* KeyOfKeyword */, newTypeVariable || typeToTypeNodeHelper(getModifiersTypeFromMappedType(type2), context));
+        } else if (needsModifierPreservingWrapper) {
+          const newParam = createTypeParameter(createSymbol(262144 /* TypeParameter */, "T"));
+          const name = typeParameterToName(newParam, context);
+          newTypeVariable = factory.createTypeReferenceNode(name);
+          appropriateConstraintTypeNode = newTypeVariable;
         } else {
           appropriateConstraintTypeNode = typeToTypeNodeHelper(getConstraintTypeFromMappedType(type2), context);
         }
@@ -52530,6 +52544,18 @@ function createTypeChecker(host) {
             result,
             factory.createKeywordTypeNode(146 /* NeverKeyword */)
           );
+        } else if (needsModifierPreservingWrapper) {
+          return factory.createConditionalTypeNode(
+            typeToTypeNodeHelper(getConstraintTypeFromMappedType(type2), context),
+            factory.createInferTypeNode(factory.createTypeParameterDeclaration(
+              /*modifiers*/
+              void 0,
+              factory.cloneNode(newTypeVariable.typeName),
+              factory.createTypeOperatorNode(143 /* KeyOfKeyword */, typeToTypeNodeHelper(getModifiersTypeFromMappedType(type2), context))
+            )),
+            result,
+            factory.createKeywordTypeNode(146 /* NeverKeyword */)
+          );
         }
         return result;
       }
@@ -79670,7 +79696,18 @@ function createTypeChecker(host) {
     addLazyDiagnostic(checkSignatureDeclarationDiagnostics);
     function checkSignatureDeclarationDiagnostics() {
       checkCollisionWithArgumentsInGeneratedCode(node);
-      const returnTypeNode = getEffectiveReturnTypeNode(node);
+      let returnTypeNode = getEffectiveReturnTypeNode(node);
+      let returnTypeErrorLocation = returnTypeNode;
+      if (isInJSFile(node)) {
+        const typeTag = getJSDocTypeTag(node);
+        if (typeTag && typeTag.typeExpression && isTypeReferenceNode(typeTag.typeExpression.type)) {
+          const signature = getSingleCallSignature(getTypeFromTypeNode(typeTag.typeExpression));
+          if (signature && signature.declaration) {
+            returnTypeNode = getEffectiveReturnTypeNode(signature.declaration);
+            returnTypeErrorLocation = typeTag.typeExpression.type;
+          }
+        }
+      }
       if (noImplicitAny && !returnTypeNode) {
         switch (node.kind) {
           case 180 /* ConstructSignature */:
@@ -79681,21 +79718,21 @@ function createTypeChecker(host) {
             break;
         }
       }
-      if (returnTypeNode) {
+      if (returnTypeNode && returnTypeErrorLocation) {
         const functionFlags2 = getFunctionFlags(node);
         if ((functionFlags2 & (4 /* Invalid */ | 1 /* Generator */)) === 1 /* Generator */) {
           const returnType = getTypeFromTypeNode(returnTypeNode);
           if (returnType === voidType) {
-            error2(returnTypeNode, Diagnostics.A_generator_cannot_have_a_void_type_annotation);
+            error2(returnTypeErrorLocation, Diagnostics.A_generator_cannot_have_a_void_type_annotation);
           } else {
             const generatorYieldType = getIterationTypeOfGeneratorFunctionReturnType(0 /* Yield */, returnType, (functionFlags2 & 2 /* Async */) !== 0) || anyType;
             const generatorReturnType = getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, returnType, (functionFlags2 & 2 /* Async */) !== 0) || generatorYieldType;
             const generatorNextType = getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, returnType, (functionFlags2 & 2 /* Async */) !== 0) || unknownType;
             const generatorInstantiation = createGeneratorReturnType(generatorYieldType, generatorReturnType, generatorNextType, !!(functionFlags2 & 2 /* Async */));
-            checkTypeAssignableTo(generatorInstantiation, returnType, returnTypeNode);
+            checkTypeAssignableTo(generatorInstantiation, returnType, returnTypeErrorLocation);
           }
         } else if ((functionFlags2 & 3 /* AsyncGenerator */) === 2 /* Async */) {
-          checkAsyncFunctionReturnType(node, returnTypeNode);
+          checkAsyncFunctionReturnType(node, returnTypeNode, returnTypeErrorLocation);
         }
       }
       if (node.kind !== 181 /* IndexSignature */ && node.kind !== 324 /* JSDocFunctionType */) {
@@ -80777,7 +80814,7 @@ function createTypeChecker(host) {
     }
     return typeAsAwaitable.awaitedTypeOfType = type;
   }
-  function checkAsyncFunctionReturnType(node, returnTypeNode) {
+  function checkAsyncFunctionReturnType(node, returnTypeNode, returnTypeErrorLocation) {
     const returnType = getTypeFromTypeNode(returnTypeNode);
     if (languageVersion >= 2 /* ES2015 */) {
       if (isErrorType(returnType)) {
@@ -80788,7 +80825,7 @@ function createTypeChecker(host) {
         true
       );
       if (globalPromiseType !== emptyGenericType && !isReferenceToType2(returnType, globalPromiseType)) {
-        error2(returnTypeNode, Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_write_Promise_0, typeToString(getAwaitedTypeNoAlias(returnType) || voidType));
+        reportErrorForInvalidReturnType(Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_write_Promise_0, returnTypeNode, returnTypeErrorLocation, typeToString(getAwaitedTypeNoAlias(returnType) || voidType));
         return;
       }
     } else {
@@ -80798,7 +80835,7 @@ function createTypeChecker(host) {
       }
       const promiseConstructorName = getEntityNameFromTypeNode(returnTypeNode);
       if (promiseConstructorName === void 0) {
-        error2(returnTypeNode, Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, typeToString(returnType));
+        reportErrorForInvalidReturnType(Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, returnTypeNode, returnTypeErrorLocation, typeToString(returnType));
         return;
       }
       const promiseConstructorSymbol = resolveEntityName(
@@ -80813,9 +80850,9 @@ function createTypeChecker(host) {
           /*reportErrors*/
           false
         )) {
-          error2(returnTypeNode, Diagnostics.An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option);
+          error2(returnTypeErrorLocation, Diagnostics.An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option);
         } else {
-          error2(returnTypeNode, Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, entityNameToString(promiseConstructorName));
+          reportErrorForInvalidReturnType(Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, returnTypeNode, returnTypeErrorLocation, entityNameToString(promiseConstructorName));
         }
         return;
       }
@@ -80824,15 +80861,16 @@ function createTypeChecker(host) {
         true
       );
       if (globalPromiseConstructorLikeType === emptyObjectType) {
-        error2(returnTypeNode, Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, entityNameToString(promiseConstructorName));
+        reportErrorForInvalidReturnType(Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, returnTypeNode, returnTypeErrorLocation, entityNameToString(promiseConstructorName));
         return;
       }
-      if (!checkTypeAssignableTo(
-        promiseConstructorType,
-        globalPromiseConstructorLikeType,
-        returnTypeNode,
-        Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value
-      )) {
+      const headMessage = Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value;
+      const errorInfo = () => returnTypeNode === returnTypeErrorLocation ? void 0 : chainDiagnosticMessages(
+        /*details*/
+        void 0,
+        Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type
+      );
+      if (!checkTypeAssignableTo(promiseConstructorType, globalPromiseConstructorLikeType, returnTypeErrorLocation, headMessage, errorInfo)) {
         return;
       }
       const rootName = promiseConstructorName && getFirstIdentifier(promiseConstructorName);
@@ -80854,6 +80892,14 @@ function createTypeChecker(host) {
       node,
       Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member
     );
+    function reportErrorForInvalidReturnType(message, returnTypeNode2, returnTypeErrorLocation2, typeName) {
+      if (returnTypeNode2 === returnTypeErrorLocation2) {
+        error2(returnTypeErrorLocation2, message, typeName);
+      } else {
+        const diag2 = error2(returnTypeErrorLocation2, Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
+        addRelatedInfo(diag2, createDiagnosticForNode(returnTypeNode2, message, typeName));
+      }
+    }
   }
   function checkDecorator(node) {
     const signature = getResolvedSignature(node);
@@ -127053,7 +127099,6 @@ function createWatchProgram(host) {
     if (hasChangedCompilerOptions) {
       newLine = updateNewLine();
       if (program && changesAffectModuleResolution(program.getCompilerOptions(), compilerOptions)) {
-        debugger;
         resolutionCache.onChangesAffectModuleResolution();
       }
     }
@@ -150891,6 +150936,14 @@ function promoteFromTypeOnly(changes, aliasDeclaration, compilerOptions, sourceF
   }
   function promoteImportClause(importClause) {
     changes.delete(sourceFile, getTypeKeywordOfTypeOnlyImport(importClause, sourceFile));
+    if (!compilerOptions.allowImportingTsExtensions) {
+      const moduleSpecifier = tryGetModuleSpecifierFromDeclaration(importClause.parent);
+      const resolvedModule = moduleSpecifier && getResolvedModule(sourceFile, moduleSpecifier.text, getModeForUsageLocation(sourceFile, moduleSpecifier));
+      if (resolvedModule == null ? void 0 : resolvedModule.resolvedUsingTsExtension) {
+        const changedExtension = changeAnyExtension(moduleSpecifier.text, getOutputExtension(moduleSpecifier.text, compilerOptions));
+        changes.replaceNode(sourceFile, moduleSpecifier, factory.createStringLiteral(changedExtension));
+      }
+    }
     if (convertExistingToTypeOnly) {
       const namedImports = tryCast(importClause.namedBindings, isNamedImports);
       if (namedImports && namedImports.elements.length > 1) {

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-dev.20230724`;
+      version = `${versionMajorMinor}.0-dev.20230726`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -7068,6 +7068,7 @@ ${lanes.join("\n")}
         Type_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method: diag(1062, 1 /* Error */, "Type_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method_1062", "Type is referenced directly or indirectly in the fulfillment callback of its own 'then' method."),
         An_export_assignment_cannot_be_used_in_a_namespace: diag(1063, 1 /* Error */, "An_export_assignment_cannot_be_used_in_a_namespace_1063", "An export assignment cannot be used in a namespace."),
         The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_write_Promise_0: diag(1064, 1 /* Error */, "The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_wri_1064", "The return type of an async function or method must be the global Promise<T> type. Did you mean to write 'Promise<{0}>'?"),
+        The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type: diag(1065, 1 /* Error */, "The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_1065", "The return type of an async function or method must be the global Promise<T> type."),
         In_ambient_enum_declarations_member_initializer_must_be_constant_expression: diag(1066, 1 /* Error */, "In_ambient_enum_declarations_member_initializer_must_be_constant_expression_1066", "In ambient enum declarations member initializer must be constant expression."),
         Unexpected_token_A_constructor_method_accessor_or_property_was_expected: diag(1068, 1 /* Error */, "Unexpected_token_A_constructor_method_accessor_or_property_was_expected_1068", "Unexpected token. A constructor, method, accessor, or property was expected."),
         Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces: diag(1069, 1 /* Error */, "Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces_1069", "Unexpected token. A type parameter name was expected without curly braces."),
@@ -41750,6 +41751,9 @@ ${lanes.join("\n")}
             if (found === 1 /* Instantiated */) {
               return found;
             }
+            if (statement.kind === 271 /* ImportEqualsDeclaration */) {
+              found = 1 /* Instantiated */;
+            }
           }
         }
         if (found !== void 0) {
@@ -48661,7 +48665,7 @@ ${lanes.join("\n")}
       return isStringLiteralLike(moduleReferenceExpression) ? resolveExternalModule(location, moduleReferenceExpression.text, moduleNotFoundError, moduleReferenceExpression, isForAugmentation) : void 0;
     }
     function resolveExternalModule(location, moduleReference, moduleNotFoundError, errorNode, isForAugmentation = false) {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
       if (startsWith(moduleReference, "@types/")) {
         const diag2 = Diagnostics.Cannot_import_type_declaration_files_Consider_importing_0_instead_of_1;
         const withoutAtTypePrefix = removePrefix(moduleReference, "@types/");
@@ -48696,8 +48700,11 @@ ${lanes.join("\n")}
             );
           }
         } else if (resolvedModule.resolvedUsingTsExtension && !shouldAllowImportingTsExtension(compilerOptions, currentSourceFile.fileName)) {
-          const tsExtension = Debug.checkDefined(tryExtractTSExtension(moduleReference));
-          error2(errorNode, Diagnostics.An_import_path_can_only_end_with_a_0_extension_when_allowImportingTsExtensions_is_enabled, tsExtension);
+          const importOrExport = ((_h = findAncestor(location, isImportDeclaration)) == null ? void 0 : _h.importClause) || findAncestor(location, or(isImportEqualsDeclaration, isExportDeclaration));
+          if (!((importOrExport == null ? void 0 : importOrExport.isTypeOnly) || findAncestor(location, isImportTypeNode))) {
+            const tsExtension = Debug.checkDefined(tryExtractTSExtension(moduleReference));
+            error2(errorNode, Diagnostics.An_import_path_can_only_end_with_a_0_extension_when_allowImportingTsExtensions_is_enabled, tsExtension);
+          }
         }
         if (sourceFile.symbol) {
           if (resolvedModule.isExternalLibraryImport && !resolutionExtensionIsTSOrJson(resolvedModule.extension)) {
@@ -48714,7 +48721,7 @@ ${lanes.join("\n")}
           if (moduleResolutionKind === 3 /* Node16 */ || moduleResolutionKind === 99 /* NodeNext */) {
             const isSyncImport = currentSourceFile.impliedNodeFormat === 1 /* CommonJS */ && !findAncestor(location, isImportCall) || !!findAncestor(location, isImportEqualsDeclaration);
             const overrideClauseHost = findAncestor(location, (l) => isImportTypeNode(l) || isExportDeclaration(l) || isImportDeclaration(l));
-            const overrideClause = overrideClauseHost && isImportTypeNode(overrideClauseHost) ? (_h = overrideClauseHost.assertions) == null ? void 0 : _h.assertClause : overrideClauseHost == null ? void 0 : overrideClauseHost.assertClause;
+            const overrideClause = overrideClauseHost && isImportTypeNode(overrideClauseHost) ? (_i = overrideClauseHost.assertions) == null ? void 0 : _i.assertClause : overrideClauseHost == null ? void 0 : overrideClauseHost.assertClause;
             if (isSyncImport && sourceFile.impliedNodeFormat === 99 /* ESNext */ && !getResolutionModeOverrideForClause(overrideClause)) {
               if (findAncestor(location, isImportEqualsDeclaration)) {
                 error2(errorNode, Diagnostics.Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_cannot_be_imported_with_require_Use_an_ECMAScript_import_instead, moduleReference);
@@ -48817,7 +48824,7 @@ ${lanes.join("\n")}
             error2(errorNode, Diagnostics.Cannot_find_module_0_Consider_using_resolveJsonModule_to_import_module_with_json_extension, moduleReference);
           } else if (mode === 99 /* ESNext */ && resolutionIsNode16OrNext && isExtensionlessRelativePathImport) {
             const absoluteRef = getNormalizedAbsolutePath(moduleReference, getDirectoryPath(currentSourceFile.path));
-            const suggestedExt = (_i = suggestedExtensions.find(([actualExt, _importExt]) => host.fileExists(absoluteRef + actualExt))) == null ? void 0 : _i[1];
+            const suggestedExt = (_j = suggestedExtensions.find(([actualExt, _importExt]) => host.fileExists(absoluteRef + actualExt))) == null ? void 0 : _j[1];
             if (suggestedExt) {
               error2(
                 errorNode,
@@ -50253,11 +50260,13 @@ ${lanes.join("\n")}
           return !!type2.target && isMappedTypeHomomorphic(type2.target) && !isMappedTypeHomomorphic(type2);
         }
         function createMappedTypeNodeFromType(type2) {
+          var _a2;
           Debug.assert(!!(type2.flags & 524288 /* Object */));
           const readonlyToken = type2.declaration.readonlyToken ? factory.createToken(type2.declaration.readonlyToken.kind) : void 0;
           const questionToken = type2.declaration.questionToken ? factory.createToken(type2.declaration.questionToken.kind) : void 0;
           let appropriateConstraintTypeNode;
           let newTypeVariable;
+          const needsModifierPreservingWrapper = !isMappedTypeWithKeyofConstraintDeclaration(type2) && !(getModifiersTypeFromMappedType(type2).flags & 2 /* Unknown */) && context.flags & 4 /* GenerateNamesForShadowedTypeParams */ && !(getConstraintTypeFromMappedType(type2).flags & 262144 /* TypeParameter */ && ((_a2 = getConstraintOfTypeParameter(getConstraintTypeFromMappedType(type2))) == null ? void 0 : _a2.flags) & 4194304 /* Index */);
           if (isMappedTypeWithKeyofConstraintDeclaration(type2)) {
             if (isHomomorphicMappedTypeWithNonHomomorphicInstantiation(type2) && context.flags & 4 /* GenerateNamesForShadowedTypeParams */) {
               const newParam = createTypeParameter(createSymbol(262144 /* TypeParameter */, "T"));
@@ -50265,6 +50274,11 @@ ${lanes.join("\n")}
               newTypeVariable = factory.createTypeReferenceNode(name);
             }
             appropriateConstraintTypeNode = factory.createTypeOperatorNode(143 /* KeyOfKeyword */, newTypeVariable || typeToTypeNodeHelper(getModifiersTypeFromMappedType(type2), context));
+          } else if (needsModifierPreservingWrapper) {
+            const newParam = createTypeParameter(createSymbol(262144 /* TypeParameter */, "T"));
+            const name = typeParameterToName(newParam, context);
+            newTypeVariable = factory.createTypeReferenceNode(name);
+            appropriateConstraintTypeNode = newTypeVariable;
           } else {
             appropriateConstraintTypeNode = typeToTypeNodeHelper(getConstraintTypeFromMappedType(type2), context);
           }
@@ -50295,6 +50309,18 @@ ${lanes.join("\n")}
               result,
               factory.createKeywordTypeNode(146 /* NeverKeyword */)
             );
+          } else if (needsModifierPreservingWrapper) {
+            return factory.createConditionalTypeNode(
+              typeToTypeNodeHelper(getConstraintTypeFromMappedType(type2), context),
+              factory.createInferTypeNode(factory.createTypeParameterDeclaration(
+                /*modifiers*/
+                void 0,
+                factory.cloneNode(newTypeVariable.typeName),
+                factory.createTypeOperatorNode(143 /* KeyOfKeyword */, typeToTypeNodeHelper(getModifiersTypeFromMappedType(type2), context))
+              )),
+              result,
+              factory.createKeywordTypeNode(146 /* NeverKeyword */)
+            );
           }
           return result;
         }
@@ -77435,7 +77461,18 @@ ${lanes.join("\n")}
       addLazyDiagnostic(checkSignatureDeclarationDiagnostics);
       function checkSignatureDeclarationDiagnostics() {
         checkCollisionWithArgumentsInGeneratedCode(node);
-        const returnTypeNode = getEffectiveReturnTypeNode(node);
+        let returnTypeNode = getEffectiveReturnTypeNode(node);
+        let returnTypeErrorLocation = returnTypeNode;
+        if (isInJSFile(node)) {
+          const typeTag = getJSDocTypeTag(node);
+          if (typeTag && typeTag.typeExpression && isTypeReferenceNode(typeTag.typeExpression.type)) {
+            const signature = getSingleCallSignature(getTypeFromTypeNode(typeTag.typeExpression));
+            if (signature && signature.declaration) {
+              returnTypeNode = getEffectiveReturnTypeNode(signature.declaration);
+              returnTypeErrorLocation = typeTag.typeExpression.type;
+            }
+          }
+        }
         if (noImplicitAny && !returnTypeNode) {
           switch (node.kind) {
             case 180 /* ConstructSignature */:
@@ -77446,21 +77483,21 @@ ${lanes.join("\n")}
               break;
           }
         }
-        if (returnTypeNode) {
+        if (returnTypeNode && returnTypeErrorLocation) {
           const functionFlags2 = getFunctionFlags(node);
           if ((functionFlags2 & (4 /* Invalid */ | 1 /* Generator */)) === 1 /* Generator */) {
             const returnType = getTypeFromTypeNode(returnTypeNode);
             if (returnType === voidType) {
-              error2(returnTypeNode, Diagnostics.A_generator_cannot_have_a_void_type_annotation);
+              error2(returnTypeErrorLocation, Diagnostics.A_generator_cannot_have_a_void_type_annotation);
             } else {
               const generatorYieldType = getIterationTypeOfGeneratorFunctionReturnType(0 /* Yield */, returnType, (functionFlags2 & 2 /* Async */) !== 0) || anyType;
               const generatorReturnType = getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, returnType, (functionFlags2 & 2 /* Async */) !== 0) || generatorYieldType;
               const generatorNextType = getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, returnType, (functionFlags2 & 2 /* Async */) !== 0) || unknownType;
               const generatorInstantiation = createGeneratorReturnType(generatorYieldType, generatorReturnType, generatorNextType, !!(functionFlags2 & 2 /* Async */));
-              checkTypeAssignableTo(generatorInstantiation, returnType, returnTypeNode);
+              checkTypeAssignableTo(generatorInstantiation, returnType, returnTypeErrorLocation);
             }
           } else if ((functionFlags2 & 3 /* AsyncGenerator */) === 2 /* Async */) {
-            checkAsyncFunctionReturnType(node, returnTypeNode);
+            checkAsyncFunctionReturnType(node, returnTypeNode, returnTypeErrorLocation);
           }
         }
         if (node.kind !== 181 /* IndexSignature */ && node.kind !== 324 /* JSDocFunctionType */) {
@@ -78542,7 +78579,7 @@ ${lanes.join("\n")}
       }
       return typeAsAwaitable.awaitedTypeOfType = type;
     }
-    function checkAsyncFunctionReturnType(node, returnTypeNode) {
+    function checkAsyncFunctionReturnType(node, returnTypeNode, returnTypeErrorLocation) {
       const returnType = getTypeFromTypeNode(returnTypeNode);
       if (languageVersion >= 2 /* ES2015 */) {
         if (isErrorType(returnType)) {
@@ -78553,7 +78590,7 @@ ${lanes.join("\n")}
           true
         );
         if (globalPromiseType !== emptyGenericType && !isReferenceToType2(returnType, globalPromiseType)) {
-          error2(returnTypeNode, Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_write_Promise_0, typeToString(getAwaitedTypeNoAlias(returnType) || voidType));
+          reportErrorForInvalidReturnType(Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_write_Promise_0, returnTypeNode, returnTypeErrorLocation, typeToString(getAwaitedTypeNoAlias(returnType) || voidType));
           return;
         }
       } else {
@@ -78563,7 +78600,7 @@ ${lanes.join("\n")}
         }
         const promiseConstructorName = getEntityNameFromTypeNode(returnTypeNode);
         if (promiseConstructorName === void 0) {
-          error2(returnTypeNode, Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, typeToString(returnType));
+          reportErrorForInvalidReturnType(Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, returnTypeNode, returnTypeErrorLocation, typeToString(returnType));
           return;
         }
         const promiseConstructorSymbol = resolveEntityName(
@@ -78578,9 +78615,9 @@ ${lanes.join("\n")}
             /*reportErrors*/
             false
           )) {
-            error2(returnTypeNode, Diagnostics.An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option);
+            error2(returnTypeErrorLocation, Diagnostics.An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option);
           } else {
-            error2(returnTypeNode, Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, entityNameToString(promiseConstructorName));
+            reportErrorForInvalidReturnType(Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, returnTypeNode, returnTypeErrorLocation, entityNameToString(promiseConstructorName));
           }
           return;
         }
@@ -78589,15 +78626,16 @@ ${lanes.join("\n")}
           true
         );
         if (globalPromiseConstructorLikeType === emptyObjectType) {
-          error2(returnTypeNode, Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, entityNameToString(promiseConstructorName));
+          reportErrorForInvalidReturnType(Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, returnTypeNode, returnTypeErrorLocation, entityNameToString(promiseConstructorName));
           return;
         }
-        if (!checkTypeAssignableTo(
-          promiseConstructorType,
-          globalPromiseConstructorLikeType,
-          returnTypeNode,
-          Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value
-        )) {
+        const headMessage = Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value;
+        const errorInfo = () => returnTypeNode === returnTypeErrorLocation ? void 0 : chainDiagnosticMessages(
+          /*details*/
+          void 0,
+          Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type
+        );
+        if (!checkTypeAssignableTo(promiseConstructorType, globalPromiseConstructorLikeType, returnTypeErrorLocation, headMessage, errorInfo)) {
           return;
         }
         const rootName = promiseConstructorName && getFirstIdentifier(promiseConstructorName);
@@ -78619,6 +78657,14 @@ ${lanes.join("\n")}
         node,
         Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member
       );
+      function reportErrorForInvalidReturnType(message, returnTypeNode2, returnTypeErrorLocation2, typeName) {
+        if (returnTypeNode2 === returnTypeErrorLocation2) {
+          error2(returnTypeErrorLocation2, message, typeName);
+        } else {
+          const diag2 = error2(returnTypeErrorLocation2, Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
+          addRelatedInfo(diag2, createDiagnosticForNode(returnTypeNode2, message, typeName));
+        }
+      }
     }
     function checkDecorator(node) {
       const signature = getResolvedSignature(node);
@@ -125208,7 +125254,6 @@ ${lanes.join("\n")}
       if (hasChangedCompilerOptions) {
         newLine = updateNewLine();
         if (program && changesAffectModuleResolution(program.getCompilerOptions(), compilerOptions)) {
-          debugger;
           resolutionCache.onChangesAffectModuleResolution();
         }
       }
@@ -149619,6 +149664,14 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
     function promoteImportClause(importClause) {
       changes.delete(sourceFile, getTypeKeywordOfTypeOnlyImport(importClause, sourceFile));
+      if (!compilerOptions.allowImportingTsExtensions) {
+        const moduleSpecifier = tryGetModuleSpecifierFromDeclaration(importClause.parent);
+        const resolvedModule = moduleSpecifier && getResolvedModule(sourceFile, moduleSpecifier.text, getModeForUsageLocation(sourceFile, moduleSpecifier));
+        if (resolvedModule == null ? void 0 : resolvedModule.resolvedUsingTsExtension) {
+          const changedExtension = changeAnyExtension(moduleSpecifier.text, getOutputExtension(moduleSpecifier.text, compilerOptions));
+          changes.replaceNode(sourceFile, moduleSpecifier, factory.createStringLiteral(changedExtension));
+        }
+      }
       if (convertExistingToTypeOnly) {
         const namedImports = tryCast(importClause.namedBindings, isNamedImports);
         if (namedImports && namedImports.elements.length > 1) {

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-dev.20230724`;
+      version = `${versionMajorMinor}.0-dev.20230726`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -7068,6 +7068,7 @@ ${lanes.join("\n")}
         Type_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method: diag(1062, 1 /* Error */, "Type_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method_1062", "Type is referenced directly or indirectly in the fulfillment callback of its own 'then' method."),
         An_export_assignment_cannot_be_used_in_a_namespace: diag(1063, 1 /* Error */, "An_export_assignment_cannot_be_used_in_a_namespace_1063", "An export assignment cannot be used in a namespace."),
         The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_write_Promise_0: diag(1064, 1 /* Error */, "The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_wri_1064", "The return type of an async function or method must be the global Promise<T> type. Did you mean to write 'Promise<{0}>'?"),
+        The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type: diag(1065, 1 /* Error */, "The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_1065", "The return type of an async function or method must be the global Promise<T> type."),
         In_ambient_enum_declarations_member_initializer_must_be_constant_expression: diag(1066, 1 /* Error */, "In_ambient_enum_declarations_member_initializer_must_be_constant_expression_1066", "In ambient enum declarations member initializer must be constant expression."),
         Unexpected_token_A_constructor_method_accessor_or_property_was_expected: diag(1068, 1 /* Error */, "Unexpected_token_A_constructor_method_accessor_or_property_was_expected_1068", "Unexpected token. A constructor, method, accessor, or property was expected."),
         Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces: diag(1069, 1 /* Error */, "Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces_1069", "Unexpected token. A type parameter name was expected without curly braces."),
@@ -41750,6 +41751,9 @@ ${lanes.join("\n")}
             if (found === 1 /* Instantiated */) {
               return found;
             }
+            if (statement.kind === 271 /* ImportEqualsDeclaration */) {
+              found = 1 /* Instantiated */;
+            }
           }
         }
         if (found !== void 0) {
@@ -48661,7 +48665,7 @@ ${lanes.join("\n")}
       return isStringLiteralLike(moduleReferenceExpression) ? resolveExternalModule(location, moduleReferenceExpression.text, moduleNotFoundError, moduleReferenceExpression, isForAugmentation) : void 0;
     }
     function resolveExternalModule(location, moduleReference, moduleNotFoundError, errorNode, isForAugmentation = false) {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
       if (startsWith(moduleReference, "@types/")) {
         const diag2 = Diagnostics.Cannot_import_type_declaration_files_Consider_importing_0_instead_of_1;
         const withoutAtTypePrefix = removePrefix(moduleReference, "@types/");
@@ -48696,8 +48700,11 @@ ${lanes.join("\n")}
             );
           }
         } else if (resolvedModule.resolvedUsingTsExtension && !shouldAllowImportingTsExtension(compilerOptions, currentSourceFile.fileName)) {
-          const tsExtension = Debug.checkDefined(tryExtractTSExtension(moduleReference));
-          error2(errorNode, Diagnostics.An_import_path_can_only_end_with_a_0_extension_when_allowImportingTsExtensions_is_enabled, tsExtension);
+          const importOrExport = ((_h = findAncestor(location, isImportDeclaration)) == null ? void 0 : _h.importClause) || findAncestor(location, or(isImportEqualsDeclaration, isExportDeclaration));
+          if (!((importOrExport == null ? void 0 : importOrExport.isTypeOnly) || findAncestor(location, isImportTypeNode))) {
+            const tsExtension = Debug.checkDefined(tryExtractTSExtension(moduleReference));
+            error2(errorNode, Diagnostics.An_import_path_can_only_end_with_a_0_extension_when_allowImportingTsExtensions_is_enabled, tsExtension);
+          }
         }
         if (sourceFile.symbol) {
           if (resolvedModule.isExternalLibraryImport && !resolutionExtensionIsTSOrJson(resolvedModule.extension)) {
@@ -48714,7 +48721,7 @@ ${lanes.join("\n")}
           if (moduleResolutionKind === 3 /* Node16 */ || moduleResolutionKind === 99 /* NodeNext */) {
             const isSyncImport = currentSourceFile.impliedNodeFormat === 1 /* CommonJS */ && !findAncestor(location, isImportCall) || !!findAncestor(location, isImportEqualsDeclaration);
             const overrideClauseHost = findAncestor(location, (l) => isImportTypeNode(l) || isExportDeclaration(l) || isImportDeclaration(l));
-            const overrideClause = overrideClauseHost && isImportTypeNode(overrideClauseHost) ? (_h = overrideClauseHost.assertions) == null ? void 0 : _h.assertClause : overrideClauseHost == null ? void 0 : overrideClauseHost.assertClause;
+            const overrideClause = overrideClauseHost && isImportTypeNode(overrideClauseHost) ? (_i = overrideClauseHost.assertions) == null ? void 0 : _i.assertClause : overrideClauseHost == null ? void 0 : overrideClauseHost.assertClause;
             if (isSyncImport && sourceFile.impliedNodeFormat === 99 /* ESNext */ && !getResolutionModeOverrideForClause(overrideClause)) {
               if (findAncestor(location, isImportEqualsDeclaration)) {
                 error2(errorNode, Diagnostics.Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_cannot_be_imported_with_require_Use_an_ECMAScript_import_instead, moduleReference);
@@ -48817,7 +48824,7 @@ ${lanes.join("\n")}
             error2(errorNode, Diagnostics.Cannot_find_module_0_Consider_using_resolveJsonModule_to_import_module_with_json_extension, moduleReference);
           } else if (mode === 99 /* ESNext */ && resolutionIsNode16OrNext && isExtensionlessRelativePathImport) {
             const absoluteRef = getNormalizedAbsolutePath(moduleReference, getDirectoryPath(currentSourceFile.path));
-            const suggestedExt = (_i = suggestedExtensions.find(([actualExt, _importExt]) => host.fileExists(absoluteRef + actualExt))) == null ? void 0 : _i[1];
+            const suggestedExt = (_j = suggestedExtensions.find(([actualExt, _importExt]) => host.fileExists(absoluteRef + actualExt))) == null ? void 0 : _j[1];
             if (suggestedExt) {
               error2(
                 errorNode,
@@ -50253,11 +50260,13 @@ ${lanes.join("\n")}
           return !!type2.target && isMappedTypeHomomorphic(type2.target) && !isMappedTypeHomomorphic(type2);
         }
         function createMappedTypeNodeFromType(type2) {
+          var _a2;
           Debug.assert(!!(type2.flags & 524288 /* Object */));
           const readonlyToken = type2.declaration.readonlyToken ? factory.createToken(type2.declaration.readonlyToken.kind) : void 0;
           const questionToken = type2.declaration.questionToken ? factory.createToken(type2.declaration.questionToken.kind) : void 0;
           let appropriateConstraintTypeNode;
           let newTypeVariable;
+          const needsModifierPreservingWrapper = !isMappedTypeWithKeyofConstraintDeclaration(type2) && !(getModifiersTypeFromMappedType(type2).flags & 2 /* Unknown */) && context.flags & 4 /* GenerateNamesForShadowedTypeParams */ && !(getConstraintTypeFromMappedType(type2).flags & 262144 /* TypeParameter */ && ((_a2 = getConstraintOfTypeParameter(getConstraintTypeFromMappedType(type2))) == null ? void 0 : _a2.flags) & 4194304 /* Index */);
           if (isMappedTypeWithKeyofConstraintDeclaration(type2)) {
             if (isHomomorphicMappedTypeWithNonHomomorphicInstantiation(type2) && context.flags & 4 /* GenerateNamesForShadowedTypeParams */) {
               const newParam = createTypeParameter(createSymbol(262144 /* TypeParameter */, "T"));
@@ -50265,6 +50274,11 @@ ${lanes.join("\n")}
               newTypeVariable = factory.createTypeReferenceNode(name);
             }
             appropriateConstraintTypeNode = factory.createTypeOperatorNode(143 /* KeyOfKeyword */, newTypeVariable || typeToTypeNodeHelper(getModifiersTypeFromMappedType(type2), context));
+          } else if (needsModifierPreservingWrapper) {
+            const newParam = createTypeParameter(createSymbol(262144 /* TypeParameter */, "T"));
+            const name = typeParameterToName(newParam, context);
+            newTypeVariable = factory.createTypeReferenceNode(name);
+            appropriateConstraintTypeNode = newTypeVariable;
           } else {
             appropriateConstraintTypeNode = typeToTypeNodeHelper(getConstraintTypeFromMappedType(type2), context);
           }
@@ -50295,6 +50309,18 @@ ${lanes.join("\n")}
               result,
               factory.createKeywordTypeNode(146 /* NeverKeyword */)
             );
+          } else if (needsModifierPreservingWrapper) {
+            return factory.createConditionalTypeNode(
+              typeToTypeNodeHelper(getConstraintTypeFromMappedType(type2), context),
+              factory.createInferTypeNode(factory.createTypeParameterDeclaration(
+                /*modifiers*/
+                void 0,
+                factory.cloneNode(newTypeVariable.typeName),
+                factory.createTypeOperatorNode(143 /* KeyOfKeyword */, typeToTypeNodeHelper(getModifiersTypeFromMappedType(type2), context))
+              )),
+              result,
+              factory.createKeywordTypeNode(146 /* NeverKeyword */)
+            );
           }
           return result;
         }
@@ -77435,7 +77461,18 @@ ${lanes.join("\n")}
       addLazyDiagnostic(checkSignatureDeclarationDiagnostics);
       function checkSignatureDeclarationDiagnostics() {
         checkCollisionWithArgumentsInGeneratedCode(node);
-        const returnTypeNode = getEffectiveReturnTypeNode(node);
+        let returnTypeNode = getEffectiveReturnTypeNode(node);
+        let returnTypeErrorLocation = returnTypeNode;
+        if (isInJSFile(node)) {
+          const typeTag = getJSDocTypeTag(node);
+          if (typeTag && typeTag.typeExpression && isTypeReferenceNode(typeTag.typeExpression.type)) {
+            const signature = getSingleCallSignature(getTypeFromTypeNode(typeTag.typeExpression));
+            if (signature && signature.declaration) {
+              returnTypeNode = getEffectiveReturnTypeNode(signature.declaration);
+              returnTypeErrorLocation = typeTag.typeExpression.type;
+            }
+          }
+        }
         if (noImplicitAny && !returnTypeNode) {
           switch (node.kind) {
             case 180 /* ConstructSignature */:
@@ -77446,21 +77483,21 @@ ${lanes.join("\n")}
               break;
           }
         }
-        if (returnTypeNode) {
+        if (returnTypeNode && returnTypeErrorLocation) {
           const functionFlags2 = getFunctionFlags(node);
           if ((functionFlags2 & (4 /* Invalid */ | 1 /* Generator */)) === 1 /* Generator */) {
             const returnType = getTypeFromTypeNode(returnTypeNode);
             if (returnType === voidType) {
-              error2(returnTypeNode, Diagnostics.A_generator_cannot_have_a_void_type_annotation);
+              error2(returnTypeErrorLocation, Diagnostics.A_generator_cannot_have_a_void_type_annotation);
             } else {
               const generatorYieldType = getIterationTypeOfGeneratorFunctionReturnType(0 /* Yield */, returnType, (functionFlags2 & 2 /* Async */) !== 0) || anyType;
               const generatorReturnType = getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, returnType, (functionFlags2 & 2 /* Async */) !== 0) || generatorYieldType;
               const generatorNextType = getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, returnType, (functionFlags2 & 2 /* Async */) !== 0) || unknownType;
               const generatorInstantiation = createGeneratorReturnType(generatorYieldType, generatorReturnType, generatorNextType, !!(functionFlags2 & 2 /* Async */));
-              checkTypeAssignableTo(generatorInstantiation, returnType, returnTypeNode);
+              checkTypeAssignableTo(generatorInstantiation, returnType, returnTypeErrorLocation);
             }
           } else if ((functionFlags2 & 3 /* AsyncGenerator */) === 2 /* Async */) {
-            checkAsyncFunctionReturnType(node, returnTypeNode);
+            checkAsyncFunctionReturnType(node, returnTypeNode, returnTypeErrorLocation);
           }
         }
         if (node.kind !== 181 /* IndexSignature */ && node.kind !== 324 /* JSDocFunctionType */) {
@@ -78542,7 +78579,7 @@ ${lanes.join("\n")}
       }
       return typeAsAwaitable.awaitedTypeOfType = type;
     }
-    function checkAsyncFunctionReturnType(node, returnTypeNode) {
+    function checkAsyncFunctionReturnType(node, returnTypeNode, returnTypeErrorLocation) {
       const returnType = getTypeFromTypeNode(returnTypeNode);
       if (languageVersion >= 2 /* ES2015 */) {
         if (isErrorType(returnType)) {
@@ -78553,7 +78590,7 @@ ${lanes.join("\n")}
           true
         );
         if (globalPromiseType !== emptyGenericType && !isReferenceToType2(returnType, globalPromiseType)) {
-          error2(returnTypeNode, Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_write_Promise_0, typeToString(getAwaitedTypeNoAlias(returnType) || voidType));
+          reportErrorForInvalidReturnType(Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_write_Promise_0, returnTypeNode, returnTypeErrorLocation, typeToString(getAwaitedTypeNoAlias(returnType) || voidType));
           return;
         }
       } else {
@@ -78563,7 +78600,7 @@ ${lanes.join("\n")}
         }
         const promiseConstructorName = getEntityNameFromTypeNode(returnTypeNode);
         if (promiseConstructorName === void 0) {
-          error2(returnTypeNode, Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, typeToString(returnType));
+          reportErrorForInvalidReturnType(Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, returnTypeNode, returnTypeErrorLocation, typeToString(returnType));
           return;
         }
         const promiseConstructorSymbol = resolveEntityName(
@@ -78578,9 +78615,9 @@ ${lanes.join("\n")}
             /*reportErrors*/
             false
           )) {
-            error2(returnTypeNode, Diagnostics.An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option);
+            error2(returnTypeErrorLocation, Diagnostics.An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option);
           } else {
-            error2(returnTypeNode, Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, entityNameToString(promiseConstructorName));
+            reportErrorForInvalidReturnType(Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, returnTypeNode, returnTypeErrorLocation, entityNameToString(promiseConstructorName));
           }
           return;
         }
@@ -78589,15 +78626,16 @@ ${lanes.join("\n")}
           true
         );
         if (globalPromiseConstructorLikeType === emptyObjectType) {
-          error2(returnTypeNode, Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, entityNameToString(promiseConstructorName));
+          reportErrorForInvalidReturnType(Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, returnTypeNode, returnTypeErrorLocation, entityNameToString(promiseConstructorName));
           return;
         }
-        if (!checkTypeAssignableTo(
-          promiseConstructorType,
-          globalPromiseConstructorLikeType,
-          returnTypeNode,
-          Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value
-        )) {
+        const headMessage = Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value;
+        const errorInfo = () => returnTypeNode === returnTypeErrorLocation ? void 0 : chainDiagnosticMessages(
+          /*details*/
+          void 0,
+          Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type
+        );
+        if (!checkTypeAssignableTo(promiseConstructorType, globalPromiseConstructorLikeType, returnTypeErrorLocation, headMessage, errorInfo)) {
           return;
         }
         const rootName = promiseConstructorName && getFirstIdentifier(promiseConstructorName);
@@ -78619,6 +78657,14 @@ ${lanes.join("\n")}
         node,
         Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member
       );
+      function reportErrorForInvalidReturnType(message, returnTypeNode2, returnTypeErrorLocation2, typeName) {
+        if (returnTypeNode2 === returnTypeErrorLocation2) {
+          error2(returnTypeErrorLocation2, message, typeName);
+        } else {
+          const diag2 = error2(returnTypeErrorLocation2, Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
+          addRelatedInfo(diag2, createDiagnosticForNode(returnTypeNode2, message, typeName));
+        }
+      }
     }
     function checkDecorator(node) {
       const signature = getResolvedSignature(node);
@@ -125208,7 +125254,6 @@ ${lanes.join("\n")}
       if (hasChangedCompilerOptions) {
         newLine = updateNewLine();
         if (program && changesAffectModuleResolution(program.getCompilerOptions(), compilerOptions)) {
-          debugger;
           resolutionCache.onChangesAffectModuleResolution();
         }
       }
@@ -149634,6 +149679,14 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
     function promoteImportClause(importClause) {
       changes.delete(sourceFile, getTypeKeywordOfTypeOnlyImport(importClause, sourceFile));
+      if (!compilerOptions.allowImportingTsExtensions) {
+        const moduleSpecifier = tryGetModuleSpecifierFromDeclaration(importClause.parent);
+        const resolvedModule = moduleSpecifier && getResolvedModule(sourceFile, moduleSpecifier.text, getModeForUsageLocation(sourceFile, moduleSpecifier));
+        if (resolvedModule == null ? void 0 : resolvedModule.resolvedUsingTsExtension) {
+          const changedExtension = changeAnyExtension(moduleSpecifier.text, getOutputExtension(moduleSpecifier.text, compilerOptions));
+          changes.replaceNode(sourceFile, moduleSpecifier, factory.createStringLiteral(changedExtension));
+        }
+      }
       if (convertExistingToTypeOnly) {
         const namedImports = tryCast(importClause.namedBindings, isNamedImports);
         if (namedImports && namedImports.elements.length > 1) {

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230724`;
+var version = `${versionMajorMinor}.0-dev.20230726`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -5138,6 +5138,7 @@ var Diagnostics = {
   Type_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method: diag(1062, 1 /* Error */, "Type_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method_1062", "Type is referenced directly or indirectly in the fulfillment callback of its own 'then' method."),
   An_export_assignment_cannot_be_used_in_a_namespace: diag(1063, 1 /* Error */, "An_export_assignment_cannot_be_used_in_a_namespace_1063", "An export assignment cannot be used in a namespace."),
   The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_write_Promise_0: diag(1064, 1 /* Error */, "The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_wri_1064", "The return type of an async function or method must be the global Promise<T> type. Did you mean to write 'Promise<{0}>'?"),
+  The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type: diag(1065, 1 /* Error */, "The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_1065", "The return type of an async function or method must be the global Promise<T> type."),
   In_ambient_enum_declarations_member_initializer_must_be_constant_expression: diag(1066, 1 /* Error */, "In_ambient_enum_declarations_member_initializer_must_be_constant_expression_1066", "In ambient enum declarations member initializer must be constant expression."),
   Unexpected_token_A_constructor_method_accessor_or_property_was_expected: diag(1068, 1 /* Error */, "Unexpected_token_A_constructor_method_accessor_or_property_was_expected_1068", "Unexpected token. A constructor, method, accessor, or property was expected."),
   Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces: diag(1069, 1 /* Error */, "Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces_1069", "Unexpected token. A type parameter name was expected without curly braces."),

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.2.0-dev.20230724",
+    "version": "5.2.0-dev.20230726",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -113,5 +113,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "01b18215eccec4e3b32743ab545bf8c6b570d782"
+    "gitHead": "04bfd23105086276349ba6f934f04e01cab2b5a7"
 }