@typescript-deploys/pr-build 6.0.0-pr-62825-9 → 6.0.0-pr-62243-37

package/lib/_tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "6.0";
-var version = `${versionMajorMinor}.0-insiders.20251205`;
+var version = `${versionMajorMinor}.0-insiders.20251208`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -14267,12 +14267,15 @@ function forEachYieldExpression(body, visitor) {
   function traverse(node) {
     switch (node.kind) {
       case 230 /* YieldExpression */:
-        visitor(node);
+        const value = visitor(node);
+        if (value) {
+          return value;
+        }
         const operand = node.expression;
-        if (operand) {
-          traverse(operand);
+        if (!operand) {
+          return;
         }
-        return;
+        return traverse(operand);
       case 267 /* EnumDeclaration */:
       case 265 /* InterfaceDeclaration */:
       case 268 /* ModuleDeclaration */:
@@ -14281,11 +14284,10 @@ function forEachYieldExpression(body, visitor) {
       default:
         if (isFunctionLike(node)) {
           if (node.name && node.name.kind === 168 /* ComputedPropertyName */) {
-            traverse(node.name.expression);
-            return;
+            return traverse(node.name.expression);
           }
         } else if (!isPartOfTypeNode(node)) {
-          forEachChild(node, traverse);
+          return forEachChild(node, traverse);
         }
     }
   }
@@ -19129,7 +19131,7 @@ function hasContextSensitiveParameters(node) {
     if (node.kind !== 220 /* ArrowFunction */) {
       const parameter = firstOrUndefined(node.parameters);
       if (!(parameter && parameterIsThisKeyword(parameter))) {
-        return true;
+        return !!(node.flags & 256 /* ContainsThis */);
       }
     }
   }
@@ -42683,6 +42685,7 @@ function createBinder() {
       const saveExceptionTarget = currentExceptionTarget;
       const saveActiveLabelList = activeLabelList;
       const saveHasExplicitReturn = hasExplicitReturn;
+      const saveSeenThisKeyword = seenThisKeyword;
       const isImmediatelyInvoked = containerFlags & 16 /* IsFunctionExpression */ && !hasSyntacticModifier(node, 1024 /* Async */) && !node.asteriskToken && !!getImmediatelyInvokedFunctionExpression(node) || node.kind === 176 /* ClassStaticBlockDeclaration */;
       if (!isImmediatelyInvoked) {
         currentFlow = createFlowNode(
@@ -42702,13 +42705,17 @@ function createBinder() {
       currentContinueTarget = void 0;
       activeLabelList = void 0;
       hasExplicitReturn = false;
+      seenThisKeyword = false;
       bindChildren(node);
-      node.flags &= ~5632 /* ReachabilityAndEmitFlags */;
+      node.flags &= ~(5632 /* ReachabilityAndEmitFlags */ | 256 /* ContainsThis */);
       if (!(currentFlow.flags & 1 /* Unreachable */) && containerFlags & 8 /* IsFunctionLike */ && nodeIsPresent(node.body)) {
         node.flags |= 512 /* HasImplicitReturn */;
         if (hasExplicitReturn) node.flags |= 1024 /* HasExplicitReturn */;
         node.endFlowNode = currentFlow;
       }
+      if (seenThisKeyword) {
+        node.flags |= 256 /* ContainsThis */;
+      }
       if (node.kind === 308 /* SourceFile */) {
         node.flags |= emitFlags;
         node.endFlowNode = currentFlow;
@@ -42729,11 +42736,14 @@ function createBinder() {
       currentExceptionTarget = saveExceptionTarget;
       activeLabelList = saveActiveLabelList;
       hasExplicitReturn = saveHasExplicitReturn;
+      seenThisKeyword = node.kind === 220 /* ArrowFunction */ ? saveSeenThisKeyword || seenThisKeyword : saveSeenThisKeyword;
     } else if (containerFlags & 64 /* IsInterface */) {
+      const saveSeenThisKeyword = seenThisKeyword;
       seenThisKeyword = false;
       bindChildren(node);
       Debug.assertNotNode(node, isIdentifier);
       node.flags = seenThisKeyword ? node.flags | 256 /* ContainsThis */ : node.flags & ~256 /* ContainsThis */;
+      seenThisKeyword = saveSeenThisKeyword;
     } else {
       bindChildren(node);
     }
@@ -44213,6 +44223,9 @@ function createBinder() {
         }
       // falls through
       case 110 /* ThisKeyword */:
+        if (node.kind === 110 /* ThisKeyword */) {
+          seenThisKeyword = true;
+        }
         if (currentFlow && (isExpression(node) || parent.kind === 305 /* ShorthandPropertyAssignment */)) {
           node.flowNode = currentFlow;
         }
@@ -45080,6 +45093,8 @@ function getContainerFlags(node) {
     // falls through
     case 177 /* Constructor */:
     case 263 /* FunctionDeclaration */:
+    case 176 /* ClassStaticBlockDeclaration */:
+      return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */;
     case 174 /* MethodSignature */:
     case 180 /* CallSignature */:
     case 324 /* JSDocSignature */:
@@ -45087,17 +45102,14 @@ function getContainerFlags(node) {
     case 185 /* FunctionType */:
     case 181 /* ConstructSignature */:
     case 186 /* ConstructorType */:
-    case 176 /* ClassStaticBlockDeclaration */:
-      return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */;
+      return 1 /* IsContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */;
     case 352 /* JSDocImportTag */:
-      return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */;
+      return 1 /* IsContainer */ | 32 /* HasLocals */;
     case 219 /* FunctionExpression */:
     case 220 /* ArrowFunction */:
       return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 16 /* IsFunctionExpression */;
     case 269 /* ModuleBlock */:
       return 4 /* IsControlFlowContainer */;
-    case 173 /* PropertyDeclaration */:
-      return node.initializer ? 4 /* IsControlFlowContainer */ : 0;
     case 300 /* CatchClause */:
     case 249 /* ForStatement */:
     case 250 /* ForInStatement */:
@@ -46585,7 +46597,7 @@ function createTypeChecker(host) {
       if (!node) {
         return void 0;
       }
-      if (contextFlags & 4 /* Completions */) {
+      if (contextFlags & 4 /* IgnoreNodeInferences */) {
         return runWithInferenceBlockedFromSourceNode(node, () => getContextualType(node, contextFlags));
       }
       return getContextualType(node, contextFlags);
@@ -61876,7 +61888,7 @@ function createTypeChecker(host) {
   }
   function getIndexType(type, indexFlags = 0 /* None */) {
     type = getReducedType(type);
-    return isNoInferType(type) ? getNoInferType(getIndexType(type.baseType, indexFlags)) : shouldDeferIndexType(type, indexFlags) ? getIndexTypeForGenericType(type, indexFlags) : type.flags & 1048576 /* Union */ ? getIntersectionType(map(type.types, (t) => getIndexType(t, indexFlags))) : type.flags & 2097152 /* Intersection */ ? getUnionType(map(type.types, (t) => getIndexType(t, indexFlags))) : getObjectFlags(type) & 32 /* Mapped */ ? getIndexTypeForMappedType(type, indexFlags) : type === wildcardType || type === silentNeverType ? type : type.flags & 2 /* Unknown */ ? neverType : type.flags & (1 /* Any */ | 131072 /* Never */) ? stringNumberSymbolType : getLiteralTypeFromProperties(type, (indexFlags & 2 /* NoIndexSignatures */ ? 128 /* StringLiteral */ : 402653316 /* StringLike */) | (indexFlags & 1 /* StringsOnly */ ? 0 : 296 /* NumberLike */ | 12288 /* ESSymbolLike */), indexFlags === 0 /* None */);
+    return isNoInferType(type) ? getNoInferType(getIndexType(type.baseType, indexFlags)) : shouldDeferIndexType(type, indexFlags) ? getIndexTypeForGenericType(type, indexFlags) : type.flags & 1048576 /* Union */ ? getIntersectionType(map(type.types, (t) => getIndexType(t, indexFlags))) : type.flags & 2097152 /* Intersection */ ? getUnionType(map(type.types, (t) => getIndexType(t, indexFlags))) : getObjectFlags(type) & 32 /* Mapped */ ? getIndexTypeForMappedType(type, indexFlags) : type === wildcardType ? wildcardType : type.flags & 2 /* Unknown */ ? neverType : type.flags & (1 /* Any */ | 131072 /* Never */) ? stringNumberSymbolType : getLiteralTypeFromProperties(type, (indexFlags & 2 /* NoIndexSignatures */ ? 128 /* StringLiteral */ : 402653316 /* StringLike */) | (indexFlags & 1 /* StringsOnly */ ? 0 : 296 /* NumberLike */ | 12288 /* ESSymbolLike */), indexFlags === 0 /* None */);
   }
   function getExtractStringType(type) {
     const extractTypeAlias = getGlobalExtractSymbol();
@@ -63710,7 +63722,8 @@ function createTypeChecker(host) {
         const { initializer } = node;
         return !!initializer && isContextSensitive(initializer);
       }
-      case 295 /* JsxExpression */: {
+      case 295 /* JsxExpression */:
+      case 230 /* YieldExpression */: {
         const { expression } = node;
         return !!expression && isContextSensitive(expression);
       }
@@ -63718,7 +63731,7 @@ function createTypeChecker(host) {
     return false;
   }
   function isContextSensitiveFunctionLikeDeclaration(node) {
-    return hasContextSensitiveParameters(node) || hasContextSensitiveReturnExpression(node);
+    return hasContextSensitiveParameters(node) || hasContextSensitiveReturnExpression(node) || !!(getFunctionFlags(node) & 1 /* Generator */ && node.body && forEachYieldExpression(node.body, isContextSensitive));
   }
   function hasContextSensitiveReturnExpression(node) {
     if (node.typeParameters || getEffectiveReturnTypeNode(node) || !node.body) {
@@ -73276,7 +73289,10 @@ function createTypeChecker(host) {
     if (contextualType && maybeTypeOfKind(contextualType, 465829888 /* Instantiable */)) {
       const inferenceContext = getInferenceContext(node);
       if (inferenceContext && contextFlags & 1 /* Signature */ && some(inferenceContext.inferences, hasInferenceCandidatesOrDefault)) {
-        return instantiateInstantiableTypes(contextualType, inferenceContext.nonFixingMapper);
+        const type = instantiateInstantiableTypes(contextualType, inferenceContext.nonFixingMapper);
+        if (!(type.flags & 3 /* AnyOrUnknown */)) {
+          return type;
+        }
       }
       if (inferenceContext == null ? void 0 : inferenceContext.returnMapper) {
         const type = instantiateInstantiableTypes(contextualType, inferenceContext.returnMapper);
@@ -73462,7 +73478,7 @@ function createTypeChecker(host) {
     ), getNameFromImportAttribute(node));
   }
   function getContextualJsxElementAttributesType(node, contextFlags) {
-    if (isJsxOpeningElement(node) && contextFlags !== 4 /* Completions */) {
+    if (isJsxOpeningElement(node) && contextFlags !== 4 /* IgnoreNodeInferences */) {
       const index = findContextualNode(
         node.parent,
         /*includeCaches*/

package/lib/typescript.js

@@ -2286,7 +2286,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "6.0";
-var version = `${versionMajorMinor}.0-insiders.20251205`;
+var version = `${versionMajorMinor}.0-insiders.20251208`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -6169,7 +6169,7 @@ var ContextFlags = /* @__PURE__ */ ((ContextFlags3) => {
   ContextFlags3[ContextFlags3["None"] = 0] = "None";
   ContextFlags3[ContextFlags3["Signature"] = 1] = "Signature";
   ContextFlags3[ContextFlags3["NoConstraints"] = 2] = "NoConstraints";
-  ContextFlags3[ContextFlags3["Completions"] = 4] = "Completions";
+  ContextFlags3[ContextFlags3["IgnoreNodeInferences"] = 4] = "IgnoreNodeInferences";
   ContextFlags3[ContextFlags3["SkipBindingPatterns"] = 8] = "SkipBindingPatterns";
   return ContextFlags3;
 })(ContextFlags || {});
@@ -17972,12 +17972,15 @@ function forEachYieldExpression(body, visitor) {
   function traverse(node) {
     switch (node.kind) {
       case 230 /* YieldExpression */:
-        visitor(node);
+        const value = visitor(node);
+        if (value) {
+          return value;
+        }
         const operand = node.expression;
-        if (operand) {
-          traverse(operand);
+        if (!operand) {
+          return;
         }
-        return;
+        return traverse(operand);
       case 267 /* EnumDeclaration */:
       case 265 /* InterfaceDeclaration */:
       case 268 /* ModuleDeclaration */:
@@ -17986,11 +17989,10 @@ function forEachYieldExpression(body, visitor) {
       default:
         if (isFunctionLike(node)) {
           if (node.name && node.name.kind === 168 /* ComputedPropertyName */) {
-            traverse(node.name.expression);
-            return;
+            return traverse(node.name.expression);
           }
         } else if (!isPartOfTypeNode(node)) {
-          forEachChild(node, traverse);
+          return forEachChild(node, traverse);
         }
     }
   }
@@ -23137,7 +23139,7 @@ function hasContextSensitiveParameters(node) {
     if (node.kind !== 220 /* ArrowFunction */) {
       const parameter = firstOrUndefined(node.parameters);
       if (!(parameter && parameterIsThisKeyword(parameter))) {
-        return true;
+        return !!(node.flags & 256 /* ContainsThis */);
       }
     }
   }
@@ -47211,6 +47213,7 @@ function createBinder() {
       const saveExceptionTarget = currentExceptionTarget;
       const saveActiveLabelList = activeLabelList;
       const saveHasExplicitReturn = hasExplicitReturn;
+      const saveSeenThisKeyword = seenThisKeyword;
       const isImmediatelyInvoked = containerFlags & 16 /* IsFunctionExpression */ && !hasSyntacticModifier(node, 1024 /* Async */) && !node.asteriskToken && !!getImmediatelyInvokedFunctionExpression(node) || node.kind === 176 /* ClassStaticBlockDeclaration */;
       if (!isImmediatelyInvoked) {
         currentFlow = createFlowNode(
@@ -47230,13 +47233,17 @@ function createBinder() {
       currentContinueTarget = void 0;
       activeLabelList = void 0;
       hasExplicitReturn = false;
+      seenThisKeyword = false;
       bindChildren(node);
-      node.flags &= ~5632 /* ReachabilityAndEmitFlags */;
+      node.flags &= ~(5632 /* ReachabilityAndEmitFlags */ | 256 /* ContainsThis */);
       if (!(currentFlow.flags & 1 /* Unreachable */) && containerFlags & 8 /* IsFunctionLike */ && nodeIsPresent(node.body)) {
         node.flags |= 512 /* HasImplicitReturn */;
         if (hasExplicitReturn) node.flags |= 1024 /* HasExplicitReturn */;
         node.endFlowNode = currentFlow;
       }
+      if (seenThisKeyword) {
+        node.flags |= 256 /* ContainsThis */;
+      }
       if (node.kind === 308 /* SourceFile */) {
         node.flags |= emitFlags;
         node.endFlowNode = currentFlow;
@@ -47257,11 +47264,14 @@ function createBinder() {
       currentExceptionTarget = saveExceptionTarget;
       activeLabelList = saveActiveLabelList;
       hasExplicitReturn = saveHasExplicitReturn;
+      seenThisKeyword = node.kind === 220 /* ArrowFunction */ ? saveSeenThisKeyword || seenThisKeyword : saveSeenThisKeyword;
     } else if (containerFlags & 64 /* IsInterface */) {
+      const saveSeenThisKeyword = seenThisKeyword;
       seenThisKeyword = false;
       bindChildren(node);
       Debug.assertNotNode(node, isIdentifier);
       node.flags = seenThisKeyword ? node.flags | 256 /* ContainsThis */ : node.flags & ~256 /* ContainsThis */;
+      seenThisKeyword = saveSeenThisKeyword;
     } else {
       bindChildren(node);
     }
@@ -48741,6 +48751,9 @@ function createBinder() {
         }
       // falls through
       case 110 /* ThisKeyword */:
+        if (node.kind === 110 /* ThisKeyword */) {
+          seenThisKeyword = true;
+        }
         if (currentFlow && (isExpression(node) || parent2.kind === 305 /* ShorthandPropertyAssignment */)) {
           node.flowNode = currentFlow;
         }
@@ -49608,6 +49621,8 @@ function getContainerFlags(node) {
     // falls through
     case 177 /* Constructor */:
     case 263 /* FunctionDeclaration */:
+    case 176 /* ClassStaticBlockDeclaration */:
+      return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */;
     case 174 /* MethodSignature */:
     case 180 /* CallSignature */:
     case 324 /* JSDocSignature */:
@@ -49615,17 +49630,14 @@ function getContainerFlags(node) {
     case 185 /* FunctionType */:
     case 181 /* ConstructSignature */:
     case 186 /* ConstructorType */:
-    case 176 /* ClassStaticBlockDeclaration */:
-      return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */;
+      return 1 /* IsContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */;
     case 352 /* JSDocImportTag */:
-      return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */;
+      return 1 /* IsContainer */ | 32 /* HasLocals */;
     case 219 /* FunctionExpression */:
     case 220 /* ArrowFunction */:
       return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 16 /* IsFunctionExpression */;
     case 269 /* ModuleBlock */:
       return 4 /* IsControlFlowContainer */;
-    case 173 /* PropertyDeclaration */:
-      return node.initializer ? 4 /* IsControlFlowContainer */ : 0;
     case 300 /* CatchClause */:
     case 249 /* ForStatement */:
     case 250 /* ForInStatement */:
@@ -51213,7 +51225,7 @@ function createTypeChecker(host) {
       if (!node) {
         return void 0;
       }
-      if (contextFlags & 4 /* Completions */) {
+      if (contextFlags & 4 /* IgnoreNodeInferences */) {
         return runWithInferenceBlockedFromSourceNode(node, () => getContextualType2(node, contextFlags));
       }
       return getContextualType2(node, contextFlags);
@@ -66504,7 +66516,7 @@ function createTypeChecker(host) {
   }
   function getIndexType(type, indexFlags = 0 /* None */) {
     type = getReducedType(type);
-    return isNoInferType(type) ? getNoInferType(getIndexType(type.baseType, indexFlags)) : shouldDeferIndexType(type, indexFlags) ? getIndexTypeForGenericType(type, indexFlags) : type.flags & 1048576 /* Union */ ? getIntersectionType(map(type.types, (t) => getIndexType(t, indexFlags))) : type.flags & 2097152 /* Intersection */ ? getUnionType(map(type.types, (t) => getIndexType(t, indexFlags))) : getObjectFlags(type) & 32 /* Mapped */ ? getIndexTypeForMappedType(type, indexFlags) : type === wildcardType || type === silentNeverType ? type : type.flags & 2 /* Unknown */ ? neverType : type.flags & (1 /* Any */ | 131072 /* Never */) ? stringNumberSymbolType : getLiteralTypeFromProperties(type, (indexFlags & 2 /* NoIndexSignatures */ ? 128 /* StringLiteral */ : 402653316 /* StringLike */) | (indexFlags & 1 /* StringsOnly */ ? 0 : 296 /* NumberLike */ | 12288 /* ESSymbolLike */), indexFlags === 0 /* None */);
+    return isNoInferType(type) ? getNoInferType(getIndexType(type.baseType, indexFlags)) : shouldDeferIndexType(type, indexFlags) ? getIndexTypeForGenericType(type, indexFlags) : type.flags & 1048576 /* Union */ ? getIntersectionType(map(type.types, (t) => getIndexType(t, indexFlags))) : type.flags & 2097152 /* Intersection */ ? getUnionType(map(type.types, (t) => getIndexType(t, indexFlags))) : getObjectFlags(type) & 32 /* Mapped */ ? getIndexTypeForMappedType(type, indexFlags) : type === wildcardType ? wildcardType : type.flags & 2 /* Unknown */ ? neverType : type.flags & (1 /* Any */ | 131072 /* Never */) ? stringNumberSymbolType : getLiteralTypeFromProperties(type, (indexFlags & 2 /* NoIndexSignatures */ ? 128 /* StringLiteral */ : 402653316 /* StringLike */) | (indexFlags & 1 /* StringsOnly */ ? 0 : 296 /* NumberLike */ | 12288 /* ESSymbolLike */), indexFlags === 0 /* None */);
   }
   function getExtractStringType(type) {
     const extractTypeAlias = getGlobalExtractSymbol();
@@ -68338,7 +68350,8 @@ function createTypeChecker(host) {
         const { initializer } = node;
         return !!initializer && isContextSensitive(initializer);
       }
-      case 295 /* JsxExpression */: {
+      case 295 /* JsxExpression */:
+      case 230 /* YieldExpression */: {
         const { expression } = node;
         return !!expression && isContextSensitive(expression);
       }
@@ -68346,7 +68359,7 @@ function createTypeChecker(host) {
     return false;
   }
   function isContextSensitiveFunctionLikeDeclaration(node) {
-    return hasContextSensitiveParameters(node) || hasContextSensitiveReturnExpression(node);
+    return hasContextSensitiveParameters(node) || hasContextSensitiveReturnExpression(node) || !!(getFunctionFlags(node) & 1 /* Generator */ && node.body && forEachYieldExpression(node.body, isContextSensitive));
   }
   function hasContextSensitiveReturnExpression(node) {
     if (node.typeParameters || getEffectiveReturnTypeNode(node) || !node.body) {
@@ -77904,7 +77917,10 @@ function createTypeChecker(host) {
     if (contextualType && maybeTypeOfKind(contextualType, 465829888 /* Instantiable */)) {
       const inferenceContext = getInferenceContext(node);
       if (inferenceContext && contextFlags & 1 /* Signature */ && some(inferenceContext.inferences, hasInferenceCandidatesOrDefault)) {
-        return instantiateInstantiableTypes(contextualType, inferenceContext.nonFixingMapper);
+        const type = instantiateInstantiableTypes(contextualType, inferenceContext.nonFixingMapper);
+        if (!(type.flags & 3 /* AnyOrUnknown */)) {
+          return type;
+        }
       }
       if (inferenceContext == null ? void 0 : inferenceContext.returnMapper) {
         const type = instantiateInstantiableTypes(contextualType, inferenceContext.returnMapper);
@@ -78090,7 +78106,7 @@ function createTypeChecker(host) {
     ), getNameFromImportAttribute(node));
   }
   function getContextualJsxElementAttributesType(node, contextFlags) {
-    if (isJsxOpeningElement(node) && contextFlags !== 4 /* Completions */) {
+    if (isJsxOpeningElement(node) && contextFlags !== 4 /* IgnoreNodeInferences */) {
       const index = findContextualNode(
         node.parent,
         /*includeCaches*/
@@ -168924,7 +168940,7 @@ function getContextualType(previousToken, position, sourceFile, checker) {
       return argInfo ? checker.getContextualTypeForArgumentAtIndex(argInfo.invocation, argInfo.argumentIndex) : isEqualityOperatorKind(previousToken.kind) && isBinaryExpression(parent2) && isEqualityOperatorKind(parent2.operatorToken.kind) ? (
         // completion at `x ===/**/` should be for the right side
         checker.getTypeAtLocation(parent2.left)
-      ) : checker.getContextualType(previousToken, 4 /* Completions */) || checker.getContextualType(previousToken);
+      ) : checker.getContextualType(previousToken, 4 /* IgnoreNodeInferences */) || checker.getContextualType(previousToken);
   }
 }
 function getFirstSymbolInChain(symbol, enclosingDeclaration, checker) {
@@ -169429,7 +169445,7 @@ function getCompletionData(program, log, sourceFile, compilerOptions, position,
     const jsxContainer = tryGetContainingJsxElement(contextToken);
     const attrsType = jsxContainer && typeChecker.getContextualType(jsxContainer.attributes);
     if (!attrsType) return 0 /* Continue */;
-    const completionsType = jsxContainer && typeChecker.getContextualType(jsxContainer.attributes, 4 /* Completions */);
+    const completionsType = jsxContainer && typeChecker.getContextualType(jsxContainer.attributes, 4 /* IgnoreNodeInferences */);
     symbols = concatenate(symbols, filterJsxAttributes(getPropertiesForObjectExpression(attrsType, completionsType, jsxContainer.attributes, typeChecker), jsxContainer.attributes.properties));
     setSortTextToOptionalMember();
     completionKind = 3 /* MemberLike */;
@@ -169856,7 +169872,7 @@ function getCompletionData(program, log, sourceFile, compilerOptions, position,
         }
         return 0 /* Continue */;
       }
-      const completionsType = typeChecker.getContextualType(objectLikeContainer, 4 /* Completions */);
+      const completionsType = typeChecker.getContextualType(objectLikeContainer, 4 /* IgnoreNodeInferences */);
       const hasStringIndexType = (completionsType || instantiatedType).getStringIndexType();
       const hasNumberIndextype = (completionsType || instantiatedType).getNumberIndexType();
       isNewIdentifierLocation = !!hasStringIndexType || !!hasNumberIndextype;
@@ -171153,7 +171169,15 @@ function getStringLiteralCompletionEntries(sourceFile, node, position, program,
       if (isObjectLiteralExpression(parent2.parent) && parent2.name === node) {
         return stringLiteralCompletionsForObjectLiteral(typeChecker, parent2.parent);
       }
-      return fromContextualType() || fromContextualType(0 /* None */);
+      if (findAncestor(parent2.parent, isCallLikeExpression)) {
+        const uniques2 = /* @__PURE__ */ new Set();
+        const stringLiteralTypes = concatenate(
+          getStringLiteralTypes(typeChecker.getContextualType(node, 0 /* None */), uniques2),
+          getStringLiteralTypes(typeChecker.getContextualType(node, 4 /* IgnoreNodeInferences */), uniques2)
+        );
+        return toStringLiteralCompletionsFromTypes(stringLiteralTypes);
+      }
+      return fromContextualType(0 /* None */);
     case 213 /* ElementAccessExpression */: {
       const { expression, argumentExpression } = parent2;
       if (node === skipParentheses(argumentExpression)) {
@@ -171249,14 +171273,13 @@ function getStringLiteralCompletionEntries(sourceFile, node, position, program,
         return void 0;
     }
   }
-  function fromContextualType(contextFlags = 4 /* Completions */) {
-    const types = getStringLiteralTypes(getContextualTypeFromParent(node, typeChecker, contextFlags));
-    if (!types.length) {
-      return;
-    }
-    return { kind: 2 /* Types */, types, isNewIdentifier: false };
+  function fromContextualType(contextFlags = 4 /* IgnoreNodeInferences */) {
+    return toStringLiteralCompletionsFromTypes(getStringLiteralTypes(getContextualTypeFromParent(node, typeChecker, contextFlags)));
   }
 }
+function toStringLiteralCompletionsFromTypes(types) {
+  return types.length ? { kind: 2 /* Types */, types, isNewIdentifier: false } : void 0;
+}
 function walkUpParentheses(node) {
   switch (node.kind) {
     case 197 /* ParenthesizedType */:
@@ -171299,7 +171322,7 @@ function stringLiteralCompletionsFromProperties(type) {
 function stringLiteralCompletionsForObjectLiteral(checker, objectLiteralExpression) {
   const contextualType = checker.getContextualType(objectLiteralExpression);
   if (!contextualType) return void 0;
-  const completionsType = checker.getContextualType(objectLiteralExpression, 4 /* Completions */);
+  const completionsType = checker.getContextualType(objectLiteralExpression, 4 /* IgnoreNodeInferences */);
   const symbols = getPropertiesForObjectExpression(
     contextualType,
     completionsType,
@@ -174594,13 +174617,29 @@ function getDefinitionFromObjectLiteralElement(typeChecker, node) {
   if (element) {
     const contextualType = element && typeChecker.getContextualType(element.parent);
     if (contextualType) {
-      return flatMap(getPropertySymbolsFromContextualType(
+      let properties = getPropertySymbolsFromContextualType(
         element,
         typeChecker,
         contextualType,
         /*unionSymbolOk*/
         false
-      ), (propertySymbol) => getDefinitionFromSymbol(typeChecker, propertySymbol, node));
+      );
+      if (some(properties, (p) => !!(p.valueDeclaration && isObjectLiteralExpression(p.valueDeclaration.parent) && isObjectLiteralElementLike(p.valueDeclaration) && p.valueDeclaration.name === node))) {
+        const withoutNodeInferencesType = typeChecker.getContextualType(element.parent, 4 /* IgnoreNodeInferences */);
+        if (withoutNodeInferencesType) {
+          const withoutNodeInferencesProperties = getPropertySymbolsFromContextualType(
+            element,
+            typeChecker,
+            withoutNodeInferencesType,
+            /*unionSymbolOk*/
+            false
+          );
+          if (withoutNodeInferencesProperties.length) {
+            properties = withoutNodeInferencesProperties;
+          }
+        }
+      }
+      return flatMap(properties, (propertySymbol) => getDefinitionFromSymbol(typeChecker, propertySymbol, node));
     }
   }
   return emptyArray;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "6.0.0-pr-62825-9",
+  "version": "6.0.0-pr-62243-37",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [