@typescript-deploys/pr-build 5.9.0-pr-61589-11 → 5.9.0-pr-61505-58

package/lib/_tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.9";
-var version = `${versionMajorMinor}.0-insiders.20250418`;
+var version = `${versionMajorMinor}.0-insiders.20250502`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -6770,7 +6770,7 @@ var Diagnostics = {
   Property_0_does_not_exist_on_type_1_Try_changing_the_lib_compiler_option_to_include_dom: diag(2812, 1 /* Error */, "Property_0_does_not_exist_on_type_1_Try_changing_the_lib_compiler_option_to_include_dom_2812", "Property '{0}' does not exist on type '{1}'. Try changing the 'lib' compiler option to include 'dom'."),
   Class_declaration_cannot_implement_overload_list_for_0: diag(2813, 1 /* Error */, "Class_declaration_cannot_implement_overload_list_for_0_2813", "Class declaration cannot implement overload list for '{0}'."),
   Function_with_bodies_can_only_merge_with_classes_that_are_ambient: diag(2814, 1 /* Error */, "Function_with_bodies_can_only_merge_with_classes_that_are_ambient_2814", "Function with bodies can only merge with classes that are ambient."),
-  arguments_cannot_be_referenced_in_property_initializers: diag(2815, 1 /* Error */, "arguments_cannot_be_referenced_in_property_initializers_2815", "'arguments' cannot be referenced in property initializers."),
+  arguments_cannot_be_referenced_in_property_initializers_or_class_static_initialization_blocks: diag(2815, 1 /* Error */, "arguments_cannot_be_referenced_in_property_initializers_or_class_static_initialization_blocks_2815", "'arguments' cannot be referenced in property initializers or class static initialization blocks."),
   Cannot_use_this_in_a_static_property_initializer_of_a_decorated_class: diag(2816, 1 /* Error */, "Cannot_use_this_in_a_static_property_initializer_of_a_decorated_class_2816", "Cannot use 'this' in a static property initializer of a decorated class."),
   Property_0_has_no_initializer_and_is_not_definitely_assigned_in_a_class_static_block: diag(2817, 1 /* Error */, "Property_0_has_no_initializer_and_is_not_definitely_assigned_in_a_class_static_block_2817", "Property '{0}' has no initializer and is not definitely assigned in a class static block."),
   Duplicate_identifier_0_Compiler_reserves_name_1_when_emitting_super_references_in_static_initializers: diag(2818, 1 /* Error */, "Duplicate_identifier_0_Compiler_reserves_name_1_when_emitting_super_references_in_static_initializer_2818", "Duplicate identifier '{0}'. Compiler reserves name '{1}' when emitting 'super' references in static initializers."),
@@ -46584,6 +46584,7 @@ function createTypeChecker(host) {
     getNullType: () => nullType,
     getESSymbolType: () => esSymbolType,
     getNeverType: () => neverType,
+    getNonPrimitiveType: () => nonPrimitiveType,
     getOptionalType: () => optionalType,
     getPromiseType: () => getGlobalPromiseType(
       /*reportErrors*/
@@ -47203,6 +47204,9 @@ function createTypeChecker(host) {
   var inferenceContextNodes = [];
   var inferenceContexts = [];
   var inferenceContextCount = 0;
+  var activeTypeMappers = [];
+  var activeTypeMappersCaches = [];
+  var activeTypeMappersCount = 0;
   var emptyStringType = getStringLiteralType("");
   var zeroType = getNumberLiteralType(0);
   var zeroBigIntType = getBigIntLiteralType({ negative: false, base10Value: "0" });
@@ -63282,10 +63286,25 @@ function createTypeChecker(host) {
       error(currentNode, Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
       return errorType;
     }
+    const index = findActiveMapper(mapper);
+    if (index === -1) {
+      pushActiveMapper(mapper);
+    }
+    const key = type.id + getAliasId(aliasSymbol, aliasTypeArguments);
+    const mapperCache = activeTypeMappersCaches[index !== -1 ? index : activeTypeMappersCount - 1];
+    const cached = mapperCache.get(key);
+    if (cached) {
+      return cached;
+    }
     totalInstantiationCount++;
     instantiationCount++;
     instantiationDepth++;
     const result = instantiateTypeWorker(type, mapper, aliasSymbol, aliasTypeArguments);
+    if (index === -1) {
+      popActiveMapper();
+    } else {
+      mapperCache.set(key, result);
+    }
     instantiationDepth--;
     return result;
   }
@@ -65603,6 +65622,36 @@ function createTypeChecker(host) {
             }
           }
         }
+        if (sourceFlags & 134217728 /* TemplateLiteral */) {
+          if (arrayIsEqualTo(source2.texts, target2.texts)) {
+            const sourceTypes = source2.types;
+            const targetTypes = target2.types;
+            result2 = -1 /* True */;
+            for (let i = 0; i < sourceTypes.length; i++) {
+              if (!(result2 &= isRelatedTo(
+                sourceTypes[i],
+                targetTypes[i],
+                3 /* Both */,
+                /*reportErrors*/
+                false
+              ))) {
+                break;
+              }
+            }
+            return result2;
+          }
+        }
+        if (sourceFlags & 268435456 /* StringMapping */) {
+          if (source2.symbol === target2.symbol) {
+            return isRelatedTo(
+              source2.type,
+              target2.type,
+              3 /* Both */,
+              /*reportErrors*/
+              false
+            );
+          }
+        }
         if (!(sourceFlags & 524288 /* Object */)) {
           return 0 /* False */;
         }
@@ -68832,6 +68881,7 @@ function createTypeChecker(host) {
           inference.inferredType = fallbackType && context.compareTypes(fallbackType, getTypeWithThisArgument(instantiatedConstraint, fallbackType)) ? fallbackType : instantiatedConstraint;
         }
       }
+      clearActiveMapperCaches();
     }
     return inference.inferredType;
   }
