typescript 5.2.0-dev.20230613 → 5.2.0-dev.20230614

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230613`;
+var version = `${versionMajorMinor}.0-dev.20230614`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -42962,13 +42962,24 @@ function createTypeChecker(host) {
     getTypeOfPropertyOfContextualType,
     getFullyQualifiedName,
     getResolvedSignature: (node, candidatesOutArray, argumentCount) => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 0 /* Normal */),
-    getResolvedSignatureForStringLiteralCompletions: (call, editingArgument, candidatesOutArray) => runWithInferenceBlockedFromSourceNode(editingArgument, () => getResolvedSignatureWorker(
-      call,
-      candidatesOutArray,
-      /*argumentCount*/
-      void 0,
-      32 /* IsForStringLiteralArgumentCompletions */
-    )),
+    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,
@@ -50795,9 +50806,15 @@ function createTypeChecker(host) {
     const prop = getPropertyOfType(type, name);
     return prop ? getTypeOfSymbol(prop) : void 0;
   }
-  function getTypeOfPropertyOrIndexSignature(type, name) {
+  function getTypeOfPropertyOrIndexSignature(type, name, addOptionalityToIndex) {
     var _a;
-    return getTypeOfPropertyOfType(type, name) || ((_a = getApplicableIndexInfoForName(type, name)) == null ? void 0 : _a.type) || unknownType;
+    let propType;
+    return getTypeOfPropertyOfType(type, name) || (propType = (_a = getApplicableIndexInfoForName(type, name)) == null ? void 0 : _a.type) && addOptionality(
+      propType,
+      /*isProperty*/
+      true,
+      addOptionalityToIndex
+    ) || unknownType;
   }
   function isTypeAny(type) {
     return type && (type.flags & 1 /* Any */) !== 0;
@@ -61799,7 +61816,12 @@ function createTypeChecker(host) {
       let matched = false;
       for (let i = 0; i < types.length; i++) {
         if (include[i]) {
-          const targetType = getTypeOfPropertyOfType(types[i], propertyName);
+          const targetType = getTypeOfPropertyOrIndexSignature(
+            types[i],
+            propertyName,
+            /*addOptionalityToIndex*/
+            true
+          );
           if (targetType && related(getDiscriminatingType(), targetType)) {
             matched = true;
           } else {
@@ -63730,7 +63752,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;
         }
       }
@@ -65197,7 +65219,12 @@ function createTypeChecker(host) {
       propType = removeNullable && optionalChain ? getOptionalType(propType) : propType;
       const narrowedPropType = narrowType2(propType);
       return filterType(type, (t) => {
-        const discriminantType = getTypeOfPropertyOrIndexSignature(t, propName);
+        const discriminantType = getTypeOfPropertyOrIndexSignature(
+          t,
+          propName,
+          /*addOptionalityToIndex*/
+          false
+        );
         return !(discriminantType.flags & 131072 /* Never */) && !(narrowedPropType.flags & 131072 /* Never */) && areTypesComparable(narrowedPropType, discriminantType);
       });
     }
@@ -69645,7 +69672,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);
@@ -70258,7 +70285,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;
@@ -70482,7 +70508,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);
@@ -74335,7 +74361,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

@@ -2305,7 +2305,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230613`;
+var version = `${versionMajorMinor}.0-dev.20230614`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -47603,13 +47603,24 @@ function createTypeChecker(host) {
     getTypeOfPropertyOfContextualType,
     getFullyQualifiedName,
     getResolvedSignature: (node, candidatesOutArray, argumentCount) => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 0 /* Normal */),
-    getResolvedSignatureForStringLiteralCompletions: (call, editingArgument, candidatesOutArray) => runWithInferenceBlockedFromSourceNode(editingArgument, () => getResolvedSignatureWorker(
-      call,
-      candidatesOutArray,
-      /*argumentCount*/
-      void 0,
-      32 /* IsForStringLiteralArgumentCompletions */
-    )),
+    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,
@@ -55436,9 +55447,15 @@ function createTypeChecker(host) {
     const prop = getPropertyOfType(type, name);
     return prop ? getTypeOfSymbol(prop) : void 0;
   }
