typescript 5.2.0-dev.20230531 → 5.2.0-dev.20230602

package/lib/tsserver.js

@@ -2304,7 +2304,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230531`;
+var version = `${versionMajorMinor}.0-dev.20230602`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -9494,8 +9494,6 @@ var Diagnostics = {
   Class_constructor_may_not_be_a_generator: diag(1368, 1 /* Error */, "Class_constructor_may_not_be_a_generator_1368", "Class constructor may not be a generator."),
   Did_you_mean_0: diag(1369, 3 /* Message */, "Did_you_mean_0_1369", "Did you mean '{0}'?"),
   This_import_is_never_used_as_a_value_and_must_use_import_type_because_importsNotUsedAsValues_is_set_to_error: diag(1371, 1 /* Error */, "This_import_is_never_used_as_a_value_and_must_use_import_type_because_importsNotUsedAsValues_is_set__1371", "This import is never used as a value and must use 'import type' because 'importsNotUsedAsValues' is set to 'error'."),
-  Convert_to_type_only_import: diag(1373, 3 /* Message */, "Convert_to_type_only_import_1373", "Convert to type-only import"),
-  Convert_all_imports_not_used_as_a_value_to_type_only_imports: diag(1374, 3 /* Message */, "Convert_all_imports_not_used_as_a_value_to_type_only_imports_1374", "Convert all imports not used as a value to type-only imports"),
   await_expressions_are_only_allowed_at_the_top_level_of_a_file_when_that_file_is_a_module_but_this_file_has_no_imports_or_exports_Consider_adding_an_empty_export_to_make_this_file_a_module: diag(1375, 1 /* Error */, "await_expressions_are_only_allowed_at_the_top_level_of_a_file_when_that_file_is_a_module_but_this_fi_1375", "'await' expressions are only allowed at the top level of a file when that file is a module, but this file has no imports or exports. Consider adding an empty 'export {}' to make this file a module."),
   _0_was_imported_here: diag(1376, 3 /* Message */, "_0_was_imported_here_1376", "'{0}' was imported here."),
   _0_was_exported_here: diag(1377, 3 /* Message */, "_0_was_exported_here_1377", "'{0}' was exported here."),
@@ -10701,6 +10699,8 @@ var Diagnostics = {
   Resolved_under_condition_0: diag(6414, 3 /* Message */, "Resolved_under_condition_0_6414", "Resolved under condition '{0}'."),
   Failed_to_resolve_under_condition_0: diag(6415, 3 /* Message */, "Failed_to_resolve_under_condition_0_6415", "Failed to resolve under condition '{0}'."),
   Exiting_conditional_exports: diag(6416, 3 /* Message */, "Exiting_conditional_exports_6416", "Exiting conditional exports."),
+  Searching_all_ancestor_node_modules_directories_for_preferred_extensions_Colon_0: diag(6417, 3 /* Message */, "Searching_all_ancestor_node_modules_directories_for_preferred_extensions_Colon_0_6417", "Searching all ancestor node_modules directories for preferred extensions: {0}."),
+  Searching_all_ancestor_node_modules_directories_for_fallback_extensions_Colon_0: diag(6418, 3 /* Message */, "Searching_all_ancestor_node_modules_directories_for_fallback_extensions_Colon_0_6418", "Searching all ancestor node_modules directories for fallback extensions: {0}."),
   The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1: diag(6500, 3 /* Message */, "The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1_6500", "The expected type comes from property '{0}' which is declared here on type '{1}'"),
   The_expected_type_comes_from_this_index_signature: diag(6501, 3 /* Message */, "The_expected_type_comes_from_this_index_signature_6501", "The expected type comes from this index signature."),
   The_expected_type_comes_from_the_return_type_of_this_signature: diag(6502, 3 /* Message */, "The_expected_type_comes_from_the_return_type_of_this_signature_6502", "The expected type comes from the return type of this signature."),
@@ -11213,6 +11213,9 @@ var Diagnostics = {
   Convert_all_typedef_to_TypeScript_types: diag(95177, 3 /* Message */, "Convert_all_typedef_to_TypeScript_types_95177", "Convert all typedef to TypeScript types."),
   Move_to_file: diag(95178, 3 /* Message */, "Move_to_file_95178", "Move to file"),
   Cannot_move_to_file_selected_file_is_invalid: diag(95179, 3 /* Message */, "Cannot_move_to_file_selected_file_is_invalid_95179", "Cannot move to file, selected file is invalid"),
+  Use_import_type: diag(95180, 3 /* Message */, "Use_import_type_95180", "Use 'import type'"),
+  Use_type_0: diag(95181, 3 /* Message */, "Use_type_0_95181", "Use 'type {0}'"),
+  Fix_all_with_type_only_imports: diag(95182, 3 /* Message */, "Fix_all_with_type_only_imports_95182", "Fix all with type-only imports"),
   No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, 1 /* Error */, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
   Classes_may_not_have_a_field_named_constructor: diag(18006, 1 /* Error */, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
   JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, 1 /* Error */, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
@@ -43080,11 +43083,13 @@ function loadModuleFromNearestNodeModulesDirectoryWorker(extensions, moduleName,
   const priorityExtensions = extensions & (1 /* TypeScript */ | 4 /* Declaration */);
   const secondaryExtensions = extensions & ~(1 /* TypeScript */ | 4 /* Declaration */);
   if (priorityExtensions) {
+    traceIfEnabled(state, Diagnostics.Searching_all_ancestor_node_modules_directories_for_preferred_extensions_Colon_0, formatExtensions(priorityExtensions));
     const result = lookup(priorityExtensions);
     if (result)
       return result;
   }
   if (secondaryExtensions && !typesScopeOnly) {
+    traceIfEnabled(state, Diagnostics.Searching_all_ancestor_node_modules_directories_for_fallback_extensions_Colon_0, formatExtensions(secondaryExtensions));
     return lookup(secondaryExtensions);
   }
   function lookup(extensions2) {
@@ -69365,6 +69370,8 @@ function createTypeChecker(host) {
   }
   function isConstantReference(node) {
     switch (node.kind) {
+      case 110 /* ThisKeyword */:
+        return true;
       case 80 /* Identifier */:
         if (!isThisInTypeQuery(node)) {
           const symbol = getResolvedSymbol(node);
@@ -92635,8 +92642,9 @@ function transformClassFields(context) {
   let pendingStatements;
   let lexicalEnvironment;
   const lexicalEnvironmentMap = /* @__PURE__ */ new Map();
+  const noSubstitution = /* @__PURE__ */ new Set();
   let currentClassContainer;
-  let currentStaticPropertyDeclarationOrStaticBlock;
+  let currentClassElement;
   let shouldSubstituteThisWithClassThis = false;
   let previousShouldSubstituteThisWithClassThis = false;
   return chainBundle(context, transformSourceFile);
@@ -92728,13 +92736,18 @@ function transformClassFields(context) {
         return visitForStatement(node);
       case 261 /* FunctionDeclaration */:
       case 217 /* FunctionExpression */:
+        return setCurrentClassElementAnd(
+          /*classElement*/
+          void 0,
+          fallbackVisitor,
+          node
+        );
       case 175 /* Constructor */:
       case 173 /* MethodDeclaration */:
       case 176 /* GetAccessor */:
       case 177 /* SetAccessor */: {
-        return setCurrentStaticPropertyDeclarationOrStaticBlockAnd(
-          /*current*/
-          void 0,
+        return setCurrentClassElementAnd(
+          node,
           fallbackVisitor,
           node
         );
@@ -92823,25 +92836,31 @@ function transformClassFields(context) {
   function classElementVisitor(node) {
     switch (node.kind) {
       case 175 /* Constructor */:
-        return visitConstructorDeclaration(node);
+        return setCurrentClassElementAnd(
+          node,
+          visitConstructorDeclaration,
+          node
+        );
       case 176 /* GetAccessor */:
       case 177 /* SetAccessor */:
       case 173 /* MethodDeclaration */:
-        return setCurrentStaticPropertyDeclarationOrStaticBlockAnd(
-          /*current*/
-          void 0,
+        return setCurrentClassElementAnd(
+          node,
           visitMethodOrAccessorDeclaration,
           node
         );
       case 171 /* PropertyDeclaration */:
-        return setCurrentStaticPropertyDeclarationOrStaticBlockAnd(
-          /*current*/
-          void 0,
+        return setCurrentClassElementAnd(
+          node,
           visitPropertyDeclaration,
           node
         );
       case 174 /* ClassStaticBlockDeclaration */:
-        return visitClassStaticBlockDeclaration(node);
+        return setCurrentClassElementAnd(
+          node,
+          visitClassStaticBlockDeclaration,
+          node
+        );
       case 166 /* ComputedPropertyName */:
         return visitComputedPropertyName(node);
       case 239 /* SemicolonClassElement */:
@@ -93035,12 +93054,15 @@ function transformClassFields(context) {
     }
     return void 0;
   }
-  function setCurrentStaticPropertyDeclarationOrStaticBlockAnd(current, visitor2, arg) {
-    const savedCurrentStaticPropertyDeclarationOrStaticBlock = currentStaticPropertyDeclarationOrStaticBlock;
-    currentStaticPropertyDeclarationOrStaticBlock = current;
-    const result = visitor2(arg);
-    currentStaticPropertyDeclarationOrStaticBlock = savedCurrentStaticPropertyDeclarationOrStaticBlock;
-    return result;
+  function setCurrentClassElementAnd(classElement, visitor2, arg) {
+    if (classElement !== currentClassElement) {
+      const savedCurrentClassElement = currentClassElement;
+      currentClassElement = classElement;
+      const result = visitor2(arg);
+      currentClassElement = savedCurrentClassElement;
+      return result;
+    }
+    return visitor2(arg);
   }
   function getHoistedFunctionName(node) {
     Debug.assert(isPrivateIdentifier(node.name));
@@ -93202,8 +93224,21 @@ function transformClassFields(context) {
     }
     return transformFieldInitializer(node);
   }
+  function shouldForceDynamicThis() {
+    return !!currentClassElement && hasStaticModifier(currentClassElement) && isAccessor(currentClassElement) && isAutoAccessorPropertyDeclaration(getOriginalNode(currentClassElement));
+  }
+  function ensureDynamicThisIfNeeded(node) {
+    if (shouldForceDynamicThis()) {
+      const innerExpression = skipOuterExpressions(node);
+      if (innerExpression.kind === 110 /* ThisKeyword */) {
+        noSubstitution.add(innerExpression);
+      }
+    }
+  }
   function createPrivateIdentifierAccess(info, receiver) {
-    return createPrivateIdentifierAccessHelper(info, visitNode(receiver, visitor, isExpression));
+    receiver = visitNode(receiver, visitor, isExpression);
+    ensureDynamicThisIfNeeded(receiver);
+    return createPrivateIdentifierAccessHelper(info, receiver);
   }
   function createPrivateIdentifierAccessHelper(info, receiver) {
     setCommentRange(receiver, moveRangePos(receiver, -1));
@@ -93248,7 +93283,7 @@ function transformClassFields(context) {
         );
       }
     }
-    if (shouldTransformSuperInStaticInitializers && isSuperProperty(node) && isIdentifier(node.name) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+    if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node) && isIdentifier(node.name) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
       const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
       if (facts & 1 /* ClassWasDecorated */) {
         return visitInvalidSuperProperty(node);
@@ -93267,7 +93302,7 @@ function transformClassFields(context) {
     return visitEachChild(node, visitor, context);
   }
   function visitElementAccessExpression(node) {
-    if (shouldTransformSuperInStaticInitializers && isSuperProperty(node) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+    if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
       const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
       if (facts & 1 /* ClassWasDecorated */) {
         return visitInvalidSuperProperty(node);
@@ -93292,6 +93327,7 @@ function transformClassFields(context) {
         let info;
         if (info = accessPrivateIdentifier2(operand.name)) {
           const receiver = visitNode(operand.expression, visitor, isExpression);
+          ensureDynamicThisIfNeeded(receiver);
           const { readExpression, initializeExpression } = createCopiableReceiverExpr(receiver);
           let expression = createPrivateIdentifierAccess(info, readExpression);
           const temp = isPrefixUnaryExpression(node) || discarded ? void 0 : factory2.createTempVariable(hoistVariableDeclaration);
@@ -93310,7 +93346,7 @@ function transformClassFields(context) {
           }
           return expression;
         }
-      } else if (shouldTransformSuperInStaticInitializers && isSuperProperty(operand) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+      } else if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(operand) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
         const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
         if (facts & 1 /* ClassWasDecorated */) {
           const expression = visitInvalidSuperProperty(operand);
@@ -93367,6 +93403,9 @@ function transformClassFields(context) {
   }
   function createCopiableReceiverExpr(receiver) {
     const clone2 = nodeIsSynthesized(receiver) ? receiver : factory2.cloneNode(receiver);
+    if (receiver.kind === 110 /* ThisKeyword */ && noSubstitution.has(receiver)) {
+      noSubstitution.add(clone2);
+    }
     if (isSimpleInlineableExpression(receiver)) {
       return { readExpression: clone2, initializeExpression: void 0 };
     }
@@ -93397,7 +93436,7 @@ function transformClassFields(context) {
         [visitNode(thisArg, visitor, isExpression), ...visitNodes2(node.arguments, visitor, isExpression)]
       );
     }
-    if (shouldTransformSuperInStaticInitializers && isSuperProperty(node.expression) && currentStaticPropertyDeclarationOrStaticBlock && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.classConstructor)) {
+    if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node.expression) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.classConstructor)) {
       const invocation = factory2.createFunctionCallCall(
         visitNode(node.expression, visitor, isExpression),
         lexicalEnvironment.data.classConstructor,
@@ -93426,7 +93465,7 @@ function transformClassFields(context) {
         visitNode(node.template, visitor, isTemplateLiteral)
       );
     }
-    if (shouldTransformSuperInStaticInitializers && isSuperProperty(node.tag) && currentStaticPropertyDeclarationOrStaticBlock && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.classConstructor)) {
+    if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node.tag) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.classConstructor)) {
       const invocation = factory2.createFunctionBindCall(
         visitNode(node.tag, visitor, isExpression),
         lexicalEnvironment.data.classConstructor,
@@ -93450,7 +93489,7 @@ function transformClassFields(context) {
     }
     if (shouldTransformPrivateElementsOrClassStaticBlocks) {
       startLexicalEnvironment();
-      let statements = setCurrentStaticPropertyDeclarationOrStaticBlockAnd(
+      let statements = setCurrentClassElementAnd(
         node,
         (statements2) => visitNodes2(statements2, visitor, isStatement),
         node.body.statements
@@ -93512,7 +93551,7 @@ function transformClassFields(context) {
             node
           );
         }
-      } else if (shouldTransformSuperInStaticInitializers && isSuperProperty(node.left) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+      } else if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node.left) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
         const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
         if (facts & 1 /* ClassWasDecorated */) {
           return factory2.updateBinaryExpression(
@@ -93607,6 +93646,7 @@ function transformClassFields(context) {
   function createPrivateIdentifierAssignment(info, receiver, right, operator) {
     receiver = visitNode(receiver, visitor, isExpression);
     right = visitNode(right, visitor, isExpression);
+    ensureDynamicThisIfNeeded(receiver);
     if (isCompoundAssignment(operator)) {
       const { readExpression, initializeExpression } = createCopiableReceiverExpr(receiver);
       receiver = initializeExpression || readExpression;
@@ -94249,7 +94289,7 @@ function transformClassFields(context) {
   }
   function transformProperty(property, receiver) {
     var _a;
-    const savedCurrentStaticPropertyDeclarationOrStaticBlock = currentStaticPropertyDeclarationOrStaticBlock;
+    const savedCurrentClassElement = currentClassElement;
     const transformed = transformPropertyWorker(property, receiver);
     if (transformed && hasStaticModifier(property) && ((_a = lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) == null ? void 0 : _a.facts)) {
       setOriginalNode(transformed, property);
@@ -94257,7 +94297,7 @@ function transformClassFields(context) {
       setSourceMapRange(transformed, getSourceMapRange(property.name));
       lexicalEnvironmentMap.set(getOriginalNode(property), lexicalEnvironment);
     }
-    currentStaticPropertyDeclarationOrStaticBlock = savedCurrentStaticPropertyDeclarationOrStaticBlock;
+    currentClassElement = savedCurrentClassElement;
     return transformed;
   }
   function transformPropertyWorker(property, receiver) {
@@ -94274,7 +94314,7 @@ function transformClassFields(context) {
     }
     const propertyName = hasAccessorModifier(property) ? factory2.getGeneratedPrivateNameForNode(property.name) : isComputedPropertyName(property.name) && !isSimpleInlineableExpression(property.name.expression) ? factory2.updateComputedPropertyName(property.name, factory2.getGeneratedNameForNode(property.name)) : property.name;
     if (hasStaticModifier(property)) {
-      currentStaticPropertyDeclarationOrStaticBlock = property;
+      currentClassElement = property;
     }
     const initializerVisitor = referencedName ? (child) => namedEvaluationVisitor(child, referencedName) : visitor;
     if (isPrivateIdentifier(propertyName) && shouldTransformClassElementToWeakMap(property)) {
@@ -94599,7 +94639,7 @@ function transformClassFields(context) {
     }
     if (isPrivateIdentifierPropertyAccessExpression(node)) {
       return wrapPrivateIdentifierForDestructuringTarget(node);
-    } else if (shouldTransformSuperInStaticInitializers && isSuperProperty(node) && currentStaticPropertyDeclarationOrStaticBlock && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+    } else if (shouldTransformSuperInStaticInitializers && currentClassElement && isSuperProperty(node) && isStaticPropertyDeclarationOrClassStaticBlock(currentClassElement) && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
       const { classConstructor, superClassReference, facts } = lexicalEnvironment.data;
       if (facts & 1 /* ClassWasDecorated */) {
         return visitInvalidSuperProperty(node);
@@ -94779,7 +94819,7 @@ function transformClassFields(context) {
     return node;
   }
   function substituteThisExpression(node) {
-    if (enabledSubstitutions & 2 /* ClassStaticThisOrSuperReference */ && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data)) {
+    if (enabledSubstitutions & 2 /* ClassStaticThisOrSuperReference */ && (lexicalEnvironment == null ? void 0 : lexicalEnvironment.data) && !noSubstitution.has(node)) {
       const { facts, classConstructor, classThis } = lexicalEnvironment.data;
       if (facts & 1 /* ClassWasDecorated */ && legacyDecorators) {
         return factory2.createParenthesizedExpression(factory2.createVoidZero());
@@ -94848,6 +94888,12 @@ function isReservedPrivateName(node) {
 function isPrivateIdentifierInExpression(node) {
   return isPrivateIdentifier(node.left) && node.operatorToken.kind === 103 /* InKeyword */;
 }
+function isStaticPropertyDeclaration2(node) {
+  return isPropertyDeclaration(node) && hasStaticModifier(node);
+}
+function isStaticPropertyDeclarationOrClassStaticBlock(node) {
+  return isClassStaticBlockDeclaration(node) || isStaticPropertyDeclaration2(node);
+}
 
 // src/compiler/transformers/typeSerializer.ts
 function createRuntimeTypeSerializer(context) {
@@ -100182,7 +100228,7 @@ function transformJsx(context) {
           continue;
         }
         finishObjectLiteralIfNeeded();
-        expressions.push(attr.expression);
+        expressions.push(Debug.checkDefined(visitNode(attr.expression, visitor, isExpression)));
         continue;
       }
       properties.push(transformJsxAttributeToObjectLiteralElement(attr));
@@ -147560,19 +147606,41 @@ var fixId13 = "convertToTypeOnlyImport";
 registerCodeFix({
   errorCodes: errorCodes14,
   getCodeActions: function getCodeActionsToConvertToTypeOnlyImport(context) {
+    var _a;
     const declaration = getDeclaration2(context.sourceFile, context.span.start);
     if (declaration) {
       const changes = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange11(t, context.sourceFile, declaration));
-      return [createCodeFixAction(fixId13, changes, Diagnostics.Convert_to_type_only_import, fixId13, Diagnostics.Convert_all_imports_not_used_as_a_value_to_type_only_imports)];
+      const importDeclarationChanges = declaration.kind === 275 /* ImportSpecifier */ && canConvertImportDeclarationForSpecifier(declaration, context.sourceFile, context.program) ? ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange11(t, context.sourceFile, declaration.parent.parent.parent)) : void 0;
+      const mainAction = createCodeFixAction(
+        fixId13,
+        changes,
+        declaration.kind === 275 /* ImportSpecifier */ ? [Diagnostics.Use_type_0, ((_a = declaration.propertyName) == null ? void 0 : _a.text) ?? declaration.name.text] : Diagnostics.Use_import_type,
+        fixId13,
+        Diagnostics.Fix_all_with_type_only_imports
+      );
+      if (some(importDeclarationChanges)) {
+        return [
+          createCodeFixActionWithoutFixAll(fixId13, importDeclarationChanges, Diagnostics.Use_import_type),
+          mainAction
+        ];
+      }
+      return [mainAction];
     }
     return void 0;
   },
   fixIds: [fixId13],
   getAllCodeActions: function getAllCodeActionsToConvertToTypeOnlyImport(context) {
+    const fixedImportDeclarations = /* @__PURE__ */ new Set();
     return codeFixAll(context, errorCodes14, (changes, diag2) => {
-      const declaration = getDeclaration2(diag2.file, diag2.start);
-      if (declaration) {
-        doChange11(changes, diag2.file, declaration);
+      const errorDeclaration = getDeclaration2(diag2.file, diag2.start);
+      if ((errorDeclaration == null ? void 0 : errorDeclaration.kind) === 271 /* ImportDeclaration */ && !fixedImportDeclarations.has(errorDeclaration)) {
+        doChange11(changes, diag2.file, errorDeclaration);
+        fixedImportDeclarations.add(errorDeclaration);
+      } else if ((errorDeclaration == null ? void 0 : errorDeclaration.kind) === 275 /* ImportSpecifier */ && !fixedImportDeclarations.has(errorDeclaration.parent.parent.parent) && canConvertImportDeclarationForSpecifier(errorDeclaration, diag2.file, context.program)) {
+        doChange11(changes, diag2.file, errorDeclaration.parent.parent.parent);
+        fixedImportDeclarations.add(errorDeclaration.parent.parent.parent);
+      } else if ((errorDeclaration == null ? void 0 : errorDeclaration.kind) === 275 /* ImportSpecifier */) {
+        doChange11(changes, diag2.file, errorDeclaration);
       }
     });
   }
@@ -147581,7 +147649,27 @@ function getDeclaration2(sourceFile, pos) {
   const { parent: parent2 } = getTokenAtPosition(sourceFile, pos);
   return isImportSpecifier(parent2) || isImportDeclaration(parent2) && parent2.importClause ? parent2 : void 0;
 }
+function canConvertImportDeclarationForSpecifier(specifier, sourceFile, program) {
+  if (specifier.parent.parent.name) {
+    return false;
+  }
+  const nonTypeOnlySpecifiers = specifier.parent.elements.filter((e) => !e.isTypeOnly);
+  if (nonTypeOnlySpecifiers.length === 1) {
+    return true;
+  }
+  const checker = program.getTypeChecker();
+  for (const specifier2 of nonTypeOnlySpecifiers) {
+    const isUsedAsValue = ts_FindAllReferences_exports.Core.eachSymbolReferenceInFile(specifier2.name, checker, sourceFile, (usage) => {
+      return !isValidTypeOnlyAliasUseSite(usage);
+    });
+    if (isUsedAsValue) {
+      return false;
+    }
+  }
+  return true;
+}
 function doChange11(changes, sourceFile, declaration) {
+  var _a;
   if (isImportSpecifier(declaration)) {
     changes.replaceNode(sourceFile, declaration, factory.updateImportSpecifier(
       declaration,
@@ -147652,6 +147740,16 @@ function doChange11(changes, sourceFile, declaration) {
         )
       ]);
     } else {
+      const newNamedBindings = ((_a = importClause.namedBindings) == null ? void 0 : _a.kind) === 274 /* NamedImports */ ? factory.updateNamedImports(
+        importClause.namedBindings,
+        sameMap(importClause.namedBindings.elements, (e) => factory.updateImportSpecifier(
+          e,
+          /*isTypeOnly*/
+          false,
+          e.propertyName,
+          e.name
+        ))
+      ) : importClause.namedBindings;
       const importDeclaration = factory.updateImportDeclaration(
         declaration,
         declaration.modifiers,
@@ -147660,7 +147758,7 @@ function doChange11(changes, sourceFile, declaration) {
           /*isTypeOnly*/
           true,
           importClause.name,
-          importClause.namedBindings
+          newNamedBindings
         ),
         declaration.moduleSpecifier,
         declaration.assertClause
@@ -151349,7 +151447,7 @@ registerCodeFix({
       actions2 = append(actions2, createCodeFixActionWithoutFixAll(fixId32, namespaceChanges, Diagnostics.Convert_named_imports_to_namespace_import));
     }
     if (typeOnlyChanges.length) {
-      actions2 = append(actions2, createCodeFixActionWithoutFixAll(fixId32, typeOnlyChanges, Diagnostics.Convert_to_type_only_import));
+      actions2 = append(actions2, createCodeFixActionWithoutFixAll(fixId32, typeOnlyChanges, Diagnostics.Use_import_type));
     }
     return actions2;
   },
@@ -159282,7 +159380,7 @@ function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, mode, c
               }
               const keys = getOwnKeys(exports);
               const fragmentSubpath = components.join("/") + (components.length && hasTrailingDirectorySeparator(fragment) ? "/" : "");
-              const conditions = mode === 99 /* ESNext */ ? ["node", "import", "types"] : ["node", "require", "types"];
+              const conditions = getConditions(compilerOptions, mode === 99 /* ESNext */);
               addCompletionEntriesFromPathsOrExports(
                 result,
                 fragmentSubpath,