@@ -70845,31 +70895,15 @@ function createTypeChecker(host) {
       }
       const isRelated = checkDerived ? isTypeDerivedFrom : isTypeSubtypeOf;
       const keyPropertyName = type.flags & 1048576 /* Union */ ? getKeyPropertyName(type) : void 0;
-      let matchedCandidates = [];
-      let narrowedType = mapType(type, (t) => mapType(
-        candidate,
-        (c) => {
-          if (keyPropertyName) {
-            const discriminant = keyPropertyName && getTypeOfPropertyOfType(c, keyPropertyName);
-            if (discriminant && getConstituentTypeForKeyType(type, discriminant) !== t) {
-              return neverType;
-            }
-          }
-          const directlyRelated = checkDerived ? isTypeDerivedFrom(t, c) ? t : isTypeDerivedFrom(c, t) ? c : neverType : isTypeStrictSubtypeOf(t, c) ? t : isTypeStrictSubtypeOf(c, t) ? c : isTypeSubtypeOf(t, c) ? t : isTypeSubtypeOf(c, t) ? c : neverType;
-          if (!(directlyRelated.flags & 131072 /* Never */)) {
-            matchedCandidates = appendIfUnique(matchedCandidates, c);
-          }
-          return directlyRelated;
-        }
-      ));
-      if (matchedCandidates.length !== countTypes(candidate)) {
-        narrowedType = getUnionType([
-          narrowedType,
-          mapType(candidate, (c) => {
-            return !containsType(matchedCandidates, c) ? mapType(type, (t) => maybeTypeOfKind(t, 465829888 /* Instantiable */) && isRelated(c, getBaseConstraintOfType(t) || unknownType) ? getIntersectionType([t, c]) : neverType) : neverType;
-          })
-        ]);
-      }
+      const narrowedType = mapType(candidate, (c) => {
+        const discriminant = keyPropertyName && getTypeOfPropertyOfType(c, keyPropertyName);
+        const matching = discriminant && getConstituentTypeForKeyType(type, discriminant);
+        const directlyRelated = mapType(
+          matching || type,
+          checkDerived ? (t) => isTypeDerivedFrom(t, c) ? t : isTypeDerivedFrom(c, t) ? c : neverType : (t) => isTypeStrictSubtypeOf(t, c) ? t : isTypeStrictSubtypeOf(c, t) ? c : isTypeSubtypeOf(t, c) ? t : isTypeSubtypeOf(c, t) ? c : neverType
+        );
+        return directlyRelated.flags & 131072 /* Never */ ? mapType(type, (t) => maybeTypeOfKind(t, 465829888 /* Instantiable */) && isRelated(c, getBaseConstraintOfType(t) || unknownType) ? getIntersectionType([t, c]) : neverType) : directlyRelated;
+      });
       return !(narrowedType.flags & 131072 /* Never */) ? narrowedType : isTypeSubtypeOf(candidate, type) ? candidate : isTypeAssignableTo(type, candidate) ? type : isTypeAssignableTo(candidate, type) ? candidate : getIntersectionType([type, candidate]);
     }
     function narrowTypeByCallExpression(type, callExpression, assumeTrue) {
@@ -71587,8 +71621,12 @@ function createTypeChecker(host) {
   function checkIdentifierCalculateNodeCheckFlags(node, symbol) {
     if (isThisInTypeQuery(node)) return;
     if (symbol === argumentsSymbol) {
-      if (isInPropertyInitializerOrClassStaticBlock(node)) {
-        error(node, Diagnostics.arguments_cannot_be_referenced_in_property_initializers);
+      if (isInPropertyInitializerOrClassStaticBlock(
+        node,
+        /*ignoreArrowFunctions*/
+        true
+      )) {
+        error(node, Diagnostics.arguments_cannot_be_referenced_in_property_initializers_or_class_static_initialization_blocks);
         return;
       }
       let container = getContainingFunction(node);
@@ -73109,6 +73147,27 @@ function createTypeChecker(host) {
       }
     }
   }
+  function pushActiveMapper(mapper) {
+    activeTypeMappers[activeTypeMappersCount] = mapper;
+    activeTypeMappersCaches[activeTypeMappersCount] = /* @__PURE__ */ new Map();
+    activeTypeMappersCount++;
+  }
+  function popActiveMapper() {
+    activeTypeMappersCount--;
+  }
+  function findActiveMapper(mapper) {
+    for (let i = activeTypeMappersCount - 1; i >= 0; i--) {
+      if (mapper === activeTypeMappers[i]) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  function clearActiveMapperCaches() {
+    for (let i = activeTypeMappersCount - 1; i >= 0; i--) {
+      activeTypeMappersCaches[i].clear();
+    }
+  }
   function getContextualImportAttributeType(node) {
     return getTypeOfPropertyOfContextualType(getGlobalImportAttributesType(
       /*reportErrors*/
@@ -74868,31 +74927,21 @@ function createTypeChecker(host) {
       addRelatedInfo(diagnosticMessage, createDiagnosticForNode(valueDeclaration, Diagnostics._0_is_declared_here, declarationName));
     }
   }
-  function isInPropertyInitializerOrClassStaticBlock(node) {
+  function isInPropertyInitializerOrClassStaticBlock(node, ignoreArrowFunctions) {
     return !!findAncestor(node, (node2) => {
       switch (node2.kind) {
         case 172 /* PropertyDeclaration */:
+        case 175 /* ClassStaticBlockDeclaration */:
           return true;
-        case 303 /* PropertyAssignment */:
-        case 174 /* MethodDeclaration */:
-        case 177 /* GetAccessor */:
-        case 178 /* SetAccessor */:
-        case 305 /* SpreadAssignment */:
-        case 167 /* ComputedPropertyName */:
-        case 239 /* TemplateSpan */:
-        case 294 /* JsxExpression */:
-        case 291 /* JsxAttribute */:
-        case 292 /* JsxAttributes */:
-        case 293 /* JsxSpreadAttribute */:
-        case 286 /* JsxOpeningElement */:
-        case 233 /* ExpressionWithTypeArguments */:
-        case 298 /* HeritageClause */:
-          return false;
+        case 186 /* TypeQuery */:
+        case 287 /* JsxClosingElement */:
+          return "quit";
         case 219 /* ArrowFunction */:
-        case 244 /* ExpressionStatement */:
-          return isBlock(node2.parent) && isClassStaticBlockDeclaration(node2.parent.parent) ? true : "quit";
+          return ignoreArrowFunctions ? false : "quit";
+        case 241 /* Block */:
+          return isFunctionLikeDeclaration(node2.parent) && node2.parent.kind !== 219 /* ArrowFunction */ ? "quit" : false;
         default:
-          return isExpressionNode(node2) ? false : "quit";
+          return false;
       }
     });
   }

package/lib/typescript.d.ts

@@ -6314,6 +6314,10 @@ declare namespace ts {
          * is `never`. Instead, use `type.flags & TypeFlags.Never`.
          */
         getNeverType(): Type;
+        /**
+         * Gets the intrinsic `object` type.
+         */
+        getNonPrimitiveType(): Type;
         /**
          * Returns true if the "source" type is assignable to the "target" type.
          *

package/lib/typescript.js

@@ -2285,7 +2285,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.9";
-var version = `${versionMajorMinor}.0-insiders.20250418`;
+var version = `${versionMajorMinor}.0-insiders.20250502`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -10156,7 +10156,7 @@ var Diagnostics = {
   Property_0_does_not_exist_on_type_1_Try_changing_the_lib_compiler_option_to_include_dom: diag(2812, 1 /* Error */, "Property_0_does_not_exist_on_type_1_Try_changing_the_lib_compiler_option_to_include_dom_2812", "Property '{0}' does not exist on type '{1}'. Try changing the 'lib' compiler option to include 'dom'."),
   Class_declaration_cannot_implement_overload_list_for_0: diag(2813, 1 /* Error */, "Class_declaration_cannot_implement_overload_list_for_0_2813", "Class declaration cannot implement overload list for '{0}'."),
   Function_with_bodies_can_only_merge_with_classes_that_are_ambient: diag(2814, 1 /* Error */, "Function_with_bodies_can_only_merge_with_classes_that_are_ambient_2814", "Function with bodies can only merge with classes that are ambient."),
-  arguments_cannot_be_referenced_in_property_initializers: diag(2815, 1 /* Error */, "arguments_cannot_be_referenced_in_property_initializers_2815", "'arguments' cannot be referenced in property initializers."),
+  arguments_cannot_be_referenced_in_property_initializers_or_class_static_initialization_blocks: diag(2815, 1 /* Error */, "arguments_cannot_be_referenced_in_property_initializers_or_class_static_initialization_blocks_2815", "'arguments' cannot be referenced in property initializers or class static initialization blocks."),
   Cannot_use_this_in_a_static_property_initializer_of_a_decorated_class: diag(2816, 1 /* Error */, "Cannot_use_this_in_a_static_property_initializer_of_a_decorated_class_2816", "Cannot use 'this' in a static property initializer of a decorated class."),
   Property_0_has_no_initializer_and_is_not_definitely_assigned_in_a_class_static_block: diag(2817, 1 /* Error */, "Property_0_has_no_initializer_and_is_not_definitely_assigned_in_a_class_static_block_2817", "Property '{0}' has no initializer and is not definitely assigned in a class static block."),
   Duplicate_identifier_0_Compiler_reserves_name_1_when_emitting_super_references_in_static_initializers: diag(2818, 1 /* Error */, "Duplicate_identifier_0_Compiler_reserves_name_1_when_emitting_super_references_in_static_initializer_2818", "Duplicate identifier '{0}'. Compiler reserves name '{1}' when emitting 'super' references in static initializers."),
@@ -51194,6 +51194,7 @@ function createTypeChecker(host) {
     getNullType: () => nullType,
     getESSymbolType: () => esSymbolType,
     getNeverType: () => neverType,
+    getNonPrimitiveType: () => nonPrimitiveType,
     getOptionalType: () => optionalType,
     getPromiseType: () => getGlobalPromiseType(
       /*reportErrors*/
@@ -51813,6 +51814,9 @@ function createTypeChecker(host) {
   var inferenceContextNodes = [];
   var inferenceContexts = [];
   var inferenceContextCount = 0;
+  var activeTypeMappers = [];
+  var activeTypeMappersCaches = [];
+  var activeTypeMappersCount = 0;
   var emptyStringType = getStringLiteralType("");
   var zeroType = getNumberLiteralType(0);
   var zeroBigIntType = getBigIntLiteralType({ negative: false, base10Value: "0" });
@@ -67892,10 +67896,25 @@ function createTypeChecker(host) {
       error2(currentNode, Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
       return errorType;
     }
+    const index = findActiveMapper(mapper);
+    if (index === -1) {
+      pushActiveMapper(mapper);
+    }
+    const key = type.id + getAliasId(aliasSymbol, aliasTypeArguments);
+    const mapperCache = activeTypeMappersCaches[index !== -1 ? index : activeTypeMappersCount - 1];
+    const cached = mapperCache.get(key);
+    if (cached) {
+      return cached;
+    }
     totalInstantiationCount++;
     instantiationCount++;
     instantiationDepth++;
     const result = instantiateTypeWorker(type, mapper, aliasSymbol, aliasTypeArguments);
+    if (index === -1) {
+      popActiveMapper();
+    } else {
+      mapperCache.set(key, result);
+    }
     instantiationDepth--;
     return result;
   }
@@ -70213,6 +70232,36 @@ function createTypeChecker(host) {
             }
           }
         }
+        if (sourceFlags & 134217728 /* TemplateLiteral */) {
+          if (arrayIsEqualTo(source2.texts, target2.texts)) {
+            const sourceTypes = source2.types;
+            const targetTypes = target2.types;
+            result2 = -1 /* True */;
+            for (let i = 0; i < sourceTypes.length; i++) {
+              if (!(result2 &= isRelatedTo(
+                sourceTypes[i],
+                targetTypes[i],
+                3 /* Both */,
+                /*reportErrors*/
+                false
+              ))) {
+                break;
+              }
+            }
+            return result2;
+          }
+        }
+        if (sourceFlags & 268435456 /* StringMapping */) {
+          if (source2.symbol === target2.symbol) {
+            return isRelatedTo(
+              source2.type,
+              target2.type,
+              3 /* Both */,
+              /*reportErrors*/
+              false
+            );
+          }
+        }
         if (!(sourceFlags & 524288 /* Object */)) {
           return 0 /* False */;
         }
@@ -73442,6 +73491,7 @@ function createTypeChecker(host) {
           inference.inferredType = fallbackType && context.compareTypes(fallbackType, getTypeWithThisArgument(instantiatedConstraint, fallbackType)) ? fallbackType : instantiatedConstraint;
         }
       }
+      clearActiveMapperCaches();
     }
     return inference.inferredType;
   }
@@ -75455,31 +75505,15 @@ function createTypeChecker(host) {
       }
       const isRelated = checkDerived ? isTypeDerivedFrom : isTypeSubtypeOf;
       const keyPropertyName = type.flags & 1048576 /* Union */ ? getKeyPropertyName(type) : void 0;
-      let matchedCandidates = [];
-      let narrowedType = mapType(type, (t) => mapType(
-        candidate,
-        (c) => {
-          if (keyPropertyName) {
-            const discriminant = keyPropertyName && getTypeOfPropertyOfType(c, keyPropertyName);
-            if (discriminant && getConstituentTypeForKeyType(type, discriminant) !== t) {
-              return neverType;
-            }
-          }
-          const directlyRelated = checkDerived ? isTypeDerivedFrom(t, c) ? t : isTypeDerivedFrom(c, t) ? c : neverType : isTypeStrictSubtypeOf(t, c) ? t : isTypeStrictSubtypeOf(c, t) ? c : isTypeSubtypeOf(t, c) ? t : isTypeSubtypeOf(c, t) ? c : neverType;
-          if (!(directlyRelated.flags & 131072 /* Never */)) {
-            matchedCandidates = appendIfUnique(matchedCandidates, c);
-          }
-          return directlyRelated;
-        }
-      ));
-      if (matchedCandidates.length !== countTypes(candidate)) {
-        narrowedType = getUnionType([
-          narrowedType,
-          mapType(candidate, (c) => {
-            return !containsType(matchedCandidates, c) ? mapType(type, (t) => maybeTypeOfKind(t, 465829888 /* Instantiable */) && isRelated(c, getBaseConstraintOfType(t) || unknownType) ? getIntersectionType([t, c]) : neverType) : neverType;
-          })
-        ]);
-      }
+      const narrowedType = mapType(candidate, (c) => {
+        const discriminant = keyPropertyName && getTypeOfPropertyOfType(c, keyPropertyName);
+        const matching = discriminant && getConstituentTypeForKeyType(type, discriminant);
+        const directlyRelated = mapType(
+          matching || type,
+          checkDerived ? (t) => isTypeDerivedFrom(t, c) ? t : isTypeDerivedFrom(c, t) ? c : neverType : (t) => isTypeStrictSubtypeOf(t, c) ? t : isTypeStrictSubtypeOf(c, t) ? c : isTypeSubtypeOf(t, c) ? t : isTypeSubtypeOf(c, t) ? c : neverType
+        );
+        return directlyRelated.flags & 131072 /* Never */ ? mapType(type, (t) => maybeTypeOfKind(t, 465829888 /* Instantiable */) && isRelated(c, getBaseConstraintOfType(t) || unknownType) ? getIntersectionType([t, c]) : neverType) : directlyRelated;
+      });
       return !(narrowedType.flags & 131072 /* Never */) ? narrowedType : isTypeSubtypeOf(candidate, type) ? candidate : isTypeAssignableTo(type, candidate) ? type : isTypeAssignableTo(candidate, type) ? candidate : getIntersectionType([type, candidate]);
     }
     function narrowTypeByCallExpression(type, callExpression, assumeTrue) {
@@ -76197,8 +76231,12 @@ function createTypeChecker(host) {
   function checkIdentifierCalculateNodeCheckFlags(node, symbol) {
     if (isThisInTypeQuery(node)) return;
     if (symbol === argumentsSymbol) {
-      if (isInPropertyInitializerOrClassStaticBlock(node)) {
-        error2(node, Diagnostics.arguments_cannot_be_referenced_in_property_initializers);
+      if (isInPropertyInitializerOrClassStaticBlock(
+        node,
+        /*ignoreArrowFunctions*/
+        true
+      )) {
+        error2(node, Diagnostics.arguments_cannot_be_referenced_in_property_initializers_or_class_static_initialization_blocks);
         return;
       }
       let container = getContainingFunction(node);
@@ -77719,6 +77757,27 @@ function createTypeChecker(host) {
       }
     }
   }
+  function pushActiveMapper(mapper) {
+    activeTypeMappers[activeTypeMappersCount] = mapper;
+    activeTypeMappersCaches[activeTypeMappersCount] = /* @__PURE__ */ new Map();
+    activeTypeMappersCount++;
+  }
+  function popActiveMapper() {
+    activeTypeMappersCount--;
+  }
+  function findActiveMapper(mapper) {
+    for (let i = activeTypeMappersCount - 1; i >= 0; i--) {
+      if (mapper === activeTypeMappers[i]) {
+        return i;
+      }
+    }
+    return -1;
+  }
+  function clearActiveMapperCaches() {
+    for (let i = activeTypeMappersCount - 1; i >= 0; i--) {
+      activeTypeMappersCaches[i].clear();
+    }
+  }
   function getContextualImportAttributeType(node) {
     return getTypeOfPropertyOfContextualType(getGlobalImportAttributesType(
       /*reportErrors*/
@@ -79478,31 +79537,21 @@ function createTypeChecker(host) {
       addRelatedInfo(diagnosticMessage, createDiagnosticForNode(valueDeclaration, Diagnostics._0_is_declared_here, declarationName));
     }
   }
-  function isInPropertyInitializerOrClassStaticBlock(node) {
+  function isInPropertyInitializerOrClassStaticBlock(node, ignoreArrowFunctions) {
     return !!findAncestor(node, (node2) => {
       switch (node2.kind) {
         case 172 /* PropertyDeclaration */:
+        case 175 /* ClassStaticBlockDeclaration */:
           return true;
-        case 303 /* PropertyAssignment */:
-        case 174 /* MethodDeclaration */:
-        case 177 /* GetAccessor */:
-        case 178 /* SetAccessor */:
-        case 305 /* SpreadAssignment */:
-        case 167 /* ComputedPropertyName */:
-        case 239 /* TemplateSpan */:
-        case 294 /* JsxExpression */:
-        case 291 /* JsxAttribute */:
-        case 292 /* JsxAttributes */:
-        case 293 /* JsxSpreadAttribute */:
-        case 286 /* JsxOpeningElement */:
-        case 233 /* ExpressionWithTypeArguments */:
-        case 298 /* HeritageClause */:
-          return false;
+        case 186 /* TypeQuery */:
+        case 287 /* JsxClosingElement */:
+          return "quit";
         case 219 /* ArrowFunction */:
-        case 244 /* ExpressionStatement */:
-          return isBlock(node2.parent) && isClassStaticBlockDeclaration(node2.parent.parent) ? true : "quit";
+          return ignoreArrowFunctions ? false : "quit";
+        case 241 /* Block */:
+          return isFunctionLikeDeclaration(node2.parent) && node2.parent.kind !== 219 /* ArrowFunction */ ? "quit" : false;
         default:
-          return isExpressionNode(node2) ? false : "quit";
+          return false;
       }
     });
   }
@@ -172772,7 +172821,7 @@ var Core;
       /*useLocalSymbolForExportSpecifier*/
       !isForRenameWithPrefixAndSuffixText(options)
     ) || originalSymbol;
-    const searchMeaning = node ? getIntersectingMeaningFromDeclarations(node, symbol) : 7 /* All */;
+    const searchMeaning = node && options.use !== 2 /* Rename */ ? getIntersectingMeaningFromDeclarations(node, symbol) : 7 /* All */;
     const result = [];
     const state = new State(sourceFiles, sourceFilesSet, node ? getSpecialSearchKind(node) : 0 /* None */, checker, cancellationToken, searchMeaning, options, result);
     const exportSpecifier = !isForRenameWithPrefixAndSuffixText(options) || !symbol.declarations ? void 0 : find(symbol.declarations, isExportSpecifier);

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.9.0-pr-61589-11",
+  "version": "5.9.0-pr-61505-58",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [