@typescript-deploys/pr-build 5.1.0-pr-54121-5 → 5.1.0-pr-53996-2

package/lib/tsc.js

@@ -42861,7 +42861,24 @@ function createTypeChecker(host) {
     getTypeOfPropertyOfContextualType,
     getFullyQualifiedName,
     getResolvedSignature: (node, candidatesOutArray, argumentCount) => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 0 /* Normal */),
-    getCandidateSignaturesForStringLiteralCompletions,
+    getResolvedSignatureForStringLiteralCompletions: (call, editingArgument, candidatesOutArray, checkMode = 32 /* IsForStringLiteralArgumentCompletions */) => {
+      if (checkMode & 32 /* IsForStringLiteralArgumentCompletions */) {
+        return runWithInferenceBlockedFromSourceNode(editingArgument, () => getResolvedSignatureWorker(
+          call,
+          candidatesOutArray,
+          /*argumentCount*/
+          void 0,
+          checkMode & ~32 /* IsForStringLiteralArgumentCompletions */
+        ));
+      }
+      return runWithoutResolvedSignatureCaching(editingArgument, () => getResolvedSignatureWorker(
+        call,
+        candidatesOutArray,
+        /*argumentCount*/
+        void 0,
+        checkMode & ~32 /* IsForStringLiteralArgumentCompletions */
+      ));
+    },
     getResolvedSignatureForSignatureHelp: (node, candidatesOutArray, argumentCount) => runWithoutResolvedSignatureCaching(node, () => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 16 /* IsForSignatureHelp */)),
     getExpandedParameters,
     hasEffectiveRestParameter,
@@ -43060,44 +43077,17 @@ function createTypeChecker(host) {
     isTypeParameterPossiblyReferenced,
     typeHasCallOrConstructSignatures
   };
-  function getCandidateSignaturesForStringLiteralCompletions(call, editingArgument) {
-    const candidatesSet = /* @__PURE__ */ new Set();
-    const candidates = [];
-    runWithInferenceBlockedFromSourceNode(editingArgument, () => getResolvedSignatureWorker(
-      call,
-      candidates,
-      /*argumentCount*/
-      void 0,
-      32 /* IsForStringLiteralArgumentCompletions */
-    ));
-    for (const candidate of candidates) {
-      candidatesSet.add(candidate);
-    }
-    candidates.length = 0;
-    runWithoutResolvedSignatureCaching(editingArgument, () => getResolvedSignatureWorker(
-      call,
-      candidates,
-      /*argumentCount*/
-      void 0,
-      32 /* IsForStringLiteralArgumentCompletions */
-    ));
-    for (const candidate of candidates) {
-      candidatesSet.add(candidate);
-    }
-    return arrayFrom(candidatesSet);
-  }
   function runWithoutResolvedSignatureCaching(node, fn) {
     const containingCall = findAncestor(node, isCallLikeExpression);
+    const containingCallResolvedSignature = containingCall && getNodeLinks(containingCall).resolvedSignature;
     if (containingCall) {
-      const links = getNodeLinks(containingCall);
-      const containingCallResolvedSignature = links.resolvedSignature;
-      links.resolvedSignature = void 0;
-      const result = fn();
-      links.resolvedSignature = containingCallResolvedSignature;
-      return result;
-    } else {
-      return fn();
+      getNodeLinks(containingCall).resolvedSignature = void 0;
     }
+    const result = fn();
+    if (containingCall) {
+      getNodeLinks(containingCall).resolvedSignature = containingCallResolvedSignature;
+    }
+    return result;
   }
   function runWithInferenceBlockedFromSourceNode(node, fn) {
     const containingCall = findAncestor(node, isCallLikeExpression);
@@ -63631,7 +63621,7 @@ function createTypeChecker(host) {
       const constraint = getConstraintOfTypeParameter(inference.typeParameter);
       if (constraint) {
         const instantiatedConstraint = instantiateType(constraint, context.nonFixingMapper);
-        if (!inferredType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
+        if (!inferredType || inferredType === wildcardType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
           inference.inferredType = fallbackType && context.compareTypes(fallbackType, getTypeWithThisArgument(instantiatedConstraint, fallbackType)) ? fallbackType : instantiatedConstraint;
         }
       }
@@ -69537,7 +69527,7 @@ function createTypeChecker(host) {
     }
     for (let i = 0; i < argCount; i++) {
       const arg = args[i];
-      if (arg.kind !== 231 /* OmittedExpression */ && !(checkMode & 32 /* IsForStringLiteralArgumentCompletions */ && hasSkipDirectInferenceFlag(arg))) {
+      if (arg.kind !== 231 /* OmittedExpression */) {
         const paramType = getTypeAtPosition(signature, i);
         if (couldContainTypeVariables(paramType)) {
           const argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
@@ -70149,7 +70139,6 @@ function createTypeChecker(host) {
     const args = getEffectiveCallArguments(node);
     const isSingleNonGenericCandidate = candidates.length === 1 && !candidates[0].typeParameters;
     let argCheckMode = !isDecorator2 && !isSingleNonGenericCandidate && some(args, isContextSensitive) ? 4 /* SkipContextSensitive */ : 0 /* Normal */;
-    argCheckMode |= checkMode & 32 /* IsForStringLiteralArgumentCompletions */;
     let candidatesForArgumentError;
     let candidateForArgumentArityError;
     let candidateForTypeArgumentError;
@@ -70373,7 +70362,7 @@ function createTypeChecker(host) {
           continue;
         }
         if (argCheckMode) {
-          argCheckMode = checkMode & 32 /* IsForStringLiteralArgumentCompletions */;
+          argCheckMode = 0 /* Normal */;
           if (inferenceContext) {
             const typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext);
             checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, isInJSFile(candidate.declaration), inferenceContext.inferredTypeParameters);
@@ -74211,7 +74200,7 @@ function createTypeChecker(host) {
         return nullWideningType;
       case 15 /* NoSubstitutionTemplateLiteral */:
       case 11 /* StringLiteral */:
-        return hasSkipDirectInferenceFlag(node) ? anyType : getFreshTypeOfLiteralType(getStringLiteralType(node.text));
+        return hasSkipDirectInferenceFlag(node) ? wildcardType : getFreshTypeOfLiteralType(getStringLiteralType(node.text));
       case 9 /* NumericLiteral */:
         checkGrammarNumericLiteral(node);
         return getFreshTypeOfLiteralType(getNumberLiteralType(+node.text));

package/lib/tsserver.js

@@ -47290,7 +47290,7 @@ function createTypeChecker(host) {
   var externalHelpersModule;
   var Symbol47 = objectAllocator.getSymbolConstructor();
   var Type27 = objectAllocator.getTypeConstructor();
-  var Signature14 = objectAllocator.getSignatureConstructor();
+  var Signature15 = objectAllocator.getSignatureConstructor();
   var typeCount = 0;
   var symbolCount = 0;
   var totalInstantiationCount = 0;
@@ -47511,7 +47511,24 @@ function createTypeChecker(host) {
     getTypeOfPropertyOfContextualType,
     getFullyQualifiedName,
     getResolvedSignature: (node, candidatesOutArray, argumentCount) => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 0 /* Normal */),
-    getCandidateSignaturesForStringLiteralCompletions,
+    getResolvedSignatureForStringLiteralCompletions: (call, editingArgument, candidatesOutArray, checkMode = 32 /* IsForStringLiteralArgumentCompletions */) => {
+      if (checkMode & 32 /* IsForStringLiteralArgumentCompletions */) {
+        return runWithInferenceBlockedFromSourceNode(editingArgument, () => getResolvedSignatureWorker(
+          call,
+          candidatesOutArray,
+          /*argumentCount*/
+          void 0,
+          checkMode & ~32 /* IsForStringLiteralArgumentCompletions */
+        ));
+      }
+      return runWithoutResolvedSignatureCaching(editingArgument, () => getResolvedSignatureWorker(
+        call,
+        candidatesOutArray,
+        /*argumentCount*/
+        void 0,
+        checkMode & ~32 /* IsForStringLiteralArgumentCompletions */
+      ));
+    },
     getResolvedSignatureForSignatureHelp: (node, candidatesOutArray, argumentCount) => runWithoutResolvedSignatureCaching(node, () => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 16 /* IsForSignatureHelp */)),
     getExpandedParameters,
     hasEffectiveRestParameter,
@@ -47710,44 +47727,17 @@ function createTypeChecker(host) {
     isTypeParameterPossiblyReferenced,
     typeHasCallOrConstructSignatures
   };
-  function getCandidateSignaturesForStringLiteralCompletions(call, editingArgument) {
-    const candidatesSet = /* @__PURE__ */ new Set();
-    const candidates = [];
-    runWithInferenceBlockedFromSourceNode(editingArgument, () => getResolvedSignatureWorker(
-      call,
-      candidates,
-      /*argumentCount*/
-      void 0,
-      32 /* IsForStringLiteralArgumentCompletions */
-    ));
-    for (const candidate of candidates) {
-      candidatesSet.add(candidate);
-    }
-    candidates.length = 0;
-    runWithoutResolvedSignatureCaching(editingArgument, () => getResolvedSignatureWorker(
-      call,
-      candidates,
-      /*argumentCount*/
-      void 0,
-      32 /* IsForStringLiteralArgumentCompletions */
-    ));
-    for (const candidate of candidates) {
-      candidatesSet.add(candidate);
-    }
-    return arrayFrom(candidatesSet);
-  }
   function runWithoutResolvedSignatureCaching(node, fn) {
     const containingCall = findAncestor(node, isCallLikeExpression);
+    const containingCallResolvedSignature = containingCall && getNodeLinks(containingCall).resolvedSignature;
     if (containingCall) {
-      const links = getNodeLinks(containingCall);
-      const containingCallResolvedSignature = links.resolvedSignature;
-      links.resolvedSignature = void 0;
-      const result = fn();
-      links.resolvedSignature = containingCallResolvedSignature;
-      return result;
-    } else {
-      return fn();
+      getNodeLinks(containingCall).resolvedSignature = void 0;
     }
+    const result = fn();
+    if (containingCall) {
+      getNodeLinks(containingCall).resolvedSignature = containingCallResolvedSignature;
+    }
+    return result;
   }
   function runWithInferenceBlockedFromSourceNode(node, fn) {
     const containingCall = findAncestor(node, isCallLikeExpression);
@@ -57351,7 +57341,7 @@ function createTypeChecker(host) {
     resolveObjectTypeMembers(type, source, typeParameters, paddedTypeArguments);
   }
   function createSignature(declaration, typeParameters, thisParameter, parameters, resolvedReturnType, resolvedTypePredicate, minArgumentCount, flags) {
-    const sig = new Signature14(checker, flags);
+    const sig = new Signature15(checker, flags);
     sig.declaration = declaration;
     sig.typeParameters = typeParameters;
     sig.parameters = parameters;
@@ -68281,7 +68271,7 @@ function createTypeChecker(host) {
       const constraint = getConstraintOfTypeParameter(inference.typeParameter);
       if (constraint) {
         const instantiatedConstraint = instantiateType(constraint, context.nonFixingMapper);
-        if (!inferredType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
+        if (!inferredType || inferredType === wildcardType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
           inference.inferredType = fallbackType && context.compareTypes(fallbackType, getTypeWithThisArgument(instantiatedConstraint, fallbackType)) ? fallbackType : instantiatedConstraint;
         }
       }
@@ -74187,7 +74177,7 @@ function createTypeChecker(host) {
     }
     for (let i = 0; i < argCount; i++) {
       const arg = args[i];
-      if (arg.kind !== 231 /* OmittedExpression */ && !(checkMode & 32 /* IsForStringLiteralArgumentCompletions */ && hasSkipDirectInferenceFlag(arg))) {
+      if (arg.kind !== 231 /* OmittedExpression */) {
         const paramType = getTypeAtPosition(signature, i);
         if (couldContainTypeVariables(paramType)) {
           const argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
@@ -74799,7 +74789,6 @@ function createTypeChecker(host) {
     const args = getEffectiveCallArguments(node);
     const isSingleNonGenericCandidate = candidates.length === 1 && !candidates[0].typeParameters;
     let argCheckMode = !isDecorator2 && !isSingleNonGenericCandidate && some(args, isContextSensitive) ? 4 /* SkipContextSensitive */ : 0 /* Normal */;
-    argCheckMode |= checkMode & 32 /* IsForStringLiteralArgumentCompletions */;
     let candidatesForArgumentError;
     let candidateForArgumentArityError;
     let candidateForTypeArgumentError;
@@ -75023,7 +75012,7 @@ function createTypeChecker(host) {
           continue;
         }
         if (argCheckMode) {
-          argCheckMode = checkMode & 32 /* IsForStringLiteralArgumentCompletions */;
+          argCheckMode = 0 /* Normal */;
           if (inferenceContext) {
             const typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext);
             checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, isInJSFile(candidate.declaration), inferenceContext.inferredTypeParameters);
@@ -78861,7 +78850,7 @@ function createTypeChecker(host) {
         return nullWideningType;
       case 15 /* NoSubstitutionTemplateLiteral */:
       case 11 /* StringLiteral */:
-        return hasSkipDirectInferenceFlag(node) ? anyType : getFreshTypeOfLiteralType(getStringLiteralType(node.text));
+        return hasSkipDirectInferenceFlag(node) ? wildcardType : getFreshTypeOfLiteralType(getStringLiteralType(node.text));
       case 9 /* NumericLiteral */:
         checkGrammarNumericLiteral(node);
         return getFreshTypeOfLiteralType(getNumberLiteralType(+node.text));
@@ -158589,7 +158578,7 @@ function getStringLiteralCompletionEntries(sourceFile, node, position, typeCheck
     case 290 /* JsxAttribute */:
       if (!isRequireCallArgument(node) && !isImportCall(parent2)) {
         const argumentInfo = ts_SignatureHelp_exports.getArgumentInfoForCompletions(parent2.kind === 290 /* JsxAttribute */ ? parent2.parent : node, position, sourceFile);
-        return argumentInfo && getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || fromContextualType();
+        return argumentInfo && (getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker, 0 /* Normal */)) || fromContextualType();
       }
     case 271 /* ImportDeclaration */:
     case 277 /* ExportDeclaration */:
@@ -158658,11 +158647,12 @@ function walkUpParentheses(node) {
 function getAlreadyUsedTypesInStringLiteralUnion(union, current) {
   return mapDefined(union.types, (type) => type !== current && isLiteralTypeNode(type) && isStringLiteral(type.literal) ? type.literal.text : void 0);
 }
-function getStringLiteralCompletionsFromSignature(call, arg, argumentInfo, checker) {
+function getStringLiteralCompletionsFromSignature(call, arg, argumentInfo, checker, checkMode = 32 /* IsForStringLiteralArgumentCompletions */) {
   let isNewIdentifier = false;
   const uniques = /* @__PURE__ */ new Map();
+  const candidates = [];
   const editingArgument = isJsxOpeningLikeElement(call) ? Debug.checkDefined(findAncestor(arg.parent, isJsxAttribute)) : arg;
-  const candidates = checker.getCandidateSignaturesForStringLiteralCompletions(call, editingArgument);
+  checker.getResolvedSignatureForStringLiteralCompletions(call, editingArgument, candidates, checkMode);
   const types = flatMap(candidates, (candidate) => {
     if (!signatureHasRestParameter(candidate) && argumentInfo.argumentCount > candidate.parameters.length)
       return;

package/lib/tsserverlibrary.js

@@ -45082,7 +45082,7 @@ ${lanes.join("\n")}
     var externalHelpersModule;
     var Symbol47 = objectAllocator.getSymbolConstructor();
     var Type27 = objectAllocator.getTypeConstructor();
-    var Signature14 = objectAllocator.getSignatureConstructor();
+    var Signature15 = objectAllocator.getSignatureConstructor();
     var typeCount = 0;
     var symbolCount = 0;
     var totalInstantiationCount = 0;
@@ -45303,7 +45303,24 @@ ${lanes.join("\n")}
       getTypeOfPropertyOfContextualType,
       getFullyQualifiedName,
       getResolvedSignature: (node, candidatesOutArray, argumentCount) => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 0 /* Normal */),
-      getCandidateSignaturesForStringLiteralCompletions,
+      getResolvedSignatureForStringLiteralCompletions: (call, editingArgument, candidatesOutArray, checkMode = 32 /* IsForStringLiteralArgumentCompletions */) => {
+        if (checkMode & 32 /* IsForStringLiteralArgumentCompletions */) {
+          return runWithInferenceBlockedFromSourceNode(editingArgument, () => getResolvedSignatureWorker(
+            call,
+            candidatesOutArray,
+            /*argumentCount*/
+            void 0,
+            checkMode & ~32 /* IsForStringLiteralArgumentCompletions */
+          ));
+        }
+        return runWithoutResolvedSignatureCaching(editingArgument, () => getResolvedSignatureWorker(
+          call,
+          candidatesOutArray,
+          /*argumentCount*/
+          void 0,
+          checkMode & ~32 /* IsForStringLiteralArgumentCompletions */
+        ));
+      },
       getResolvedSignatureForSignatureHelp: (node, candidatesOutArray, argumentCount) => runWithoutResolvedSignatureCaching(node, () => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 16 /* IsForSignatureHelp */)),
       getExpandedParameters,
       hasEffectiveRestParameter,
@@ -45502,44 +45519,17 @@ ${lanes.join("\n")}
       isTypeParameterPossiblyReferenced,
       typeHasCallOrConstructSignatures
     };
-    function getCandidateSignaturesForStringLiteralCompletions(call, editingArgument) {
-      const candidatesSet = /* @__PURE__ */ new Set();
-      const candidates = [];
-      runWithInferenceBlockedFromSourceNode(editingArgument, () => getResolvedSignatureWorker(
-        call,
-        candidates,
-        /*argumentCount*/
-        void 0,
-        32 /* IsForStringLiteralArgumentCompletions */
-      ));
-      for (const candidate of candidates) {
-        candidatesSet.add(candidate);
-      }
-      candidates.length = 0;
-      runWithoutResolvedSignatureCaching(editingArgument, () => getResolvedSignatureWorker(
-        call,
-        candidates,
-        /*argumentCount*/
-        void 0,
-        32 /* IsForStringLiteralArgumentCompletions */
-      ));
-      for (const candidate of candidates) {
-        candidatesSet.add(candidate);
-      }
-      return arrayFrom(candidatesSet);
-    }
     function runWithoutResolvedSignatureCaching(node, fn) {
       const containingCall = findAncestor(node, isCallLikeExpression);
+      const containingCallResolvedSignature = containingCall && getNodeLinks(containingCall).resolvedSignature;
       if (containingCall) {
-        const links = getNodeLinks(containingCall);
-        const containingCallResolvedSignature = links.resolvedSignature;
-        links.resolvedSignature = void 0;
-        const result = fn();
-        links.resolvedSignature = containingCallResolvedSignature;
-        return result;
-      } else {
-        return fn();
+        getNodeLinks(containingCall).resolvedSignature = void 0;
       }
+      const result = fn();
+      if (containingCall) {
+        getNodeLinks(containingCall).resolvedSignature = containingCallResolvedSignature;
+      }
+      return result;
     }
     function runWithInferenceBlockedFromSourceNode(node, fn) {
       const containingCall = findAncestor(node, isCallLikeExpression);
@@ -55143,7 +55133,7 @@ ${lanes.join("\n")}
       resolveObjectTypeMembers(type, source, typeParameters, paddedTypeArguments);
     }
     function createSignature(declaration, typeParameters, thisParameter, parameters, resolvedReturnType, resolvedTypePredicate, minArgumentCount, flags) {
-      const sig = new Signature14(checker, flags);
+      const sig = new Signature15(checker, flags);
       sig.declaration = declaration;
       sig.typeParameters = typeParameters;
       sig.parameters = parameters;
@@ -66073,7 +66063,7 @@ ${lanes.join("\n")}
         const constraint = getConstraintOfTypeParameter(inference.typeParameter);
         if (constraint) {
           const instantiatedConstraint = instantiateType(constraint, context.nonFixingMapper);
-          if (!inferredType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
+          if (!inferredType || inferredType === wildcardType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
             inference.inferredType = fallbackType && context.compareTypes(fallbackType, getTypeWithThisArgument(instantiatedConstraint, fallbackType)) ? fallbackType : instantiatedConstraint;
           }
         }
@@ -71979,7 +71969,7 @@ ${lanes.join("\n")}
       }
       for (let i = 0; i < argCount; i++) {
         const arg = args[i];
-        if (arg.kind !== 231 /* OmittedExpression */ && !(checkMode & 32 /* IsForStringLiteralArgumentCompletions */ && hasSkipDirectInferenceFlag(arg))) {
+        if (arg.kind !== 231 /* OmittedExpression */) {
           const paramType = getTypeAtPosition(signature, i);
           if (couldContainTypeVariables(paramType)) {
             const argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
@@ -72591,7 +72581,6 @@ ${lanes.join("\n")}
       const args = getEffectiveCallArguments(node);
       const isSingleNonGenericCandidate = candidates.length === 1 && !candidates[0].typeParameters;
       let argCheckMode = !isDecorator2 && !isSingleNonGenericCandidate && some(args, isContextSensitive) ? 4 /* SkipContextSensitive */ : 0 /* Normal */;
-      argCheckMode |= checkMode & 32 /* IsForStringLiteralArgumentCompletions */;
       let candidatesForArgumentError;
       let candidateForArgumentArityError;
       let candidateForTypeArgumentError;
@@ -72815,7 +72804,7 @@ ${lanes.join("\n")}
             continue;
           }
           if (argCheckMode) {
-            argCheckMode = checkMode & 32 /* IsForStringLiteralArgumentCompletions */;
+            argCheckMode = 0 /* Normal */;
             if (inferenceContext) {
               const typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext);
               checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, isInJSFile(candidate.declaration), inferenceContext.inferredTypeParameters);
@@ -76653,7 +76642,7 @@ ${lanes.join("\n")}
           return nullWideningType;
         case 15 /* NoSubstitutionTemplateLiteral */:
         case 11 /* StringLiteral */:
-          return hasSkipDirectInferenceFlag(node) ? anyType : getFreshTypeOfLiteralType(getStringLiteralType(node.text));
+          return hasSkipDirectInferenceFlag(node) ? wildcardType : getFreshTypeOfLiteralType(getStringLiteralType(node.text));
         case 9 /* NumericLiteral */:
           checkGrammarNumericLiteral(node);
           return getFreshTypeOfLiteralType(getNumberLiteralType(+node.text));
@@ -157865,7 +157854,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       case 290 /* JsxAttribute */:
         if (!isRequireCallArgument(node) && !isImportCall(parent2)) {
           const argumentInfo = ts_SignatureHelp_exports.getArgumentInfoForCompletions(parent2.kind === 290 /* JsxAttribute */ ? parent2.parent : node, position, sourceFile);
-          return argumentInfo && getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || fromContextualType();
+          return argumentInfo && (getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker, 0 /* Normal */)) || fromContextualType();
         }
       case 271 /* ImportDeclaration */:
       case 277 /* ExportDeclaration */:
@@ -157934,11 +157923,12 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   function getAlreadyUsedTypesInStringLiteralUnion(union, current) {
     return mapDefined(union.types, (type) => type !== current && isLiteralTypeNode(type) && isStringLiteral(type.literal) ? type.literal.text : void 0);
   }
-  function getStringLiteralCompletionsFromSignature(call, arg, argumentInfo, checker) {
+  function getStringLiteralCompletionsFromSignature(call, arg, argumentInfo, checker, checkMode = 32 /* IsForStringLiteralArgumentCompletions */) {
     let isNewIdentifier = false;
     const uniques = /* @__PURE__ */ new Map();
+    const candidates = [];
     const editingArgument = isJsxOpeningLikeElement(call) ? Debug.checkDefined(findAncestor(arg.parent, isJsxAttribute)) : arg;
-    const candidates = checker.getCandidateSignaturesForStringLiteralCompletions(call, editingArgument);
+    checker.getResolvedSignatureForStringLiteralCompletions(call, editingArgument, candidates, checkMode);
     const types = flatMap(candidates, (candidate) => {
       if (!signatureHasRestParameter(candidate) && argumentInfo.argumentCount > candidate.parameters.length)
         return;

package/lib/typescript.js

@@ -45082,7 +45082,7 @@ ${lanes.join("\n")}
     var externalHelpersModule;
     var Symbol47 = objectAllocator.getSymbolConstructor();
     var Type27 = objectAllocator.getTypeConstructor();
-    var Signature14 = objectAllocator.getSignatureConstructor();
+    var Signature15 = objectAllocator.getSignatureConstructor();
     var typeCount = 0;
     var symbolCount = 0;
     var totalInstantiationCount = 0;
@@ -45303,7 +45303,24 @@ ${lanes.join("\n")}
       getTypeOfPropertyOfContextualType,
       getFullyQualifiedName,
       getResolvedSignature: (node, candidatesOutArray, argumentCount) => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 0 /* Normal */),
-      getCandidateSignaturesForStringLiteralCompletions,
+      getResolvedSignatureForStringLiteralCompletions: (call, editingArgument, candidatesOutArray, checkMode = 32 /* IsForStringLiteralArgumentCompletions */) => {
+        if (checkMode & 32 /* IsForStringLiteralArgumentCompletions */) {
+          return runWithInferenceBlockedFromSourceNode(editingArgument, () => getResolvedSignatureWorker(
+            call,
+            candidatesOutArray,
+            /*argumentCount*/
+            void 0,
+            checkMode & ~32 /* IsForStringLiteralArgumentCompletions */
+          ));
+        }
+        return runWithoutResolvedSignatureCaching(editingArgument, () => getResolvedSignatureWorker(
+          call,
+          candidatesOutArray,
+          /*argumentCount*/
+          void 0,
+          checkMode & ~32 /* IsForStringLiteralArgumentCompletions */
+        ));
+      },
       getResolvedSignatureForSignatureHelp: (node, candidatesOutArray, argumentCount) => runWithoutResolvedSignatureCaching(node, () => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 16 /* IsForSignatureHelp */)),
       getExpandedParameters,
       hasEffectiveRestParameter,
@@ -45502,44 +45519,17 @@ ${lanes.join("\n")}
       isTypeParameterPossiblyReferenced,
       typeHasCallOrConstructSignatures
     };
-    function getCandidateSignaturesForStringLiteralCompletions(call, editingArgument) {
-      const candidatesSet = /* @__PURE__ */ new Set();
-      const candidates = [];
-      runWithInferenceBlockedFromSourceNode(editingArgument, () => getResolvedSignatureWorker(
-        call,
-        candidates,
-        /*argumentCount*/
-        void 0,
-        32 /* IsForStringLiteralArgumentCompletions */
-      ));
-      for (const candidate of candidates) {
-        candidatesSet.add(candidate);
-      }
-      candidates.length = 0;
-      runWithoutResolvedSignatureCaching(editingArgument, () => getResolvedSignatureWorker(
-        call,
-        candidates,
-        /*argumentCount*/
-        void 0,
-        32 /* IsForStringLiteralArgumentCompletions */
-      ));
-      for (const candidate of candidates) {
-        candidatesSet.add(candidate);
-      }
-      return arrayFrom(candidatesSet);
-    }
     function runWithoutResolvedSignatureCaching(node, fn) {
       const containingCall = findAncestor(node, isCallLikeExpression);
+      const containingCallResolvedSignature = containingCall && getNodeLinks(containingCall).resolvedSignature;
       if (containingCall) {
-        const links = getNodeLinks(containingCall);
-        const containingCallResolvedSignature = links.resolvedSignature;
-        links.resolvedSignature = void 0;
-        const result = fn();
-        links.resolvedSignature = containingCallResolvedSignature;
-        return result;
-      } else {
-        return fn();
+        getNodeLinks(containingCall).resolvedSignature = void 0;
       }
+      const result = fn();
+      if (containingCall) {
+        getNodeLinks(containingCall).resolvedSignature = containingCallResolvedSignature;
+      }
+      return result;
     }
     function runWithInferenceBlockedFromSourceNode(node, fn) {
       const containingCall = findAncestor(node, isCallLikeExpression);
@@ -55143,7 +55133,7 @@ ${lanes.join("\n")}
       resolveObjectTypeMembers(type, source, typeParameters, paddedTypeArguments);
     }
     function createSignature(declaration, typeParameters, thisParameter, parameters, resolvedReturnType, resolvedTypePredicate, minArgumentCount, flags) {
-      const sig = new Signature14(checker, flags);
+      const sig = new Signature15(checker, flags);
       sig.declaration = declaration;
       sig.typeParameters = typeParameters;
       sig.parameters = parameters;
@@ -66073,7 +66063,7 @@ ${lanes.join("\n")}
         const constraint = getConstraintOfTypeParameter(inference.typeParameter);
         if (constraint) {
           const instantiatedConstraint = instantiateType(constraint, context.nonFixingMapper);
-          if (!inferredType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
+          if (!inferredType || inferredType === wildcardType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
             inference.inferredType = fallbackType && context.compareTypes(fallbackType, getTypeWithThisArgument(instantiatedConstraint, fallbackType)) ? fallbackType : instantiatedConstraint;
           }
         }
@@ -71979,7 +71969,7 @@ ${lanes.join("\n")}
       }
       for (let i = 0; i < argCount; i++) {
         const arg = args[i];
-        if (arg.kind !== 231 /* OmittedExpression */ && !(checkMode & 32 /* IsForStringLiteralArgumentCompletions */ && hasSkipDirectInferenceFlag(arg))) {
+        if (arg.kind !== 231 /* OmittedExpression */) {
           const paramType = getTypeAtPosition(signature, i);
           if (couldContainTypeVariables(paramType)) {
             const argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
@@ -72591,7 +72581,6 @@ ${lanes.join("\n")}
       const args = getEffectiveCallArguments(node);
       const isSingleNonGenericCandidate = candidates.length === 1 && !candidates[0].typeParameters;
       let argCheckMode = !isDecorator2 && !isSingleNonGenericCandidate && some(args, isContextSensitive) ? 4 /* SkipContextSensitive */ : 0 /* Normal */;
-      argCheckMode |= checkMode & 32 /* IsForStringLiteralArgumentCompletions */;
       let candidatesForArgumentError;
       let candidateForArgumentArityError;
       let candidateForTypeArgumentError;
@@ -72815,7 +72804,7 @@ ${lanes.join("\n")}
             continue;
           }
           if (argCheckMode) {
-            argCheckMode = checkMode & 32 /* IsForStringLiteralArgumentCompletions */;
+            argCheckMode = 0 /* Normal */;
             if (inferenceContext) {
               const typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext);
               checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, isInJSFile(candidate.declaration), inferenceContext.inferredTypeParameters);
@@ -76653,7 +76642,7 @@ ${lanes.join("\n")}
           return nullWideningType;
         case 15 /* NoSubstitutionTemplateLiteral */:
         case 11 /* StringLiteral */:
-          return hasSkipDirectInferenceFlag(node) ? anyType : getFreshTypeOfLiteralType(getStringLiteralType(node.text));
+          return hasSkipDirectInferenceFlag(node) ? wildcardType : getFreshTypeOfLiteralType(getStringLiteralType(node.text));
         case 9 /* NumericLiteral */:
           checkGrammarNumericLiteral(node);
           return getFreshTypeOfLiteralType(getNumberLiteralType(+node.text));
@@ -157880,7 +157869,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       case 290 /* JsxAttribute */:
         if (!isRequireCallArgument(node) && !isImportCall(parent2)) {
           const argumentInfo = ts_SignatureHelp_exports.getArgumentInfoForCompletions(parent2.kind === 290 /* JsxAttribute */ ? parent2.parent : node, position, sourceFile);
-          return argumentInfo && getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || fromContextualType();
+          return argumentInfo && (getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker, 0 /* Normal */)) || fromContextualType();
         }
       case 271 /* ImportDeclaration */:
       case 277 /* ExportDeclaration */:
@@ -157949,11 +157938,12 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   function getAlreadyUsedTypesInStringLiteralUnion(union, current) {
     return mapDefined(union.types, (type) => type !== current && isLiteralTypeNode(type) && isStringLiteral(type.literal) ? type.literal.text : void 0);
   }
-  function getStringLiteralCompletionsFromSignature(call, arg, argumentInfo, checker) {
+  function getStringLiteralCompletionsFromSignature(call, arg, argumentInfo, checker, checkMode = 32 /* IsForStringLiteralArgumentCompletions */) {
     let isNewIdentifier = false;
     const uniques = /* @__PURE__ */ new Map();
+    const candidates = [];
     const editingArgument = isJsxOpeningLikeElement(call) ? Debug.checkDefined(findAncestor(arg.parent, isJsxAttribute)) : arg;
-    const candidates = checker.getCandidateSignaturesForStringLiteralCompletions(call, editingArgument);
+    checker.getResolvedSignatureForStringLiteralCompletions(call, editingArgument, candidates, checkMode);
     const types = flatMap(candidates, (candidate) => {
       if (!signatureHasRestParameter(candidate) && argumentInfo.argumentCount > candidate.parameters.length)
         return;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.1.0-pr-54121-5",
+  "version": "5.1.0-pr-53996-2",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -116,5 +116,5 @@
     "node": "14.21.1",
     "npm": "8.19.3"
   },
-  "gitHead": "6fb2754a018b2bb92b34162d004fa87c6818f514"
+  "gitHead": "ea30ea5c580fce9e61c4fb5a04d0181b57efac3e"
 }