-  function getTypeOfPropertyOrIndexSignature(type, name) {
+  function getTypeOfPropertyOrIndexSignature(type, name, addOptionalityToIndex) {
     var _a;
-    return getTypeOfPropertyOfType(type, name) || ((_a = getApplicableIndexInfoForName(type, name)) == null ? void 0 : _a.type) || unknownType;
+    let propType;
+    return getTypeOfPropertyOfType(type, name) || (propType = (_a = getApplicableIndexInfoForName(type, name)) == null ? void 0 : _a.type) && addOptionality(
+      propType,
+      /*isProperty*/
+      true,
+      addOptionalityToIndex
+    ) || unknownType;
   }
   function isTypeAny(type) {
     return type && (type.flags & 1 /* Any */) !== 0;
@@ -66440,7 +66457,12 @@ function createTypeChecker(host) {
       let matched = false;
       for (let i = 0; i < types.length; i++) {
         if (include[i]) {
-          const targetType = getTypeOfPropertyOfType(types[i], propertyName);
+          const targetType = getTypeOfPropertyOrIndexSignature(
+            types[i],
+            propertyName,
+            /*addOptionalityToIndex*/
+            true
+          );
           if (targetType && related(getDiscriminatingType(), targetType)) {
             matched = true;
           } else {
@@ -68371,7 +68393,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;
         }
       }
@@ -69838,7 +69860,12 @@ function createTypeChecker(host) {
       propType = removeNullable && optionalChain ? getOptionalType(propType) : propType;
       const narrowedPropType = narrowType2(propType);
       return filterType(type, (t) => {
-        const discriminantType = getTypeOfPropertyOrIndexSignature(t, propName);
+        const discriminantType = getTypeOfPropertyOrIndexSignature(
+          t,
+          propName,
+          /*addOptionalityToIndex*/
+          false
+        );
         return !(discriminantType.flags & 131072 /* Never */) && !(narrowedPropType.flags & 131072 /* Never */) && areTypesComparable(narrowedPropType, discriminantType);
       });
     }
@@ -74286,7 +74313,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);
@@ -74899,7 +74926,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;
@@ -75123,7 +75149,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);
@@ -78976,7 +79002,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));
@@ -159116,7 +159142,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(0 /* None */);
+        return argumentInfo && (getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker, 0 /* Normal */)) || fromContextualType(0 /* None */);
       }
     case 271 /* ImportDeclaration */:
     case 277 /* ExportDeclaration */:
@@ -159185,12 +159211,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;
-  checker.getResolvedSignatureForStringLiteralCompletions(call, editingArgument, candidates);
+  checker.getResolvedSignatureForStringLiteralCompletions(call, editingArgument, candidates, checkMode);
   const types = flatMap(candidates, (candidate) => {
     if (!signatureHasRestParameter(candidate) && argumentInfo.argumentCount > candidate.parameters.length)
       return;

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-dev.20230613`;
+      version = `${versionMajorMinor}.0-dev.20230614`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -45392,13 +45392,24 @@ ${lanes.join("\n")}
       getTypeOfPropertyOfContextualType,
       getFullyQualifiedName,
       getResolvedSignature: (node, candidatesOutArray, argumentCount) => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 0 /* Normal */),
-      getResolvedSignatureForStringLiteralCompletions: (call, editingArgument, candidatesOutArray) => runWithInferenceBlockedFromSourceNode(editingArgument, () => getResolvedSignatureWorker(
-        call,
-        candidatesOutArray,
-        /*argumentCount*/
-        void 0,
-        32 /* IsForStringLiteralArgumentCompletions */
-      )),
+      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,
@@ -53225,9 +53236,15 @@ ${lanes.join("\n")}
       const prop = getPropertyOfType(type, name);
       return prop ? getTypeOfSymbol(prop) : void 0;
     }
-    function getTypeOfPropertyOrIndexSignature(type, name) {
+    function getTypeOfPropertyOrIndexSignature(type, name, addOptionalityToIndex) {
       var _a;
-      return getTypeOfPropertyOfType(type, name) || ((_a = getApplicableIndexInfoForName(type, name)) == null ? void 0 : _a.type) || unknownType;
+      let propType;
+      return getTypeOfPropertyOfType(type, name) || (propType = (_a = getApplicableIndexInfoForName(type, name)) == null ? void 0 : _a.type) && addOptionality(
+        propType,
+        /*isProperty*/
+        true,
+        addOptionalityToIndex
+      ) || unknownType;
     }
     function isTypeAny(type) {
       return type && (type.flags & 1 /* Any */) !== 0;
@@ -64229,7 +64246,12 @@ ${lanes.join("\n")}
         let matched = false;
         for (let i = 0; i < types.length; i++) {
           if (include[i]) {
-            const targetType = getTypeOfPropertyOfType(types[i], propertyName);
+            const targetType = getTypeOfPropertyOrIndexSignature(
+              types[i],
+              propertyName,
+              /*addOptionalityToIndex*/
+              true
+            );
             if (targetType && related(getDiscriminatingType(), targetType)) {
               matched = true;
             } else {
@@ -66160,7 +66182,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;
           }
         }
@@ -67627,7 +67649,12 @@ ${lanes.join("\n")}
         propType = removeNullable && optionalChain ? getOptionalType(propType) : propType;
         const narrowedPropType = narrowType2(propType);
         return filterType(type, (t) => {
-          const discriminantType = getTypeOfPropertyOrIndexSignature(t, propName);
+          const discriminantType = getTypeOfPropertyOrIndexSignature(
+            t,
+            propName,
+            /*addOptionalityToIndex*/
+            false
+          );
           return !(discriminantType.flags & 131072 /* Never */) && !(narrowedPropType.flags & 131072 /* Never */) && areTypesComparable(narrowedPropType, discriminantType);
         });
       }
@@ -72075,7 +72102,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);
@@ -72688,7 +72715,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;
@@ -72912,7 +72938,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);
@@ -76765,7 +76791,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));
@@ -158399,7 +158425,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(0 /* None */);
+          return argumentInfo && (getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker, 0 /* Normal */)) || fromContextualType(0 /* None */);
         }
       case 271 /* ImportDeclaration */:
       case 277 /* ExportDeclaration */:
@@ -158468,12 +158494,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;
-    checker.getResolvedSignatureForStringLiteralCompletions(call, editingArgument, candidates);
+    checker.getResolvedSignatureForStringLiteralCompletions(call, editingArgument, candidates, checkMode);
     const types = flatMap(candidates, (candidate) => {
       if (!signatureHasRestParameter(candidate) && argumentInfo.argumentCount > candidate.parameters.length)
         return;

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-dev.20230613`;
+      version = `${versionMajorMinor}.0-dev.20230614`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -45392,13 +45392,24 @@ ${lanes.join("\n")}
       getTypeOfPropertyOfContextualType,
       getFullyQualifiedName,
       getResolvedSignature: (node, candidatesOutArray, argumentCount) => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 0 /* Normal */),
-      getResolvedSignatureForStringLiteralCompletions: (call, editingArgument, candidatesOutArray) => runWithInferenceBlockedFromSourceNode(editingArgument, () => getResolvedSignatureWorker(
-        call,
-        candidatesOutArray,
-        /*argumentCount*/
-        void 0,
-        32 /* IsForStringLiteralArgumentCompletions */
-      )),
+      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,
@@ -53225,9 +53236,15 @@ ${lanes.join("\n")}
       const prop = getPropertyOfType(type, name);
       return prop ? getTypeOfSymbol(prop) : void 0;
     }
