typescript 5.5.0-dev.20240522 → 5.5.0-dev.20240523

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = `${versionMajorMinor}.0-dev.20240522`;
+var version = `${versionMajorMinor}.0-dev.20240523`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -7508,6 +7508,8 @@ var Diagnostics = {
   Add_satisfies_and_a_type_assertion_to_this_expression_satisfies_T_as_T_to_make_the_type_explicit: diag(9035, 1 /* Error */, "Add_satisfies_and_a_type_assertion_to_this_expression_satisfies_T_as_T_to_make_the_type_explicit_9035", "Add satisfies and a type assertion to this expression (satisfies T as T) to make the type explicit."),
   Move_the_expression_in_default_export_to_a_variable_and_add_a_type_annotation_to_it: diag(9036, 1 /* Error */, "Move_the_expression_in_default_export_to_a_variable_and_add_a_type_annotation_to_it_9036", "Move the expression in default export to a variable and add a type annotation to it."),
   Default_exports_can_t_be_inferred_with_isolatedDeclarations: diag(9037, 1 /* Error */, "Default_exports_can_t_be_inferred_with_isolatedDeclarations_9037", "Default exports can't be inferred with --isolatedDeclarations."),
+  Computed_property_names_on_class_or_object_literals_cannot_be_inferred_with_isolatedDeclarations: diag(9038, 1 /* Error */, "Computed_property_names_on_class_or_object_literals_cannot_be_inferred_with_isolatedDeclarations_9038", "Computed property names on class or object literals cannot be inferred with --isolatedDeclarations."),
+  Type_containing_private_name_0_can_t_be_used_with_isolatedDeclarations: diag(9039, 1 /* Error */, "Type_containing_private_name_0_can_t_be_used_with_isolatedDeclarations_9039", "Type containing private name '{0}' can't be used with --isolatedDeclarations."),
   JSX_attributes_must_only_be_assigned_a_non_empty_expression: diag(17e3, 1 /* Error */, "JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000", "JSX attributes must only be assigned a non-empty 'expression'."),
   JSX_elements_cannot_have_multiple_attributes_with_the_same_name: diag(17001, 1 /* Error */, "JSX_elements_cannot_have_multiple_attributes_with_the_same_name_17001", "JSX elements cannot have multiple attributes with the same name."),
   Expected_corresponding_JSX_closing_tag_for_0: diag(17002, 1 /* Error */, "Expected_corresponding_JSX_closing_tag_for_0_17002", "Expected corresponding JSX closing tag for '{0}'."),
@@ -45053,7 +45055,6 @@ function createTypeChecker(host) {
   var syntacticNodeBuilder = createSyntacticTypeNodeBuilder(compilerOptions, {
     isEntityNameVisible,
     isExpandoFunctionDeclaration,
-    isNonNarrowedBindableName,
     getAllAccessorDeclarations: getAllAccessorDeclarationsForDeclaration,
     requiresAddingImplicitUndefined,
     isUndefinedIdentifierExpression(node) {
@@ -49228,6 +49229,7 @@ function createTypeChecker(host) {
           return result;
         }
       }
+      context.tracker.reportInferenceFallback(existing);
       return void 0;
     }
     function symbolToNode(symbol, context, meaning) {
@@ -51263,6 +51265,9 @@ function createTypeChecker(host) {
           symAtLocation === void 0 && sym !== void 0 || // If the symbol is found both in declaration scope and in current scope then it shoudl point to the same reference
           symAtLocation && sym && !getSymbolIfSameReference(getExportSymbolOfValueSymbolIfExported(symAtLocation), sym)
         ) {
+          if (symAtLocation !== unknownSymbol) {
+            context.tracker.reportInferenceFallback(node);
+          }
           introducesError = true;
           return { introducesError, node, sym };
         }
@@ -51281,6 +51286,7 @@ function createTypeChecker(host) {
           /*shouldComputeAliasesToMakeVisible*/
           false
         ).accessibility !== 0 /* Accessible */) {
+          context.tracker.reportInferenceFallback(node);
           introducesError = true;
         } else {
           context.tracker.trackSymbol(sym, context.enclosingDeclaration, meaning);
@@ -84975,22 +84981,6 @@ function createTypeChecker(host) {
     }
     return false;
   }
-  function isNonNarrowedBindableName(node) {
-    if (!hasBindableName(node.parent)) {
-      return false;
-    }
-    const expression = node.expression;
-    if (!isEntityNameExpression(expression)) {
-      return true;
-    }
-    const type = getTypeOfExpression(expression);
-    const symbol = getSymbolAtLocation(expression);
-    if (!symbol) {
-      return false;
-    }
-    const declaredType = getTypeOfSymbol(symbol);
-    return declaredType === type;
-  }
   function literalTypeToNode(type, enclosing, tracker) {
     const enumResult = type.flags & 1056 /* EnumLike */ ? nodeBuilder.symbolToExpression(
       type.symbol,
@@ -85109,7 +85099,6 @@ function createTypeChecker(host) {
         return node && getExternalModuleFileFromDeclaration(node);
       },
       isLiteralConstDeclaration,
-      isNonNarrowedBindableName,
       isLateBound: (nodeIn) => {
         const node = getParseTreeNode(nodeIn, isDeclaration);
         const symbol = node && getSymbolOfDeclaration(node);
@@ -110029,7 +110018,7 @@ function createGetIsolatedDeclarationErrors(resolver) {
     [260 /* VariableDeclaration */]: Diagnostics.Variable_must_have_an_explicit_type_annotation_with_isolatedDeclarations,
     [172 /* PropertyDeclaration */]: Diagnostics.Property_must_have_an_explicit_type_annotation_with_isolatedDeclarations,
     [171 /* PropertySignature */]: Diagnostics.Property_must_have_an_explicit_type_annotation_with_isolatedDeclarations,
-    [167 /* ComputedPropertyName */]: Diagnostics.Computed_properties_must_be_number_or_string_literals_variables_or_dotted_expressions_with_isolatedDeclarations,
+    [167 /* ComputedPropertyName */]: Diagnostics.Computed_property_names_on_class_or_object_literals_cannot_be_inferred_with_isolatedDeclarations,
     [305 /* SpreadAssignment */]: Diagnostics.Objects_that_contain_spread_assignments_can_t_be_inferred_with_isolatedDeclarations,
     [304 /* ShorthandPropertyAssignment */]: Diagnostics.Objects_that_contain_shorthand_properties_can_t_be_inferred_with_isolatedDeclarations,
     [209 /* ArrayLiteralExpression */]: Diagnostics.Only_const_arrays_can_be_inferred_with_isolatedDeclarations,
@@ -110042,6 +110031,9 @@ function createGetIsolatedDeclarationErrors(resolver) {
     if (heritageClause) {
       return createDiagnosticForNode(node, Diagnostics.Extends_clause_can_t_contain_an_expression_with_isolatedDeclarations);
     }
+    if ((isPartOfTypeNode(node) || isTypeQueryNode(node.parent)) && (isEntityName(node) || isEntityNameExpression(node))) {
+      return createEntityInTypeNodeError(node);
+    }
     Debug.type(node);
     switch (node.kind) {
       case 177 /* GetAccessor */:
@@ -110077,8 +110069,13 @@ function createGetIsolatedDeclarationErrors(resolver) {
     }
   }
   function findNearestDeclaration(node) {
-    const result = findAncestor(node, (n) => isExportAssignment(n) || (isStatement(n) ? "quit" : isVariableDeclaration(n) || isPropertyDeclaration(n) || isParameter(n)));
-    return result;
+    const result = findAncestor(node, (n) => isExportAssignment(n) || isStatement(n) || isVariableDeclaration(n) || isPropertyDeclaration(n) || isParameter(n));
+    if (!result) return void 0;
+    if (isExportAssignment(result)) return result;
+    if (isReturnStatement(result)) {
+      return findAncestor(result, (n) => isFunctionLikeDeclaration(n) && !isConstructorDeclaration(n));
+    }
+    return isStatement(result) ? void 0 : result;
   }
   function createAccessorTypeError(node) {
     const { getAccessor, setAccessor } = getAllAccessorDeclarations(node.symbol.declarations, node);
@@ -110092,11 +110089,10 @@ function createGetIsolatedDeclarationErrors(resolver) {
     }
     return diag2;
   }
-  function createObjectLiteralError(node) {
-    const diag2 = createDiagnosticForNode(node, errorByDeclarationKind[node.kind]);
+  function addParentDeclarationRelatedInfo(node, diag2) {
     const parentDeclaration = findNearestDeclaration(node);
     if (parentDeclaration) {
-      const targetStr = isExportAssignment(parentDeclaration) ? "" : getTextOfNode(
+      const targetStr = isExportAssignment(parentDeclaration) || !parentDeclaration.name ? "" : getTextOfNode(
         parentDeclaration.name,
         /*includeTrivia*/
         false
@@ -110105,30 +110101,19 @@ function createGetIsolatedDeclarationErrors(resolver) {
     }
     return diag2;
   }
+  function createObjectLiteralError(node) {
+    const diag2 = createDiagnosticForNode(node, errorByDeclarationKind[node.kind]);
+    addParentDeclarationRelatedInfo(node, diag2);
+    return diag2;
+  }
   function createArrayLiteralError(node) {
     const diag2 = createDiagnosticForNode(node, errorByDeclarationKind[node.kind]);
-    const parentDeclaration = findNearestDeclaration(node);
-    if (parentDeclaration) {
-      const targetStr = isExportAssignment(parentDeclaration) ? "" : getTextOfNode(
-        parentDeclaration.name,
-        /*includeTrivia*/
-        false
-      );
-      addRelatedInfo(diag2, createDiagnosticForNode(parentDeclaration, relatedSuggestionByDeclarationKind[parentDeclaration.kind], targetStr));
-    }
+    addParentDeclarationRelatedInfo(node, diag2);
     return diag2;
   }
   function createReturnTypeError(node) {
     const diag2 = createDiagnosticForNode(node, errorByDeclarationKind[node.kind]);
-    const parentDeclaration = findNearestDeclaration(node);
-    if (parentDeclaration) {
-      const targetStr = isExportAssignment(parentDeclaration) ? "" : getTextOfNode(
-        parentDeclaration.name,
-        /*includeTrivia*/
-        false
-      );
-      addRelatedInfo(diag2, createDiagnosticForNode(parentDeclaration, relatedSuggestionByDeclarationKind[parentDeclaration.kind], targetStr));
-    }
+    addParentDeclarationRelatedInfo(node, diag2);
     addRelatedInfo(diag2, createDiagnosticForNode(node, relatedSuggestionByDeclarationKind[node.kind]));
     return diag2;
   }
@@ -110166,11 +110151,20 @@ function createGetIsolatedDeclarationErrors(resolver) {
   function createClassExpressionError(node) {
     return createExpressionError(node, Diagnostics.Inference_from_class_expressions_is_not_supported_with_isolatedDeclarations);
   }
+  function createEntityInTypeNodeError(node) {
+    const diag2 = createDiagnosticForNode(node, Diagnostics.Type_containing_private_name_0_can_t_be_used_with_isolatedDeclarations, getTextOfNode(
+      node,
+      /*includeTrivia*/
+      false
+    ));
+    addParentDeclarationRelatedInfo(node, diag2);
+    return diag2;
+  }
   function createExpressionError(node, diagnosticMessage) {
     const parentDeclaration = findNearestDeclaration(node);
     let diag2;
     if (parentDeclaration) {
-      const targetStr = isExportAssignment(parentDeclaration) ? "" : getTextOfNode(
+      const targetStr = isExportAssignment(parentDeclaration) || !parentDeclaration.name ? "" : getTextOfNode(
         parentDeclaration.name,
         /*includeTrivia*/
         false
@@ -110895,8 +110889,11 @@ function transformDeclarations(context) {
     if (shouldStripInternal(input)) return;
     if (isDeclaration(input)) {
       if (isDeclarationAndNotVisible(input)) return;
-      if (hasDynamicName(input) && !resolver.isLateBound(getParseTreeNode(input))) {
-        if (isolatedDeclarations && isClassDeclaration(input.parent) && isEntityNameExpression(input.name.expression) && resolver.isEntityNameVisible(input.name.expression, input.parent).accessibility === 0 /* Accessible */ && !resolver.isNonNarrowedBindableName(input.name)) {
+      if (hasDynamicName(input)) {
+        if (isolatedDeclarations && (isClassDeclaration(input.parent) || isObjectLiteralExpression(input.parent))) {
+          context.addDiagnostic(createDiagnosticForNode(input, Diagnostics.Computed_property_names_on_class_or_object_literals_cannot_be_inferred_with_isolatedDeclarations));
+        }
+        if (isolatedDeclarations && (isInterfaceDeclaration(input.parent) || isTypeLiteralNode(input.parent)) && !isEntityNameExpression(input.name.expression)) {
           context.addDiagnostic(createDiagnosticForNode(input, Diagnostics.Computed_properties_must_be_number_or_string_literals_variables_or_dotted_expressions_with_isolatedDeclarations));
         }
         if (!isEntityNameExpression(input.name.expression)) {
@@ -112829,7 +112826,6 @@ var notImplementedResolver = {
   isArgumentsLocalBinding: notImplemented,
   getExternalModuleFileFromDeclaration: notImplemented,
   isLiteralConstDeclaration: notImplemented,
-  isNonNarrowedBindableName: notImplemented,
   getJsxFactoryEntity: notImplemented,
   getJsxFragmentFactoryEntity: notImplemented,
   isBindingCapturedByNode: notImplemented,
@@ -129110,7 +129106,7 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
           expression,
           /*includeBigInt*/
           false
-        ) && !isEntityNameExpression(expression)) {
+        )) {
           context.tracker.reportInferenceFallback(prop.name);
           result = false;
         }
@@ -129124,21 +129120,6 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
     for (const prop of objectLiteral.properties) {
       Debug.assert(!isShorthandPropertyAssignment(prop) && !isSpreadAssignment(prop));
       const name = prop.name;
-      if (prop.name.kind === 167 /* ComputedPropertyName */) {
-        if (!resolver.isNonNarrowedBindableName(prop.name)) {
-          context.tracker.reportInferenceFallback(prop.name);
-        } else if (isEntityNameExpression(prop.name.expression)) {
-          const visibilityResult = resolver.isEntityNameVisible(
-            prop.name.expression,
-            context.enclosingDeclaration,
-            /*shouldComputeAliasToMakeVisible*/
-            false
-          );
-          if (visibilityResult.accessibility !== 0 /* Accessible */) {
-            context.tracker.reportInferenceFallback(prop.name);
-          }
-        }
-      }
       switch (prop.kind) {
         case 174 /* MethodDeclaration */:
           canInferObjectLiteral = !!typeFromObjectLiteralMethod(prop, name, context) && canInferObjectLiteral;

package/lib/typescript.d.ts

@@ -121,6 +121,7 @@ declare namespace ts {
                 ProvideCallHierarchyOutgoingCalls = "provideCallHierarchyOutgoingCalls",
                 ProvideInlayHints = "provideInlayHints",
                 WatchChange = "watchChange",
+                MapCode = "mapCode",
             }
             /**
              * A TypeScript Server message
@@ -1769,6 +1770,33 @@ declare namespace ts {
             export interface InlayHintsResponse extends Response {
                 body?: InlayHintItem[];
             }
+            export interface MapCodeRequestArgs extends FileRequestArgs {
+                /**
+                 * The files and changes to try and apply/map.
+                 */
+                mapping: MapCodeRequestDocumentMapping;
+            }
+            export interface MapCodeRequestDocumentMapping {
+                /**
+                 * The specific code to map/insert/replace in the file.
+                 */
+                contents: string[];
+                /**
+                 * Areas of "focus" to inform the code mapper with. For example, cursor
+                 * location, current selection, viewport, etc. Nested arrays denote
+                 * priority: toplevel arrays are more important than inner arrays, and
+                 * inner array priorities are based on items within that array. Items
+                 * earlier in the arrays have higher priority.
+                 */
+                focusLocations?: TextSpan[][];
+            }
+            export interface MapCodeRequest extends FileRequest {
+                command: CommandTypes.MapCode;
+                arguments: MapCodeRequestArgs;
+            }
+            export interface MapCodeResponse extends Response {
+                body: readonly FileCodeEdits[];
+            }
             /**
              * Synchronous request for semantic diagnostics of one file.
              */
@@ -3468,6 +3496,7 @@ declare namespace ts {
             private getLinkedEditingRange;
             private getDocumentHighlights;
             private provideInlayHints;
+            private mapCode;
             private setCompilerOptionsForInferredProjects;
             private getProjectInfo;
             private getProjectInfoWorker;

package/lib/typescript.js

@@ -112,6 +112,7 @@ __export(typescript_exports, {
   LexicalEnvironmentFlags: () => LexicalEnvironmentFlags,
   ListFormat: () => ListFormat,
   LogLevel: () => LogLevel,
+  MapCode: () => ts_MapCode_exports,
   MemberOverrideStatus: () => MemberOverrideStatus,
   ModifierFlags: () => ModifierFlags,
   ModuleDetectionKind: () => ModuleDetectionKind,
@@ -2369,7 +2370,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = `${versionMajorMinor}.0-dev.20240522`;
+var version = `${versionMajorMinor}.0-dev.20240523`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -11116,6 +11117,8 @@ var Diagnostics = {
   Add_satisfies_and_a_type_assertion_to_this_expression_satisfies_T_as_T_to_make_the_type_explicit: diag(9035, 1 /* Error */, "Add_satisfies_and_a_type_assertion_to_this_expression_satisfies_T_as_T_to_make_the_type_explicit_9035", "Add satisfies and a type assertion to this expression (satisfies T as T) to make the type explicit."),
   Move_the_expression_in_default_export_to_a_variable_and_add_a_type_annotation_to_it: diag(9036, 1 /* Error */, "Move_the_expression_in_default_export_to_a_variable_and_add_a_type_annotation_to_it_9036", "Move the expression in default export to a variable and add a type annotation to it."),
   Default_exports_can_t_be_inferred_with_isolatedDeclarations: diag(9037, 1 /* Error */, "Default_exports_can_t_be_inferred_with_isolatedDeclarations_9037", "Default exports can't be inferred with --isolatedDeclarations."),
+  Computed_property_names_on_class_or_object_literals_cannot_be_inferred_with_isolatedDeclarations: diag(9038, 1 /* Error */, "Computed_property_names_on_class_or_object_literals_cannot_be_inferred_with_isolatedDeclarations_9038", "Computed property names on class or object literals cannot be inferred with --isolatedDeclarations."),
+  Type_containing_private_name_0_can_t_be_used_with_isolatedDeclarations: diag(9039, 1 /* Error */, "Type_containing_private_name_0_can_t_be_used_with_isolatedDeclarations_9039", "Type containing private name '{0}' can't be used with --isolatedDeclarations."),
   JSX_attributes_must_only_be_assigned_a_non_empty_expression: diag(17e3, 1 /* Error */, "JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000", "JSX attributes must only be assigned a non-empty 'expression'."),
   JSX_elements_cannot_have_multiple_attributes_with_the_same_name: diag(17001, 1 /* Error */, "JSX_elements_cannot_have_multiple_attributes_with_the_same_name_17001", "JSX elements cannot have multiple attributes with the same name."),
   Expected_corresponding_JSX_closing_tag_for_0: diag(17002, 1 /* Error */, "Expected_corresponding_JSX_closing_tag_for_0_17002", "Expected corresponding JSX closing tag for '{0}'."),
@@ -49847,7 +49850,6 @@ function createTypeChecker(host) {
   var syntacticNodeBuilder = createSyntacticTypeNodeBuilder(compilerOptions, {
     isEntityNameVisible,
     isExpandoFunctionDeclaration,
-    isNonNarrowedBindableName,
     getAllAccessorDeclarations: getAllAccessorDeclarationsForDeclaration,
     requiresAddingImplicitUndefined,
     isUndefinedIdentifierExpression(node) {
@@ -54022,6 +54024,7 @@ function createTypeChecker(host) {
           return result;
         }
       }
+      context.tracker.reportInferenceFallback(existing);
       return void 0;
     }
     function symbolToNode(symbol, context, meaning) {
@@ -56057,6 +56060,9 @@ function createTypeChecker(host) {
           symAtLocation === void 0 && sym !== void 0 || // If the symbol is found both in declaration scope and in current scope then it shoudl point to the same reference
           symAtLocation && sym && !getSymbolIfSameReference(getExportSymbolOfValueSymbolIfExported(symAtLocation), sym)
         ) {
+          if (symAtLocation !== unknownSymbol) {
+            context.tracker.reportInferenceFallback(node);
+          }
           introducesError = true;
           return { introducesError, node, sym };
         }
@@ -56075,6 +56081,7 @@ function createTypeChecker(host) {
           /*shouldComputeAliasesToMakeVisible*/
           false
         ).accessibility !== 0 /* Accessible */) {
+          context.tracker.reportInferenceFallback(node);
           introducesError = true;
         } else {
           context.tracker.trackSymbol(sym, context.enclosingDeclaration, meaning);
@@ -89769,22 +89776,6 @@ function createTypeChecker(host) {
     }
     return false;
   }
-  function isNonNarrowedBindableName(node) {
-    if (!hasBindableName(node.parent)) {
-      return false;
-    }
-    const expression = node.expression;
-    if (!isEntityNameExpression(expression)) {
-      return true;
-    }
-    const type = getTypeOfExpression(expression);
-    const symbol = getSymbolAtLocation(expression);
-    if (!symbol) {
-      return false;
-    }
-    const declaredType = getTypeOfSymbol(symbol);
-    return declaredType === type;
-  }
   function literalTypeToNode(type, enclosing, tracker) {
     const enumResult = type.flags & 1056 /* EnumLike */ ? nodeBuilder.symbolToExpression(
       type.symbol,
@@ -89903,7 +89894,6 @@ function createTypeChecker(host) {
         return node && getExternalModuleFileFromDeclaration(node);
       },
       isLiteralConstDeclaration,
-      isNonNarrowedBindableName,
       isLateBound: (nodeIn) => {
         const node = getParseTreeNode(nodeIn, isDeclaration);
         const symbol = node && getSymbolOfDeclaration(node);
@@ -115005,7 +114995,7 @@ function createGetIsolatedDeclarationErrors(resolver) {
     [260 /* VariableDeclaration */]: Diagnostics.Variable_must_have_an_explicit_type_annotation_with_isolatedDeclarations,
     [172 /* PropertyDeclaration */]: Diagnostics.Property_must_have_an_explicit_type_annotation_with_isolatedDeclarations,
     [171 /* PropertySignature */]: Diagnostics.Property_must_have_an_explicit_type_annotation_with_isolatedDeclarations,
-    [167 /* ComputedPropertyName */]: Diagnostics.Computed_properties_must_be_number_or_string_literals_variables_or_dotted_expressions_with_isolatedDeclarations,
+    [167 /* ComputedPropertyName */]: Diagnostics.Computed_property_names_on_class_or_object_literals_cannot_be_inferred_with_isolatedDeclarations,
     [305 /* SpreadAssignment */]: Diagnostics.Objects_that_contain_spread_assignments_can_t_be_inferred_with_isolatedDeclarations,
     [304 /* ShorthandPropertyAssignment */]: Diagnostics.Objects_that_contain_shorthand_properties_can_t_be_inferred_with_isolatedDeclarations,
     [209 /* ArrayLiteralExpression */]: Diagnostics.Only_const_arrays_can_be_inferred_with_isolatedDeclarations,
@@ -115018,6 +115008,9 @@ function createGetIsolatedDeclarationErrors(resolver) {
     if (heritageClause) {
       return createDiagnosticForNode(node, Diagnostics.Extends_clause_can_t_contain_an_expression_with_isolatedDeclarations);
     }
+    if ((isPartOfTypeNode(node) || isTypeQueryNode(node.parent)) && (isEntityName(node) || isEntityNameExpression(node))) {
+      return createEntityInTypeNodeError(node);
+    }
     Debug.type(node);
     switch (node.kind) {
       case 177 /* GetAccessor */:
@@ -115053,8 +115046,13 @@ function createGetIsolatedDeclarationErrors(resolver) {
     }
   }
   function findNearestDeclaration(node) {
-    const result = findAncestor(node, (n) => isExportAssignment(n) || (isStatement(n) ? "quit" : isVariableDeclaration(n) || isPropertyDeclaration(n) || isParameter(n)));
-    return result;
+    const result = findAncestor(node, (n) => isExportAssignment(n) || isStatement(n) || isVariableDeclaration(n) || isPropertyDeclaration(n) || isParameter(n));
+    if (!result) return void 0;
+    if (isExportAssignment(result)) return result;
+    if (isReturnStatement(result)) {
+      return findAncestor(result, (n) => isFunctionLikeDeclaration(n) && !isConstructorDeclaration(n));
+    }
+    return isStatement(result) ? void 0 : result;
   }
   function createAccessorTypeError(node) {
     const { getAccessor, setAccessor } = getAllAccessorDeclarations(node.symbol.declarations, node);
@@ -115068,11 +115066,10 @@ function createGetIsolatedDeclarationErrors(resolver) {
     }
     return diag2;
   }
-  function createObjectLiteralError(node) {
-    const diag2 = createDiagnosticForNode(node, errorByDeclarationKind[node.kind]);
+  function addParentDeclarationRelatedInfo(node, diag2) {
     const parentDeclaration = findNearestDeclaration(node);
     if (parentDeclaration) {
-      const targetStr = isExportAssignment(parentDeclaration) ? "" : getTextOfNode(
+      const targetStr = isExportAssignment(parentDeclaration) || !parentDeclaration.name ? "" : getTextOfNode(
         parentDeclaration.name,
         /*includeTrivia*/
         false
@@ -115081,30 +115078,19 @@ function createGetIsolatedDeclarationErrors(resolver) {
     }
     return diag2;
   }
+  function createObjectLiteralError(node) {
+    const diag2 = createDiagnosticForNode(node, errorByDeclarationKind[node.kind]);
+    addParentDeclarationRelatedInfo(node, diag2);
+    return diag2;
+  }
   function createArrayLiteralError(node) {
     const diag2 = createDiagnosticForNode(node, errorByDeclarationKind[node.kind]);
-    const parentDeclaration = findNearestDeclaration(node);
-    if (parentDeclaration) {
-      const targetStr = isExportAssignment(parentDeclaration) ? "" : getTextOfNode(
-        parentDeclaration.name,
-        /*includeTrivia*/
-        false
-      );
-      addRelatedInfo(diag2, createDiagnosticForNode(parentDeclaration, relatedSuggestionByDeclarationKind[parentDeclaration.kind], targetStr));
-    }
+    addParentDeclarationRelatedInfo(node, diag2);
     return diag2;
   }
   function createReturnTypeError(node) {
     const diag2 = createDiagnosticForNode(node, errorByDeclarationKind[node.kind]);
-    const parentDeclaration = findNearestDeclaration(node);
-    if (parentDeclaration) {
-      const targetStr = isExportAssignment(parentDeclaration) ? "" : getTextOfNode(
-        parentDeclaration.name,
-        /*includeTrivia*/
-        false
-      );
-      addRelatedInfo(diag2, createDiagnosticForNode(parentDeclaration, relatedSuggestionByDeclarationKind[parentDeclaration.kind], targetStr));
-    }
+    addParentDeclarationRelatedInfo(node, diag2);
     addRelatedInfo(diag2, createDiagnosticForNode(node, relatedSuggestionByDeclarationKind[node.kind]));
     return diag2;
   }
@@ -115142,11 +115128,20 @@ function createGetIsolatedDeclarationErrors(resolver) {
   function createClassExpressionError(node) {
     return createExpressionError(node, Diagnostics.Inference_from_class_expressions_is_not_supported_with_isolatedDeclarations);
   }
+  function createEntityInTypeNodeError(node) {
+    const diag2 = createDiagnosticForNode(node, Diagnostics.Type_containing_private_name_0_can_t_be_used_with_isolatedDeclarations, getTextOfNode(
+      node,
+      /*includeTrivia*/
+      false
+    ));
+    addParentDeclarationRelatedInfo(node, diag2);
+    return diag2;
+  }
   function createExpressionError(node, diagnosticMessage) {
     const parentDeclaration = findNearestDeclaration(node);
     let diag2;
     if (parentDeclaration) {
-      const targetStr = isExportAssignment(parentDeclaration) ? "" : getTextOfNode(
+      const targetStr = isExportAssignment(parentDeclaration) || !parentDeclaration.name ? "" : getTextOfNode(
         parentDeclaration.name,
         /*includeTrivia*/
         false
@@ -115871,8 +115866,11 @@ function transformDeclarations(context) {
     if (shouldStripInternal(input)) return;
     if (isDeclaration(input)) {
       if (isDeclarationAndNotVisible(input)) return;
-      if (hasDynamicName(input) && !resolver.isLateBound(getParseTreeNode(input))) {
-        if (isolatedDeclarations && isClassDeclaration(input.parent) && isEntityNameExpression(input.name.expression) && resolver.isEntityNameVisible(input.name.expression, input.parent).accessibility === 0 /* Accessible */ && !resolver.isNonNarrowedBindableName(input.name)) {
+      if (hasDynamicName(input)) {
+        if (isolatedDeclarations && (isClassDeclaration(input.parent) || isObjectLiteralExpression(input.parent))) {
+          context.addDiagnostic(createDiagnosticForNode(input, Diagnostics.Computed_property_names_on_class_or_object_literals_cannot_be_inferred_with_isolatedDeclarations));
+        }
+        if (isolatedDeclarations && (isInterfaceDeclaration(input.parent) || isTypeLiteralNode(input.parent)) && !isEntityNameExpression(input.name.expression)) {
           context.addDiagnostic(createDiagnosticForNode(input, Diagnostics.Computed_properties_must_be_number_or_string_literals_variables_or_dotted_expressions_with_isolatedDeclarations));
         }
         if (!isEntityNameExpression(input.name.expression)) {
@@ -117816,7 +117814,6 @@ var notImplementedResolver = {
   isArgumentsLocalBinding: notImplemented,
   getExternalModuleFileFromDeclaration: notImplemented,
   isLiteralConstDeclaration: notImplemented,
-  isNonNarrowedBindableName: notImplemented,
   getJsxFactoryEntity: notImplemented,
   getJsxFragmentFactoryEntity: notImplemented,
   isBindingCapturedByNode: notImplemented,
@@ -134240,7 +134237,7 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
           expression,
           /*includeBigInt*/
           false
-        ) && !isEntityNameExpression(expression)) {
+        )) {
           context.tracker.reportInferenceFallback(prop.name);
           result = false;
         }
@@ -134254,21 +134251,6 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
     for (const prop of objectLiteral.properties) {
       Debug.assert(!isShorthandPropertyAssignment(prop) && !isSpreadAssignment(prop));
       const name = prop.name;
-      if (prop.name.kind === 167 /* ComputedPropertyName */) {
-        if (!resolver.isNonNarrowedBindableName(prop.name)) {
-          context.tracker.reportInferenceFallback(prop.name);
-        } else if (isEntityNameExpression(prop.name.expression)) {
-          const visibilityResult = resolver.isEntityNameVisible(
-            prop.name.expression,
-            context.enclosingDeclaration,
-            /*shouldComputeAliasToMakeVisible*/
-            false
-          );
-          if (visibilityResult.accessibility !== 0 /* Accessible */) {
-            context.tracker.reportInferenceFallback(prop.name);
-          }
-        }
-      }
       switch (prop.kind) {
         case 174 /* MethodDeclaration */:
           canInferObjectLiteral = !!typeFromObjectLiteralMethod(prop, name, context) && canInferObjectLiteral;
@@ -149423,6 +149405,16 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
     const sourceFile = getValidSourceFile(fileName);
     return ts_InlayHints_exports.provideInlayHints(getInlayHintsContext(sourceFile, span, preferences));
   }
+  function mapCode2(sourceFile, contents, focusLocations, formatOptions, preferences) {
+    return ts_MapCode_exports.mapCode(
+      syntaxTreeCache.getCurrentSourceFile(sourceFile),
+      contents,
+      focusLocations,
+      host,
+      ts_formatting_exports.getFormatContext(formatOptions, host),
+      preferences
+    );
+  }
   const ls = {
     dispose,
     cleanupSemanticCache,
@@ -149493,7 +149485,8 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
     uncommentSelection,
     provideInlayHints: provideInlayHints2,
     getSupportedCodeFixes,
-    getPasteEdits
+    getPasteEdits,
+    mapCode: mapCode2
   };
   switch (languageServiceMode) {
     case 0 /* Semantic */:
@@ -158080,6 +158073,7 @@ var errorCodes47 = [
   Diagnostics.Property_must_have_an_explicit_type_annotation_with_isolatedDeclarations.code,
   Diagnostics.Expression_type_can_t_be_inferred_with_isolatedDeclarations.code,
   Diagnostics.Binding_elements_can_t_be_exported_directly_with_isolatedDeclarations.code,
+  Diagnostics.Computed_property_names_on_class_or_object_literals_cannot_be_inferred_with_isolatedDeclarations.code,
   Diagnostics.Computed_properties_must_be_number_or_string_literals_variables_or_dotted_expressions_with_isolatedDeclarations.code,
   Diagnostics.Enum_member_initializers_must_be_computable_without_references_to_external_symbols_with_isolatedDeclarations.code,
   Diagnostics.Extends_clause_can_t_contain_an_expression_with_isolatedDeclarations.code,
@@ -158090,6 +158084,7 @@ var errorCodes47 = [
   Diagnostics.Only_const_arrays_can_be_inferred_with_isolatedDeclarations.code,
   Diagnostics.Assigning_properties_to_functions_without_declaring_them_is_not_supported_with_isolatedDeclarations_Add_an_explicit_declaration_for_the_properties_assigned_to_this_function.code,
   Diagnostics.Declaration_emit_for_this_parameter_requires_implicitly_adding_undefined_to_it_s_type_This_is_not_supported_with_isolatedDeclarations.code,
+  Diagnostics.Type_containing_private_name_0_can_t_be_used_with_isolatedDeclarations.code,
   Diagnostics.Add_satisfies_and_a_type_assertion_to_this_expression_satisfies_T_as_T_to_make_the_type_explicit.code
 ];
 var canHaveTypeAnnotation = /* @__PURE__ */ new Set([
@@ -158250,7 +158245,7 @@ function withContext(context, typePrintMode, cb) {
     if (findAncestor(targetNode, isEnumMember)) {
       return void 0;
     }
-    if (isExpressionTarget && findAncestor(targetNode, isHeritageClause)) {
+    if (isExpressionTarget && (findAncestor(targetNode, isHeritageClause) || findAncestor(targetNode, isTypeNode))) {
       return void 0;
     }
     if (isSpreadElement(targetNode)) {
@@ -170779,6 +170774,213 @@ function getRightHandSideOfAssignment(rightHandSide) {
   }
 }
 
+// src/services/_namespaces/ts.MapCode.ts
+var ts_MapCode_exports = {};
+__export(ts_MapCode_exports, {
+  mapCode: () => mapCode
+});
+
+// src/services/mapCode.ts
+function mapCode(sourceFile, contents, focusLocations, host, formatContext, preferences) {
+  return ts_textChanges_exports.ChangeTracker.with(
+    { host, formatContext, preferences },
+    (changeTracker) => {
+      const parsed = contents.map((c) => parse(sourceFile, c));
+      const flattenedLocations = focusLocations && flatten(focusLocations);
+      for (const nodes of parsed) {
+        placeNodeGroup(
+          sourceFile,
+          changeTracker,
+          nodes,
+          flattenedLocations
+        );
+      }
+    }
+  );
+}
+function parse(sourceFile, content) {
+  const nodeKinds = [
+    {
+      parse: () => createSourceFile(
+        "__mapcode_content_nodes.ts",
+        content,
+        sourceFile.languageVersion,
+        /*setParentNodes*/
+        true,
+        sourceFile.scriptKind
+      ),
+      body: (sf) => sf.statements
+    },
+    {
+      parse: () => createSourceFile(
+        "__mapcode_class_content_nodes.ts",
+        `class __class {
+${content}
+}`,
+        sourceFile.languageVersion,
+        /*setParentNodes*/
+        true,
+        sourceFile.scriptKind
+      ),
+      body: (cw) => cw.statements[0].members
+    }
+  ];
+  const parsedNodes = [];
+  for (const { parse: parse2, body: body2 } of nodeKinds) {
+    const sourceFile2 = parse2();
+    const bod = body2(sourceFile2);
+    if (bod.length && sourceFile2.parseDiagnostics.length === 0) {
+      return bod;
+    } else if (bod.length) {
+      parsedNodes.push({ sourceFile: sourceFile2, body: bod });
+    }
+  }
+  const { body } = parsedNodes.sort(
+    (a, b) => a.sourceFile.parseDiagnostics.length - b.sourceFile.parseDiagnostics.length
+  )[0];
+  return body;
+}
+function placeNodeGroup(originalFile, changeTracker, changes, focusLocations) {
+  if (isClassElement(changes[0]) || isTypeElement(changes[0])) {
+    placeClassNodeGroup(
+      originalFile,
+      changeTracker,
+      changes,
+      focusLocations
+    );
+  } else {
+    placeStatements(
+      originalFile,
+      changeTracker,
+      changes,
+      focusLocations
+    );
+  }
+}
+function placeClassNodeGroup(originalFile, changeTracker, changes, focusLocations) {
+  let classOrInterface;
+  if (!focusLocations || !focusLocations.length) {
+    classOrInterface = find(originalFile.statements, or(isClassLike, isInterfaceDeclaration));
+  } else {
+    classOrInterface = forEach(focusLocations, (location) => findAncestor(
+      getTokenAtPosition(originalFile, location.start),
+      or(isClassLike, isInterfaceDeclaration)
+    ));
+  }
+  if (!classOrInterface) {
+    return;
+  }
+  const firstMatch = classOrInterface.members.find((member) => changes.some((change) => matchNode(change, member)));
+  if (firstMatch) {
+    const lastMatch = findLast(
+      classOrInterface.members,
+      (member) => changes.some((change) => matchNode(change, member))
+    );
+    forEach(changes, wipeNode);
+    changeTracker.replaceNodeRangeWithNodes(
+      originalFile,
+      firstMatch,
+      lastMatch,
+      changes
+    );
+    return;
+  }
+  forEach(changes, wipeNode);
+  changeTracker.insertNodesAfter(
+    originalFile,
+    classOrInterface.members[classOrInterface.members.length - 1],
+    changes
+  );
+}
+function placeStatements(originalFile, changeTracker, changes, focusLocations) {
+  if (!(focusLocations == null ? void 0 : focusLocations.length)) {
+    changeTracker.insertNodesAtEndOfFile(
+      originalFile,
+      changes,
+      /*blankLineBetween*/
+      false
+    );
+    return;
+  }
+  for (const location of focusLocations) {
+    const scope = findAncestor(
+      getTokenAtPosition(originalFile, location.start),
+      (block) => or(isBlock, isSourceFile)(block) && some(block.statements, (origStmt) => changes.some((newStmt) => matchNode(newStmt, origStmt)))
+    );
+    if (scope) {
+      const start = scope.statements.find((stmt) => changes.some((node) => matchNode(node, stmt)));
+      if (start) {
+        const end = findLast(scope.statements, (stmt) => changes.some((node) => matchNode(node, stmt)));
+        forEach(changes, wipeNode);
+        changeTracker.replaceNodeRangeWithNodes(
+          originalFile,
+          start,
+          end,
+          changes
+        );
+        return;
+      }
+    }
+  }
+  let scopeStatements = originalFile.statements;
+  for (const location of focusLocations) {
+    const block = findAncestor(
+      getTokenAtPosition(originalFile, location.start),
+      isBlock
+    );
+    if (block) {
+      scopeStatements = block.statements;
+      break;
+    }
+  }
+  forEach(changes, wipeNode);
+  changeTracker.insertNodesAfter(
+    originalFile,
+    scopeStatements[scopeStatements.length - 1],
+    changes
+  );
+}
+function matchNode(a, b) {
+  var _a, _b, _c, _d, _e, _f;
+  if (a.kind !== b.kind) {
+    return false;
+  }
+  if (a.kind === 176 /* Constructor */) {
+    return a.kind === b.kind;
+  }
+  if (isNamedDeclaration(a) && isNamedDeclaration(b)) {
+    return a.name.getText() === b.name.getText();
+  }
+  if (isIfStatement(a) && isIfStatement(b)) {
+    return a.expression.getText() === b.expression.getText();
+  }
+  if (isWhileStatement(a) && isWhileStatement(b)) {
+    return a.expression.getText() === b.expression.getText();
+  }
+  if (isForStatement(a) && isForStatement(b)) {
+    return ((_a = a.initializer) == null ? void 0 : _a.getText()) === ((_b = b.initializer) == null ? void 0 : _b.getText()) && ((_c = a.incrementor) == null ? void 0 : _c.getText()) === ((_d = b.incrementor) == null ? void 0 : _d.getText()) && ((_e = a.condition) == null ? void 0 : _e.getText()) === ((_f = b.condition) == null ? void 0 : _f.getText());
+  }
+  if (isForInOrOfStatement(a) && isForInOrOfStatement(b)) {
+    return a.expression.getText() === b.expression.getText() && a.initializer.getText() === b.initializer.getText();
+  }
+  if (isLabeledStatement(a) && isLabeledStatement(b)) {
+    return a.label.getText() === b.label.getText();
+  }
+  if (a.getText() === b.getText()) {
+    return true;
+  }
+  return false;
+}
+function wipeNode(node) {
+  resetNodePositions(node);
+  node.parent = void 0;
+}
+function resetNodePositions(node) {
+  node.pos = -1;
+  node.end = -1;
+  node.forEachChild(resetNodePositions);
+}
+
 // src/services/_namespaces/ts.OrganizeImports.ts
 var ts_OrganizeImports_exports = {};
 __export(ts_OrganizeImports_exports, {
@@ -177566,6 +177768,7 @@ __export(ts_exports2, {
   LexicalEnvironmentFlags: () => LexicalEnvironmentFlags,
   ListFormat: () => ListFormat,
   LogLevel: () => LogLevel,
+  MapCode: () => ts_MapCode_exports,
   MemberOverrideStatus: () => MemberOverrideStatus,
   ModifierFlags: () => ModifierFlags,
   ModuleDetectionKind: () => ModuleDetectionKind,
@@ -180747,6 +180950,7 @@ var CommandTypes = /* @__PURE__ */ ((CommandTypes2) => {
   CommandTypes2["ProvideCallHierarchyOutgoingCalls"] = "provideCallHierarchyOutgoingCalls";
   CommandTypes2["ProvideInlayHints"] = "provideInlayHints";
   CommandTypes2["WatchChange"] = "watchChange";
+  CommandTypes2["MapCode"] = "mapCode";
   return CommandTypes2;
 })(CommandTypes || {});
 var WatchFileKind2 = /* @__PURE__ */ ((WatchFileKind3) => {
@@ -188687,6 +188891,9 @@ var Session3 = class _Session {
       },
       ["provideInlayHints" /* ProvideInlayHints */]: (request) => {
         return this.requiredResponse(this.provideInlayHints(request.arguments));
+      },
+      ["mapCode" /* MapCode */]: (request) => {
+        return this.requiredResponse(this.mapCode(request.arguments));
       }
     }));
     this.host = opts.host;
@@ -189549,6 +189756,25 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
       };
     });
   }
+  mapCode(args) {
+    var _a;
+    const formatOptions = this.getHostFormatOptions();
+    const preferences = this.getHostPreferences();
+    const { file, languageService } = this.getFileAndLanguageServiceForSyntacticOperation(args);
+    const scriptInfo = this.projectService.getScriptInfoForNormalizedPath(file);
+    const focusLocations = (_a = args.mapping.focusLocations) == null ? void 0 : _a.map((spans) => {
+      return spans.map((loc) => {
+        const start = scriptInfo.lineOffsetToPosition(loc.start.line, loc.start.offset);
+        const end = scriptInfo.lineOffsetToPosition(loc.end.line, loc.end.offset);
+        return {
+          start,
+          length: end - start
+        };
+      });
+    });
+    const changes = languageService.mapCode(file, args.mapping.contents, focusLocations, formatOptions, preferences);
+    return this.mapTextChangesToCodeEdits(changes);
+  }
   setCompilerOptionsForInferredProjects(args) {
     this.projectService.setCompilerOptionsForInferredProjects(args.options, args.projectRootPath);
   }
@@ -191973,6 +192199,7 @@ if (typeof console !== "undefined") {
   LexicalEnvironmentFlags,
   ListFormat,
   LogLevel,
+  MapCode,
   MemberOverrideStatus,
   ModifierFlags,
   ModuleDetectionKind,

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.5.0-dev.20240522",
+    "version": "5.5.0-dev.20240523",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -39,6 +39,8 @@
         "!**/.gitattributes"
     ],
     "devDependencies": {
+        "@dprint/formatter": "^0.3.0",
+        "@dprint/typescript": "0.90.5",
         "@esfx/canceltoken": "^1.0.0",
         "@octokit/rest": "^20.1.1",
         "@types/chai": "^4.3.16",
@@ -110,5 +112,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "9370347f5b6bc72902c8d71ac80d20738849dabd"
+    "gitHead": "ddf43cd0e0091057254b1fcfcaf880140dfb7ea1"
 }