-    function getTypeOfPropertyOrIndexSignature(type, name) {
+    function getTypeOfPropertyOrIndexSignature(type, name, addOptionalityToIndex) {
       var _a;
-      return getTypeOfPropertyOfType(type, name) || ((_a = getApplicableIndexInfoForName(type, name)) == null ? void 0 : _a.type) || unknownType;
+      let propType;
+      return getTypeOfPropertyOfType(type, name) || (propType = (_a = getApplicableIndexInfoForName(type, name)) == null ? void 0 : _a.type) && addOptionality(
+        propType,
+        /*isProperty*/
+        true,
+        addOptionalityToIndex
+      ) || unknownType;
     }
     function isTypeAny(type) {
       return type && (type.flags & 1 /* Any */) !== 0;
@@ -64229,7 +64246,12 @@ ${lanes.join("\n")}
         let matched = false;
         for (let i = 0; i < types.length; i++) {
           if (include[i]) {
-            const targetType = getTypeOfPropertyOfType(types[i], propertyName);
+            const targetType = getTypeOfPropertyOrIndexSignature(
+              types[i],
+              propertyName,
+              /*addOptionalityToIndex*/
+              true
+            );
             if (targetType && related(getDiscriminatingType(), targetType)) {
               matched = true;
             } else {
@@ -66160,7 +66182,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;
           }
         }
@@ -67627,7 +67649,12 @@ ${lanes.join("\n")}
         propType = removeNullable && optionalChain ? getOptionalType(propType) : propType;
         const narrowedPropType = narrowType2(propType);
         return filterType(type, (t) => {
-          const discriminantType = getTypeOfPropertyOrIndexSignature(t, propName);
+          const discriminantType = getTypeOfPropertyOrIndexSignature(
+            t,
+            propName,
+            /*addOptionalityToIndex*/
+            false
+          );
           return !(discriminantType.flags & 131072 /* Never */) && !(narrowedPropType.flags & 131072 /* Never */) && areTypesComparable(narrowedPropType, discriminantType);
         });
       }
@@ -72075,7 +72102,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);
@@ -72688,7 +72715,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;
@@ -72912,7 +72938,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);
@@ -76765,7 +76791,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));
@@ -158414,7 +158440,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(0 /* None */);
+          return argumentInfo && (getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker, 0 /* Normal */)) || fromContextualType(0 /* None */);
         }
       case 271 /* ImportDeclaration */:
       case 277 /* ExportDeclaration */:
@@ -158483,12 +158509,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;
-    checker.getResolvedSignatureForStringLiteralCompletions(call, editingArgument, candidates);
+    checker.getResolvedSignatureForStringLiteralCompletions(call, editingArgument, candidates, checkMode);
     const types = flatMap(candidates, (candidate) => {
       if (!signatureHasRestParameter(candidate) && argumentInfo.argumentCount > candidate.parameters.length)
         return;

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230613`;
+var version = `${versionMajorMinor}.0-dev.20230614`;
 
 // src/compiler/core.ts
 var emptyArray = [];

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.2.0-dev.20230613",
+    "version": "5.2.0-dev.20230614",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -114,5 +114,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "2a37eb2e471e01e510849f0dc108b3699ab869db"
+    "gitHead": "d79ec186d6a4e39f57af6143761d453466a32e0c"
 }