npm - @typescript-deploys/pr-build - Versions diffs - 5.2.0-pr-54503-2 → 5.2.0-pr-54536-13 - Mend

@typescript-deploys/pr-build 5.2.0-pr-54503-2 → 5.2.0-pr-54536-13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/lib/tsc.js CHANGED Viewed

@@ -18,7 +18,7 @@ and limitations under the License.
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-insiders.20230602`;
+var version = `${versionMajorMinor}.0-insiders.20230605`;
 // src/compiler/core.ts
 var emptyArray = [];
@@ -42658,10 +42658,11 @@ var CheckMode = /* @__PURE__ */ ((CheckMode3) => {
   CheckMode3[CheckMode3["Inferential"] = 2] = "Inferential";
   CheckMode3[CheckMode3["SkipContextSensitive"] = 4] = "SkipContextSensitive";
   CheckMode3[CheckMode3["SkipGenericFunctions"] = 8] = "SkipGenericFunctions";
-  CheckMode3[CheckMode3["IsForSignatureHelp"] = 16] = "IsForSignatureHelp";
-  CheckMode3[CheckMode3["IsForStringLiteralArgumentCompletions"] = 32] = "IsForStringLiteralArgumentCompletions";
-  CheckMode3[CheckMode3["RestBindingElement"] = 64] = "RestBindingElement";
-  CheckMode3[CheckMode3["TypeOnly"] = 128] = "TypeOnly";
+  CheckMode3[CheckMode3["SkipAddingIntraExpressionSites"] = 16] = "SkipAddingIntraExpressionSites";
+  CheckMode3[CheckMode3["IsForSignatureHelp"] = 32] = "IsForSignatureHelp";
+  CheckMode3[CheckMode3["IsForStringLiteralArgumentCompletions"] = 64] = "IsForStringLiteralArgumentCompletions";
+  CheckMode3[CheckMode3["RestBindingElement"] = 128] = "RestBindingElement";
+  CheckMode3[CheckMode3["TypeOnly"] = 256] = "TypeOnly";
   return CheckMode3;
 })(CheckMode || {});
 var SignatureCheckMode = /* @__PURE__ */ ((SignatureCheckMode3) => {
@@ -42941,9 +42942,9 @@ function createTypeChecker(host) {
       candidatesOutArray,
       /*argumentCount*/
       void 0,
-      32 /* IsForStringLiteralArgumentCompletions */
+      64 /* IsForStringLiteralArgumentCompletions */
     )),
-    getResolvedSignatureForSignatureHelp: (node, candidatesOutArray, argumentCount) => runWithoutResolvedSignatureCaching(node, () => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 16 /* IsForSignatureHelp */)),
+    getResolvedSignatureForSignatureHelp: (node, candidatesOutArray, argumentCount) => runWithoutResolvedSignatureCaching(node, () => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 32 /* IsForSignatureHelp */)),
     getExpandedParameters,
     hasEffectiveRestParameter,
     containsArgumentsReference,
@@ -50898,7 +50899,7 @@ function createTypeChecker(host) {
     return type.flags & (128 /* StringLiteral */ | 256 /* NumberLiteral */) ? "" + type.value : void 0;
   }
   function getTypeForBindingElement(declaration) {
-    const checkMode = declaration.dotDotDotToken ? 64 /* RestBindingElement */ : 0 /* Normal */;
+    const checkMode = declaration.dotDotDotToken ? 128 /* RestBindingElement */ : 0 /* Normal */;
     const parentType = getTypeForBindingElementParent(declaration.parent.parent, checkMode);
     return parentType && getBindingElementTypeFromParentType(declaration, parentType);
   }
@@ -52655,19 +52656,13 @@ function createTypeChecker(host) {
     if (getObjectFlags(type) & 4 /* Reference */) {
       const target = type.target;
       const typeArguments = getTypeArguments(type);
-      if (length(target.typeParameters) === length(typeArguments)) {
-        const ref = createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType]));
-        return needApparentType ? getApparentType(ref) : ref;
-      }
+      return length(target.typeParameters) === length(typeArguments) ? createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType])) : type;
     } else if (type.flags & 2097152 /* Intersection */) {
       const types = sameMap(type.types, (t) => getTypeWithThisArgument(t, thisArgument, needApparentType));
       return types !== type.types ? getIntersectionType(types) : type;
     }
     return needApparentType ? getApparentType(type) : type;
   }
-  function getThisArgument(type) {
-    return getObjectFlags(type) & 4 /* Reference */ && length(getTypeArguments(type)) > getTypeReferenceArity(type) ? last(getTypeArguments(type)) : type;
-  }
   function resolveObjectTypeMembers(type, source, typeParameters, typeArguments) {
     let mapper;
     let members;
@@ -53733,7 +53728,7 @@ function createTypeChecker(host) {
       return type.resolvedBaseConstraint;
     }
     const stack = [];
-    return type.resolvedBaseConstraint = getTypeWithThisArgument(getImmediateBaseConstraint(type), getThisArgument(type));
+    return type.resolvedBaseConstraint = getImmediateBaseConstraint(type);
     function getImmediateBaseConstraint(t) {
       if (!t.immediateBaseConstraint) {
         if (!pushTypeResolution(t, 4 /* ImmediateBaseConstraint */)) {
@@ -53825,18 +53820,18 @@ function createTypeChecker(host) {
       }
       if (isGenericTupleType(t)) {
         const newElements = map(getElementTypes(t), (v, i) => {
-          const constraint = t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
-          return constraint && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
+          const constraint = v.flags & 262144 /* TypeParameter */ && t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
+          return constraint !== v && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
         });
         return createTupleType(newElements, t.target.elementFlags, t.target.readonly, t.target.labeledElementDeclarations);
       }
       return t;
     }
   }
-  function getApparentTypeOfIntersectionType(type) {
+  function getApparentTypeOfIntersectionType(type, thisArgument) {
     return type.resolvedApparentType || (type.resolvedApparentType = getTypeWithThisArgument(
       type,
-      type,
+      thisArgument,
       /*needApparentType*/
       true
     ));
@@ -53887,8 +53882,9 @@ function createTypeChecker(host) {
     return !!(type.flags & 8388608 /* IndexedAccess */ && getObjectFlags(objectType = type.objectType) & 32 /* Mapped */ && !isGenericMappedType(objectType) && isGenericIndexType(type.indexType) && !(getMappedTypeModifiers(objectType) & 8 /* ExcludeOptional */) && !objectType.declaration.nameType);
   }
   function getApparentType(type) {
-    const t = !(type.flags & 465829888 /* Instantiable */) ? type : getBaseConstraintOfType(type) || unknownType;
-    return getObjectFlags(t) & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
+    const t = type.flags & 465829888 /* Instantiable */ ? getBaseConstraintOfType(type) || unknownType : type;
+    const objectFlags = getObjectFlags(t);
+    return objectFlags & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : objectFlags & 4 /* Reference */ && t !== type ? getTypeWithThisArgument(t, type) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t, type) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
   }
   function getReducedApparentType(type) {
     return getReducedType(getApparentType(getReducedType(type)));
@@ -60709,7 +60705,7 @@ function createTypeChecker(host) {
           return 3 /* Maybe */;
         }
         const c = target2;
-        if (!c.root.inferTypeParameters && !isDistributionDependent(c.root)) {
+        if (!c.root.inferTypeParameters && !isDistributionDependent(c.root) && !(source2.flags & 16777216 /* Conditional */ && source2.root === c.root)) {
           const skipTrue = !isTypeAssignableTo(getPermissiveInstantiation(c.checkType), getPermissiveInstantiation(c.extendsType));
           const skipFalse = !skipTrue && isTypeAssignableTo(getRestrictiveInstantiation(c.checkType), getRestrictiveInstantiation(c.extendsType));
           if (result2 = skipTrue ? -1 /* True */ : isRelatedTo(
@@ -65795,7 +65791,7 @@ function createTypeChecker(host) {
     return type.flags & 2097152 /* Intersection */ ? some(type.types, isGenericTypeWithoutNullableConstraint) : !!(type.flags & 465829888 /* Instantiable */ && !maybeTypeOfKind(getBaseConstraintOrType(type), 98304 /* Nullable */));
   }
   function hasContextualTypeWithNoGenericTypes(node, checkMode) {
-    const contextualType = (isIdentifier(node) || isPropertyAccessExpression(node) || isElementAccessExpression(node)) && !((isJsxOpeningElement(node.parent) || isJsxSelfClosingElement(node.parent)) && node.parent.tagName === node) && (checkMode && checkMode & 64 /* RestBindingElement */ ? getContextualType(node, 8 /* SkipBindingPatterns */) : getContextualType(
+    const contextualType = (isIdentifier(node) || isPropertyAccessExpression(node) || isElementAccessExpression(node)) && !((isJsxOpeningElement(node.parent) || isJsxSelfClosingElement(node.parent)) && node.parent.tagName === node) && (checkMode && checkMode & 128 /* RestBindingElement */ ? getContextualType(node, 8 /* SkipBindingPatterns */) : getContextualType(
       node,
       /*contextFlags*/
       void 0
@@ -66552,7 +66548,7 @@ function createTypeChecker(host) {
   function getContextualTypeForBindingElement(declaration, contextFlags) {
     const parent = declaration.parent.parent;
     const name = declaration.propertyName || declaration.name;
-    const parentType = getContextualTypeForVariableLikeDeclaration(parent, contextFlags) || parent.kind !== 207 /* BindingElement */ && parent.initializer && checkDeclarationInitializer(parent, declaration.dotDotDotToken ? 64 /* RestBindingElement */ : 0 /* Normal */);
+    const parentType = getContextualTypeForVariableLikeDeclaration(parent, contextFlags) || parent.kind !== 207 /* BindingElement */ && parent.initializer && checkDeclarationInitializer(parent, declaration.dotDotDotToken ? 128 /* RestBindingElement */ : 0 /* Normal */);
     if (!parentType || isBindingPattern(name) || isComputedNonLiteralName(name))
       return void 0;
     if (parent.name.kind === 206 /* ArrayBindingPattern */) {
@@ -67601,7 +67597,9 @@ function createTypeChecker(host) {
         elementTypes.push(undefinedOrMissingType);
         elementFlags.push(2 /* Optional */);
       } else {
-        const type = checkExpressionForMutableLocation(e, checkMode, forceTuple);
+        const shouldAddAsIntraExpressionInferenceSite = inTupleContext && checkMode && checkMode & 2 /* Inferential */ && !(checkMode & (4 /* SkipContextSensitive */ | 16 /* SkipAddingIntraExpressionSites */)) && isContextSensitive(e);
+        const elementCheckMode = (checkMode || 0 /* Normal */) | (shouldAddAsIntraExpressionInferenceSite ? 16 /* SkipAddingIntraExpressionSites */ : 0);
+        const type = checkExpressionForMutableLocation(e, elementCheckMode, forceTuple);
         elementTypes.push(addOptionality(
           type,
           /*isProperty*/
@@ -67609,7 +67607,7 @@ function createTypeChecker(host) {
           hasOmittedExpression
         ));
         elementFlags.push(hasOmittedExpression ? 2 /* Optional */ : 1 /* Required */);
-        if (inTupleContext && checkMode && checkMode & 2 /* Inferential */ && !(checkMode & 4 /* SkipContextSensitive */) && isContextSensitive(e)) {
+        if (shouldAddAsIntraExpressionInferenceSite) {
           const inferenceContext = getInferenceContext(node);
           Debug.assert(inferenceContext);
           addIntraExpressionInferenceSite(inferenceContext, e, type);
@@ -67750,11 +67748,13 @@ function createTypeChecker(host) {
       let member = getSymbolOfDeclaration(memberDecl);
       const computedNameType = memberDecl.name && memberDecl.name.kind === 166 /* ComputedPropertyName */ ? checkComputedPropertyName(memberDecl.name) : void 0;
       if (memberDecl.kind === 302 /* PropertyAssignment */ || memberDecl.kind === 303 /* ShorthandPropertyAssignment */ || isObjectLiteralMethod(memberDecl)) {
-        let type = memberDecl.kind === 302 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) : (
+        const shouldAddAsIntraExpressionInferenceSite = contextualType && checkMode & 2 /* Inferential */ && !(checkMode & (4 /* SkipContextSensitive */ | 16 /* SkipAddingIntraExpressionSites */)) && (memberDecl.kind === 302 /* PropertyAssignment */ || memberDecl.kind === 173 /* MethodDeclaration */) && isContextSensitive(memberDecl);
+        const propCheckMode = checkMode | (shouldAddAsIntraExpressionInferenceSite ? 16 /* SkipAddingIntraExpressionSites */ : 0);
+        let type = memberDecl.kind === 302 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, propCheckMode) : (
           // avoid resolving the left side of the ShorthandPropertyAssignment outside of the destructuring
           // for error recovery purposes. For example, if a user wrote `{ a = 100 }` instead of `{ a: 100 }`.
           // we don't want to say "could not find 'a'".
-          memberDecl.kind === 303 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(!inDestructuringPattern && memberDecl.objectAssignmentInitializer ? memberDecl.objectAssignmentInitializer : memberDecl.name, checkMode) : checkObjectLiteralMethod(memberDecl, checkMode)
+          memberDecl.kind === 303 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(!inDestructuringPattern && memberDecl.objectAssignmentInitializer ? memberDecl.objectAssignmentInitializer : memberDecl.name, propCheckMode) : checkObjectLiteralMethod(memberDecl, propCheckMode)
         );
         if (isInJavascript) {
           const jsDocType = getTypeForDeclarationFromJSDocComment(memberDecl);
@@ -67798,7 +67798,7 @@ function createTypeChecker(host) {
         prop.links.target = member;
         member = prop;
         allPropertiesTable == null ? void 0 : allPropertiesTable.set(prop.escapedName, prop);
-        if (contextualType && checkMode & 2 /* Inferential */ && !(checkMode & 4 /* SkipContextSensitive */) && (memberDecl.kind === 302 /* PropertyAssignment */ || memberDecl.kind === 173 /* MethodDeclaration */) && isContextSensitive(memberDecl)) {
+        if (shouldAddAsIntraExpressionInferenceSite) {
           const inferenceContext = getInferenceContext(node);
           Debug.assert(inferenceContext);
           const inferenceNode = memberDecl.kind === 302 /* PropertyAssignment */ ? memberDecl.initializer : memberDecl;
@@ -67971,7 +67971,9 @@ function createTypeChecker(host) {
     for (const attributeDecl of attributes.properties) {
       const member = attributeDecl.symbol;
       if (isJsxAttribute(attributeDecl)) {
-        const exprType = checkJsxAttribute(attributeDecl, checkMode);
+        const shouldAddAsIntraExpressionInferenceSite = contextualType && checkMode & 2 /* Inferential */ && !(checkMode & (4 /* SkipContextSensitive */ | 16 /* SkipAddingIntraExpressionSites */)) && isContextSensitive(attributeDecl);
+        const attributeCheckMode = checkMode | (shouldAddAsIntraExpressionInferenceSite ? 16 /* SkipAddingIntraExpressionSites */ : 0);
+        const exprType = checkJsxAttribute(attributeDecl, attributeCheckMode);
         objectFlags |= getObjectFlags(exprType) & 458752 /* PropagatingFlags */;
         const attributeSymbol = createSymbol(4 /* Property */ | member.flags, member.escapedName);
         attributeSymbol.declarations = member.declarations;
@@ -67992,7 +67994,7 @@ function createTypeChecker(host) {
             addDeprecatedSuggestion(attributeDecl.name, prop.declarations, attributeDecl.name.escapedText);
           }
         }
-        if (contextualType && checkMode & 2 /* Inferential */ && !(checkMode & 4 /* SkipContextSensitive */) && isContextSensitive(attributeDecl)) {
+        if (shouldAddAsIntraExpressionInferenceSite) {
           const inferenceContext = getInferenceContext(attributes);
           Debug.assert(inferenceContext);
           const inferenceNode = attributeDecl.initializer.expression;
@@ -69610,7 +69612,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 */ && !(checkMode & 64 /* IsForStringLiteralArgumentCompletions */ && hasSkipDirectInferenceFlag(arg))) {
         const paramType = getTypeAtPosition(signature, i);
         if (couldContainTypeVariables(paramType)) {
           const argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
@@ -70223,12 +70225,12 @@ 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 */;
+    argCheckMode |= checkMode & 64 /* IsForStringLiteralArgumentCompletions */;
     let candidatesForArgumentError;
     let candidateForArgumentArityError;
     let candidateForTypeArgumentError;
     let result;
-    const signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 212 /* CallExpression */ && node.arguments.hasTrailingComma;
+    const signatureHelpTrailingComma = !!(checkMode & 32 /* IsForSignatureHelp */) && node.kind === 212 /* CallExpression */ && node.arguments.hasTrailingComma;
     if (candidates.length > 1) {
       result = chooseOverload(candidates, subtypeRelation, isSingleNonGenericCandidate, signatureHelpTrailingComma);
     }
@@ -70447,7 +70449,7 @@ function createTypeChecker(host) {
           continue;
         }
         if (argCheckMode) {
-          argCheckMode = checkMode & 32 /* IsForStringLiteralArgumentCompletions */;
+          argCheckMode = checkMode & 64 /* IsForStringLiteralArgumentCompletions */;
           if (inferenceContext) {
             const typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext);
             checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, isInJSFile(candidate.declaration), inferenceContext.inferredTypeParameters);
@@ -73525,7 +73527,7 @@ function createTypeChecker(host) {
       case 36 /* ExclamationEqualsToken */:
       case 37 /* EqualsEqualsEqualsToken */:
       case 38 /* ExclamationEqualsEqualsToken */:
-        if (!(checkMode && checkMode & 128 /* TypeOnly */)) {
+        if (!(checkMode && checkMode & 256 /* TypeOnly */)) {
           if (isLiteralExpressionOfObject(left) || isLiteralExpressionOfObject(right)) {
             const eqType = operator === 35 /* EqualsEqualsToken */ || operator === 37 /* EqualsEqualsEqualsToken */;
             error(errorNode, Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value, eqType ? "false" : "true");
@@ -74184,7 +74186,7 @@ function createTypeChecker(host) {
       }
     }
     const startInvocationCount = flowInvocationCount;
-    const type = checkExpression(node, 128 /* TypeOnly */);
+    const type = checkExpression(node, 256 /* TypeOnly */);
     if (flowInvocationCount !== startInvocationCount) {
       const cache = flowTypeCache || (flowTypeCache = []);
       cache[getNodeId(node)] = type;
@@ -76655,7 +76657,7 @@ function createTypeChecker(host) {
         checkComputedPropertyName(node.propertyName);
       }
       const parent = node.parent.parent;
-      const parentCheckMode = node.dotDotDotToken ? 64 /* RestBindingElement */ : 0 /* Normal */;
+      const parentCheckMode = node.dotDotDotToken ? 128 /* RestBindingElement */ : 0 /* Normal */;
       const parentType = getTypeForBindingElementParent(parent, parentCheckMode);
       const name = node.propertyName || node.name;
       if (parentType && !isBindingPattern(name)) {

package/lib/tsserver.js CHANGED Viewed

@@ -2304,7 +2304,7 @@ module.exports = __toCommonJS(server_exports);
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-insiders.20230602`;
+var version = `${versionMajorMinor}.0-insiders.20230605`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -47309,10 +47309,11 @@ var CheckMode = /* @__PURE__ */ ((CheckMode3) => {
   CheckMode3[CheckMode3["Inferential"] = 2] = "Inferential";
   CheckMode3[CheckMode3["SkipContextSensitive"] = 4] = "SkipContextSensitive";
   CheckMode3[CheckMode3["SkipGenericFunctions"] = 8] = "SkipGenericFunctions";
-  CheckMode3[CheckMode3["IsForSignatureHelp"] = 16] = "IsForSignatureHelp";
-  CheckMode3[CheckMode3["IsForStringLiteralArgumentCompletions"] = 32] = "IsForStringLiteralArgumentCompletions";
-  CheckMode3[CheckMode3["RestBindingElement"] = 64] = "RestBindingElement";
-  CheckMode3[CheckMode3["TypeOnly"] = 128] = "TypeOnly";
+  CheckMode3[CheckMode3["SkipAddingIntraExpressionSites"] = 16] = "SkipAddingIntraExpressionSites";
+  CheckMode3[CheckMode3["IsForSignatureHelp"] = 32] = "IsForSignatureHelp";
+  CheckMode3[CheckMode3["IsForStringLiteralArgumentCompletions"] = 64] = "IsForStringLiteralArgumentCompletions";
+  CheckMode3[CheckMode3["RestBindingElement"] = 128] = "RestBindingElement";
+  CheckMode3[CheckMode3["TypeOnly"] = 256] = "TypeOnly";
   return CheckMode3;
 })(CheckMode || {});
 var SignatureCheckMode = /* @__PURE__ */ ((SignatureCheckMode3) => {
@@ -47592,9 +47593,9 @@ function createTypeChecker(host) {
       candidatesOutArray,
       /*argumentCount*/
       void 0,
-      32 /* IsForStringLiteralArgumentCompletions */
+      64 /* IsForStringLiteralArgumentCompletions */
     )),
-    getResolvedSignatureForSignatureHelp: (node, candidatesOutArray, argumentCount) => runWithoutResolvedSignatureCaching(node, () => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 16 /* IsForSignatureHelp */)),
+    getResolvedSignatureForSignatureHelp: (node, candidatesOutArray, argumentCount) => runWithoutResolvedSignatureCaching(node, () => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 32 /* IsForSignatureHelp */)),
     getExpandedParameters,
     hasEffectiveRestParameter,
     containsArgumentsReference,
@@ -55549,7 +55550,7 @@ function createTypeChecker(host) {
     return type.flags & (128 /* StringLiteral */ | 256 /* NumberLiteral */) ? "" + type.value : void 0;
   }
   function getTypeForBindingElement(declaration) {
-    const checkMode = declaration.dotDotDotToken ? 64 /* RestBindingElement */ : 0 /* Normal */;
+    const checkMode = declaration.dotDotDotToken ? 128 /* RestBindingElement */ : 0 /* Normal */;
     const parentType = getTypeForBindingElementParent(declaration.parent.parent, checkMode);
     return parentType && getBindingElementTypeFromParentType(declaration, parentType);
   }
@@ -57306,19 +57307,13 @@ function createTypeChecker(host) {
     if (getObjectFlags(type) & 4 /* Reference */) {
       const target = type.target;
       const typeArguments = getTypeArguments(type);
-      if (length(target.typeParameters) === length(typeArguments)) {
-        const ref = createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType]));
-        return needApparentType ? getApparentType(ref) : ref;
-      }
+      return length(target.typeParameters) === length(typeArguments) ? createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType])) : type;
     } else if (type.flags & 2097152 /* Intersection */) {
       const types = sameMap(type.types, (t) => getTypeWithThisArgument(t, thisArgument, needApparentType));
       return types !== type.types ? getIntersectionType(types) : type;
     }
     return needApparentType ? getApparentType(type) : type;
   }
-  function getThisArgument(type) {
-    return getObjectFlags(type) & 4 /* Reference */ && length(getTypeArguments(type)) > getTypeReferenceArity(type) ? last(getTypeArguments(type)) : type;
-  }
   function resolveObjectTypeMembers(type, source, typeParameters, typeArguments) {
     let mapper;
     let members;
@@ -58384,7 +58379,7 @@ function createTypeChecker(host) {
       return type.resolvedBaseConstraint;
     }
     const stack = [];
-    return type.resolvedBaseConstraint = getTypeWithThisArgument(getImmediateBaseConstraint(type), getThisArgument(type));
+    return type.resolvedBaseConstraint = getImmediateBaseConstraint(type);
     function getImmediateBaseConstraint(t) {
       if (!t.immediateBaseConstraint) {
         if (!pushTypeResolution(t, 4 /* ImmediateBaseConstraint */)) {
@@ -58476,18 +58471,18 @@ function createTypeChecker(host) {
       }
       if (isGenericTupleType(t)) {
         const newElements = map(getElementTypes(t), (v, i) => {
-          const constraint = t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
-          return constraint && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
+          const constraint = v.flags & 262144 /* TypeParameter */ && t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
+          return constraint !== v && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
         });
         return createTupleType(newElements, t.target.elementFlags, t.target.readonly, t.target.labeledElementDeclarations);
       }
       return t;
     }
   }
-  function getApparentTypeOfIntersectionType(type) {
+  function getApparentTypeOfIntersectionType(type, thisArgument) {
     return type.resolvedApparentType || (type.resolvedApparentType = getTypeWithThisArgument(
       type,
-      type,
+      thisArgument,
       /*needApparentType*/
       true
     ));
@@ -58538,8 +58533,9 @@ function createTypeChecker(host) {
     return !!(type.flags & 8388608 /* IndexedAccess */ && getObjectFlags(objectType = type.objectType) & 32 /* Mapped */ && !isGenericMappedType(objectType) && isGenericIndexType(type.indexType) && !(getMappedTypeModifiers(objectType) & 8 /* ExcludeOptional */) && !objectType.declaration.nameType);
   }
   function getApparentType(type) {
-    const t = !(type.flags & 465829888 /* Instantiable */) ? type : getBaseConstraintOfType(type) || unknownType;
-    return getObjectFlags(t) & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
+    const t = type.flags & 465829888 /* Instantiable */ ? getBaseConstraintOfType(type) || unknownType : type;
+    const objectFlags = getObjectFlags(t);
+    return objectFlags & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : objectFlags & 4 /* Reference */ && t !== type ? getTypeWithThisArgument(t, type) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t, type) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
   }
   function getReducedApparentType(type) {
     return getReducedType(getApparentType(getReducedType(type)));
@@ -65360,7 +65356,7 @@ function createTypeChecker(host) {
           return 3 /* Maybe */;
         }
         const c = target2;
-        if (!c.root.inferTypeParameters && !isDistributionDependent(c.root)) {
+        if (!c.root.inferTypeParameters && !isDistributionDependent(c.root) && !(source2.flags & 16777216 /* Conditional */ && source2.root === c.root)) {
           const skipTrue = !isTypeAssignableTo(getPermissiveInstantiation(c.checkType), getPermissiveInstantiation(c.extendsType));
           const skipFalse = !skipTrue && isTypeAssignableTo(getRestrictiveInstantiation(c.checkType), getRestrictiveInstantiation(c.extendsType));
           if (result2 = skipTrue ? -1 /* True */ : isRelatedTo(
@@ -70446,7 +70442,7 @@ function createTypeChecker(host) {
     return type.flags & 2097152 /* Intersection */ ? some(type.types, isGenericTypeWithoutNullableConstraint) : !!(type.flags & 465829888 /* Instantiable */ && !maybeTypeOfKind(getBaseConstraintOrType(type), 98304 /* Nullable */));
   }
   function hasContextualTypeWithNoGenericTypes(node, checkMode) {
-    const contextualType = (isIdentifier(node) || isPropertyAccessExpression(node) || isElementAccessExpression(node)) && !((isJsxOpeningElement(node.parent) || isJsxSelfClosingElement(node.parent)) && node.parent.tagName === node) && (checkMode && checkMode & 64 /* RestBindingElement */ ? getContextualType2(node, 8 /* SkipBindingPatterns */) : getContextualType2(
+    const contextualType = (isIdentifier(node) || isPropertyAccessExpression(node) || isElementAccessExpression(node)) && !((isJsxOpeningElement(node.parent) || isJsxSelfClosingElement(node.parent)) && node.parent.tagName === node) && (checkMode && checkMode & 128 /* RestBindingElement */ ? getContextualType2(node, 8 /* SkipBindingPatterns */) : getContextualType2(
       node,
       /*contextFlags*/
       void 0
@@ -71203,7 +71199,7 @@ function createTypeChecker(host) {
   function getContextualTypeForBindingElement(declaration, contextFlags) {
     const parent2 = declaration.parent.parent;
     const name = declaration.propertyName || declaration.name;
-    const parentType = getContextualTypeForVariableLikeDeclaration(parent2, contextFlags) || parent2.kind !== 207 /* BindingElement */ && parent2.initializer && checkDeclarationInitializer(parent2, declaration.dotDotDotToken ? 64 /* RestBindingElement */ : 0 /* Normal */);
+    const parentType = getContextualTypeForVariableLikeDeclaration(parent2, contextFlags) || parent2.kind !== 207 /* BindingElement */ && parent2.initializer && checkDeclarationInitializer(parent2, declaration.dotDotDotToken ? 128 /* RestBindingElement */ : 0 /* Normal */);
     if (!parentType || isBindingPattern(name) || isComputedNonLiteralName(name))
       return void 0;
     if (parent2.name.kind === 206 /* ArrayBindingPattern */) {
@@ -72252,7 +72248,9 @@ function createTypeChecker(host) {
         elementTypes.push(undefinedOrMissingType);
         elementFlags.push(2 /* Optional */);
       } else {
-        const type = checkExpressionForMutableLocation(e, checkMode, forceTuple);
+        const shouldAddAsIntraExpressionInferenceSite = inTupleContext && checkMode && checkMode & 2 /* Inferential */ && !(checkMode & (4 /* SkipContextSensitive */ | 16 /* SkipAddingIntraExpressionSites */)) && isContextSensitive(e);
+        const elementCheckMode = (checkMode || 0 /* Normal */) | (shouldAddAsIntraExpressionInferenceSite ? 16 /* SkipAddingIntraExpressionSites */ : 0);
+        const type = checkExpressionForMutableLocation(e, elementCheckMode, forceTuple);
         elementTypes.push(addOptionality(
           type,
           /*isProperty*/
@@ -72260,7 +72258,7 @@ function createTypeChecker(host) {
           hasOmittedExpression
         ));
         elementFlags.push(hasOmittedExpression ? 2 /* Optional */ : 1 /* Required */);
-        if (inTupleContext && checkMode && checkMode & 2 /* Inferential */ && !(checkMode & 4 /* SkipContextSensitive */) && isContextSensitive(e)) {
+        if (shouldAddAsIntraExpressionInferenceSite) {
           const inferenceContext = getInferenceContext(node);
           Debug.assert(inferenceContext);
           addIntraExpressionInferenceSite(inferenceContext, e, type);
@@ -72401,11 +72399,13 @@ function createTypeChecker(host) {
       let member = getSymbolOfDeclaration(memberDecl);
       const computedNameType = memberDecl.name && memberDecl.name.kind === 166 /* ComputedPropertyName */ ? checkComputedPropertyName(memberDecl.name) : void 0;
       if (memberDecl.kind === 302 /* PropertyAssignment */ || memberDecl.kind === 303 /* ShorthandPropertyAssignment */ || isObjectLiteralMethod(memberDecl)) {
-        let type = memberDecl.kind === 302 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) : (
+        const shouldAddAsIntraExpressionInferenceSite = contextualType && checkMode & 2 /* Inferential */ && !(checkMode & (4 /* SkipContextSensitive */ | 16 /* SkipAddingIntraExpressionSites */)) && (memberDecl.kind === 302 /* PropertyAssignment */ || memberDecl.kind === 173 /* MethodDeclaration */) && isContextSensitive(memberDecl);
+        const propCheckMode = checkMode | (shouldAddAsIntraExpressionInferenceSite ? 16 /* SkipAddingIntraExpressionSites */ : 0);
+        let type = memberDecl.kind === 302 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, propCheckMode) : (
           // avoid resolving the left side of the ShorthandPropertyAssignment outside of the destructuring
           // for error recovery purposes. For example, if a user wrote `{ a = 100 }` instead of `{ a: 100 }`.
           // we don't want to say "could not find 'a'".
-          memberDecl.kind === 303 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(!inDestructuringPattern && memberDecl.objectAssignmentInitializer ? memberDecl.objectAssignmentInitializer : memberDecl.name, checkMode) : checkObjectLiteralMethod(memberDecl, checkMode)
+          memberDecl.kind === 303 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(!inDestructuringPattern && memberDecl.objectAssignmentInitializer ? memberDecl.objectAssignmentInitializer : memberDecl.name, propCheckMode) : checkObjectLiteralMethod(memberDecl, propCheckMode)
         );
         if (isInJavascript) {
           const jsDocType = getTypeForDeclarationFromJSDocComment(memberDecl);
@@ -72449,7 +72449,7 @@ function createTypeChecker(host) {
         prop.links.target = member;
         member = prop;
         allPropertiesTable == null ? void 0 : allPropertiesTable.set(prop.escapedName, prop);
-        if (contextualType && checkMode & 2 /* Inferential */ && !(checkMode & 4 /* SkipContextSensitive */) && (memberDecl.kind === 302 /* PropertyAssignment */ || memberDecl.kind === 173 /* MethodDeclaration */) && isContextSensitive(memberDecl)) {
+        if (shouldAddAsIntraExpressionInferenceSite) {
           const inferenceContext = getInferenceContext(node);
           Debug.assert(inferenceContext);
           const inferenceNode = memberDecl.kind === 302 /* PropertyAssignment */ ? memberDecl.initializer : memberDecl;
@@ -72622,7 +72622,9 @@ function createTypeChecker(host) {
     for (const attributeDecl of attributes.properties) {
       const member = attributeDecl.symbol;
       if (isJsxAttribute(attributeDecl)) {
-        const exprType = checkJsxAttribute(attributeDecl, checkMode);
+        const shouldAddAsIntraExpressionInferenceSite = contextualType && checkMode & 2 /* Inferential */ && !(checkMode & (4 /* SkipContextSensitive */ | 16 /* SkipAddingIntraExpressionSites */)) && isContextSensitive(attributeDecl);
+        const attributeCheckMode = checkMode | (shouldAddAsIntraExpressionInferenceSite ? 16 /* SkipAddingIntraExpressionSites */ : 0);
+        const exprType = checkJsxAttribute(attributeDecl, attributeCheckMode);
         objectFlags |= getObjectFlags(exprType) & 458752 /* PropagatingFlags */;
         const attributeSymbol = createSymbol(4 /* Property */ | member.flags, member.escapedName);
         attributeSymbol.declarations = member.declarations;
@@ -72643,7 +72645,7 @@ function createTypeChecker(host) {
             addDeprecatedSuggestion(attributeDecl.name, prop.declarations, attributeDecl.name.escapedText);
           }
         }
-        if (contextualType && checkMode & 2 /* Inferential */ && !(checkMode & 4 /* SkipContextSensitive */) && isContextSensitive(attributeDecl)) {
+        if (shouldAddAsIntraExpressionInferenceSite) {
           const inferenceContext = getInferenceContext(attributes);
           Debug.assert(inferenceContext);
           const inferenceNode = attributeDecl.initializer.expression;
@@ -74261,7 +74263,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 */ && !(checkMode & 64 /* IsForStringLiteralArgumentCompletions */ && hasSkipDirectInferenceFlag(arg))) {
         const paramType = getTypeAtPosition(signature, i);
         if (couldContainTypeVariables(paramType)) {
           const argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
@@ -74874,12 +74876,12 @@ 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 */;
+    argCheckMode |= checkMode & 64 /* IsForStringLiteralArgumentCompletions */;
     let candidatesForArgumentError;
     let candidateForArgumentArityError;
     let candidateForTypeArgumentError;
     let result;
-    const signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 212 /* CallExpression */ && node.arguments.hasTrailingComma;
+    const signatureHelpTrailingComma = !!(checkMode & 32 /* IsForSignatureHelp */) && node.kind === 212 /* CallExpression */ && node.arguments.hasTrailingComma;
     if (candidates.length > 1) {
       result = chooseOverload(candidates, subtypeRelation, isSingleNonGenericCandidate, signatureHelpTrailingComma);
     }
@@ -75098,7 +75100,7 @@ function createTypeChecker(host) {
           continue;
         }
         if (argCheckMode) {
-          argCheckMode = checkMode & 32 /* IsForStringLiteralArgumentCompletions */;
+          argCheckMode = checkMode & 64 /* IsForStringLiteralArgumentCompletions */;
           if (inferenceContext) {
             const typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext);
             checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, isInJSFile(candidate.declaration), inferenceContext.inferredTypeParameters);
@@ -78176,7 +78178,7 @@ function createTypeChecker(host) {
       case 36 /* ExclamationEqualsToken */:
       case 37 /* EqualsEqualsEqualsToken */:
       case 38 /* ExclamationEqualsEqualsToken */:
-        if (!(checkMode && checkMode & 128 /* TypeOnly */)) {
+        if (!(checkMode && checkMode & 256 /* TypeOnly */)) {
           if (isLiteralExpressionOfObject(left) || isLiteralExpressionOfObject(right)) {
             const eqType = operator === 35 /* EqualsEqualsToken */ || operator === 37 /* EqualsEqualsEqualsToken */;
             error(errorNode, Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value, eqType ? "false" : "true");
@@ -78835,7 +78837,7 @@ function createTypeChecker(host) {
       }
     }
     const startInvocationCount = flowInvocationCount;
-    const type = checkExpression(node, 128 /* TypeOnly */);
+    const type = checkExpression(node, 256 /* TypeOnly */);
     if (flowInvocationCount !== startInvocationCount) {
       const cache = flowTypeCache || (flowTypeCache = []);
       cache[getNodeId(node)] = type;
@@ -81306,7 +81308,7 @@ function createTypeChecker(host) {
         checkComputedPropertyName(node.propertyName);
       }
       const parent2 = node.parent.parent;
-      const parentCheckMode = node.dotDotDotToken ? 64 /* RestBindingElement */ : 0 /* Normal */;
+      const parentCheckMode = node.dotDotDotToken ? 128 /* RestBindingElement */ : 0 /* Normal */;
       const parentType = getTypeForBindingElementParent(parent2, parentCheckMode);
       const name = node.propertyName || node.name;
       if (parentType && !isBindingPattern(name)) {
@@ -162741,13 +162743,29 @@ function provideInlayHints(context) {
     if (!signature || !candidates.length) {
       return;
     }
-    let pos = 0;
+    let signatureParamPos = 0;
     for (const originalArg of args) {
       const arg = skipParentheses(originalArg);
       if (shouldShowLiteralParameterNameHintsOnly(preferences) && !isHintableLiteral(arg)) {
         continue;
       }
-      const identifierNameInfo = checker.getParameterIdentifierNameAtPosition(signature, pos++);
+      let spreadArgs = 0;
+      if (isSpreadElement(arg)) {
+        const spreadType = checker.getTypeAtLocation(arg.expression);
+        if (checker.isTupleType(spreadType)) {
+          const { elementFlags, fixedLength } = spreadType.target;
+          if (fixedLength === 0) {
+            continue;
+          }
+          const firstOptionalIndex = findIndex(elementFlags, (f) => !(f & 1 /* Required */));
+          const requiredArgs = firstOptionalIndex < 0 ? fixedLength : firstOptionalIndex;
+          if (requiredArgs > 0) {
+            spreadArgs = firstOptionalIndex < 0 ? fixedLength : firstOptionalIndex;
+          }
+        }
+      }
+      const identifierNameInfo = checker.getParameterIdentifierNameAtPosition(signature, signatureParamPos);
+      signatureParamPos = signatureParamPos + (spreadArgs || 1);
       if (identifierNameInfo) {
         const [parameterName, isFirstVariadicArgument] = identifierNameInfo;
         const isParameterNameNotSameAsArgument = preferences.includeInlayParameterNameHintsWhenArgumentMatchesName || !identifierOrAccessExpressionPostfixMatchesParameterName(arg, parameterName);
@@ -162758,17 +162776,6 @@ function provideInlayHints(context) {
         if (leadingCommentsContainsParameterName(arg, name)) {
           continue;
         }
-        if (isSpreadElement(arg)) {
-          const spreadType = checker.getTypeAtLocation(arg.expression);
-          if (checker.isTupleType(spreadType)) {
-            const { fixedLength, elementFlags } = spreadType.target;
-            for (let i = pos; i < fixedLength; i++) {
-              if (elementFlags[i] & 1 /* Required */) {
-                pos++;
-              }
-            }
-          }
-        }
         addParameterHints(name, originalArg.getStart(), isFirstVariadicArgument);
       }
     }

package/lib/tsserverlibrary.js CHANGED Viewed

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-insiders.20230602`;
+      version = `${versionMajorMinor}.0-insiders.20230605`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -45382,9 +45382,9 @@ ${lanes.join("\n")}
         candidatesOutArray,
         /*argumentCount*/
         void 0,
-        32 /* IsForStringLiteralArgumentCompletions */
+        64 /* IsForStringLiteralArgumentCompletions */
       )),
-      getResolvedSignatureForSignatureHelp: (node, candidatesOutArray, argumentCount) => runWithoutResolvedSignatureCaching(node, () => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 16 /* IsForSignatureHelp */)),
+      getResolvedSignatureForSignatureHelp: (node, candidatesOutArray, argumentCount) => runWithoutResolvedSignatureCaching(node, () => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 32 /* IsForSignatureHelp */)),
       getExpandedParameters,
       hasEffectiveRestParameter,
       containsArgumentsReference,
@@ -53339,7 +53339,7 @@ ${lanes.join("\n")}
       return type.flags & (128 /* StringLiteral */ | 256 /* NumberLiteral */) ? "" + type.value : void 0;
     }
     function getTypeForBindingElement(declaration) {
-      const checkMode = declaration.dotDotDotToken ? 64 /* RestBindingElement */ : 0 /* Normal */;
+      const checkMode = declaration.dotDotDotToken ? 128 /* RestBindingElement */ : 0 /* Normal */;
       const parentType = getTypeForBindingElementParent(declaration.parent.parent, checkMode);
       return parentType && getBindingElementTypeFromParentType(declaration, parentType);
     }
@@ -55096,19 +55096,13 @@ ${lanes.join("\n")}
       if (getObjectFlags(type) & 4 /* Reference */) {
         const target = type.target;
         const typeArguments = getTypeArguments(type);
-        if (length(target.typeParameters) === length(typeArguments)) {
-          const ref = createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType]));
-          return needApparentType ? getApparentType(ref) : ref;
-        }
+        return length(target.typeParameters) === length(typeArguments) ? createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType])) : type;
       } else if (type.flags & 2097152 /* Intersection */) {
         const types = sameMap(type.types, (t) => getTypeWithThisArgument(t, thisArgument, needApparentType));
         return types !== type.types ? getIntersectionType(types) : type;
       }
       return needApparentType ? getApparentType(type) : type;
     }
-    function getThisArgument(type) {
-      return getObjectFlags(type) & 4 /* Reference */ && length(getTypeArguments(type)) > getTypeReferenceArity(type) ? last(getTypeArguments(type)) : type;
-    }
     function resolveObjectTypeMembers(type, source, typeParameters, typeArguments) {
       let mapper;
       let members;
@@ -56174,7 +56168,7 @@ ${lanes.join("\n")}
         return type.resolvedBaseConstraint;
       }
       const stack = [];
-      return type.resolvedBaseConstraint = getTypeWithThisArgument(getImmediateBaseConstraint(type), getThisArgument(type));
+      return type.resolvedBaseConstraint = getImmediateBaseConstraint(type);
       function getImmediateBaseConstraint(t) {
         if (!t.immediateBaseConstraint) {
           if (!pushTypeResolution(t, 4 /* ImmediateBaseConstraint */)) {
@@ -56266,18 +56260,18 @@ ${lanes.join("\n")}
         }
         if (isGenericTupleType(t)) {
           const newElements = map(getElementTypes(t), (v, i) => {
-            const constraint = t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
-            return constraint && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
+            const constraint = v.flags & 262144 /* TypeParameter */ && t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
+            return constraint !== v && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
           });
           return createTupleType(newElements, t.target.elementFlags, t.target.readonly, t.target.labeledElementDeclarations);
         }
         return t;
       }
     }
-    function getApparentTypeOfIntersectionType(type) {
+    function getApparentTypeOfIntersectionType(type, thisArgument) {
       return type.resolvedApparentType || (type.resolvedApparentType = getTypeWithThisArgument(
         type,
-        type,
+        thisArgument,
         /*needApparentType*/
         true
       ));
@@ -56328,8 +56322,9 @@ ${lanes.join("\n")}
       return !!(type.flags & 8388608 /* IndexedAccess */ && getObjectFlags(objectType = type.objectType) & 32 /* Mapped */ && !isGenericMappedType(objectType) && isGenericIndexType(type.indexType) && !(getMappedTypeModifiers(objectType) & 8 /* ExcludeOptional */) && !objectType.declaration.nameType);
     }
     function getApparentType(type) {
-      const t = !(type.flags & 465829888 /* Instantiable */) ? type : getBaseConstraintOfType(type) || unknownType;
-      return getObjectFlags(t) & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
+      const t = type.flags & 465829888 /* Instantiable */ ? getBaseConstraintOfType(type) || unknownType : type;
+      const objectFlags = getObjectFlags(t);
+      return objectFlags & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : objectFlags & 4 /* Reference */ && t !== type ? getTypeWithThisArgument(t, type) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t, type) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
     }
     function getReducedApparentType(type) {
       return getReducedType(getApparentType(getReducedType(type)));
@@ -63150,7 +63145,7 @@ ${lanes.join("\n")}
             return 3 /* Maybe */;
           }
           const c = target2;
-          if (!c.root.inferTypeParameters && !isDistributionDependent(c.root)) {
+          if (!c.root.inferTypeParameters && !isDistributionDependent(c.root) && !(source2.flags & 16777216 /* Conditional */ && source2.root === c.root)) {
             const skipTrue = !isTypeAssignableTo(getPermissiveInstantiation(c.checkType), getPermissiveInstantiation(c.extendsType));
             const skipFalse = !skipTrue && isTypeAssignableTo(getRestrictiveInstantiation(c.checkType), getRestrictiveInstantiation(c.extendsType));
             if (result2 = skipTrue ? -1 /* True */ : isRelatedTo(
@@ -68236,7 +68231,7 @@ ${lanes.join("\n")}
       return type.flags & 2097152 /* Intersection */ ? some(type.types, isGenericTypeWithoutNullableConstraint) : !!(type.flags & 465829888 /* Instantiable */ && !maybeTypeOfKind(getBaseConstraintOrType(type), 98304 /* Nullable */));
     }
     function hasContextualTypeWithNoGenericTypes(node, checkMode) {
-      const contextualType = (isIdentifier(node) || isPropertyAccessExpression(node) || isElementAccessExpression(node)) && !((isJsxOpeningElement(node.parent) || isJsxSelfClosingElement(node.parent)) && node.parent.tagName === node) && (checkMode && checkMode & 64 /* RestBindingElement */ ? getContextualType2(node, 8 /* SkipBindingPatterns */) : getContextualType2(
+      const contextualType = (isIdentifier(node) || isPropertyAccessExpression(node) || isElementAccessExpression(node)) && !((isJsxOpeningElement(node.parent) || isJsxSelfClosingElement(node.parent)) && node.parent.tagName === node) && (checkMode && checkMode & 128 /* RestBindingElement */ ? getContextualType2(node, 8 /* SkipBindingPatterns */) : getContextualType2(
         node,
         /*contextFlags*/
         void 0
@@ -68993,7 +68988,7 @@ ${lanes.join("\n")}
     function getContextualTypeForBindingElement(declaration, contextFlags) {
       const parent2 = declaration.parent.parent;
       const name = declaration.propertyName || declaration.name;
-      const parentType = getContextualTypeForVariableLikeDeclaration(parent2, contextFlags) || parent2.kind !== 207 /* BindingElement */ && parent2.initializer && checkDeclarationInitializer(parent2, declaration.dotDotDotToken ? 64 /* RestBindingElement */ : 0 /* Normal */);
+      const parentType = getContextualTypeForVariableLikeDeclaration(parent2, contextFlags) || parent2.kind !== 207 /* BindingElement */ && parent2.initializer && checkDeclarationInitializer(parent2, declaration.dotDotDotToken ? 128 /* RestBindingElement */ : 0 /* Normal */);
       if (!parentType || isBindingPattern(name) || isComputedNonLiteralName(name))
         return void 0;
       if (parent2.name.kind === 206 /* ArrayBindingPattern */) {
@@ -70042,7 +70037,9 @@ ${lanes.join("\n")}
           elementTypes.push(undefinedOrMissingType);
           elementFlags.push(2 /* Optional */);
         } else {
-          const type = checkExpressionForMutableLocation(e, checkMode, forceTuple);
+          const shouldAddAsIntraExpressionInferenceSite = inTupleContext && checkMode && checkMode & 2 /* Inferential */ && !(checkMode & (4 /* SkipContextSensitive */ | 16 /* SkipAddingIntraExpressionSites */)) && isContextSensitive(e);
+          const elementCheckMode = (checkMode || 0 /* Normal */) | (shouldAddAsIntraExpressionInferenceSite ? 16 /* SkipAddingIntraExpressionSites */ : 0);
+          const type = checkExpressionForMutableLocation(e, elementCheckMode, forceTuple);
           elementTypes.push(addOptionality(
             type,
             /*isProperty*/
@@ -70050,7 +70047,7 @@ ${lanes.join("\n")}
             hasOmittedExpression
           ));
           elementFlags.push(hasOmittedExpression ? 2 /* Optional */ : 1 /* Required */);
-          if (inTupleContext && checkMode && checkMode & 2 /* Inferential */ && !(checkMode & 4 /* SkipContextSensitive */) && isContextSensitive(e)) {
+          if (shouldAddAsIntraExpressionInferenceSite) {
             const inferenceContext = getInferenceContext(node);
             Debug.assert(inferenceContext);
             addIntraExpressionInferenceSite(inferenceContext, e, type);
@@ -70191,11 +70188,13 @@ ${lanes.join("\n")}
         let member = getSymbolOfDeclaration(memberDecl);
         const computedNameType = memberDecl.name && memberDecl.name.kind === 166 /* ComputedPropertyName */ ? checkComputedPropertyName(memberDecl.name) : void 0;
         if (memberDecl.kind === 302 /* PropertyAssignment */ || memberDecl.kind === 303 /* ShorthandPropertyAssignment */ || isObjectLiteralMethod(memberDecl)) {
-          let type = memberDecl.kind === 302 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) : (
+          const shouldAddAsIntraExpressionInferenceSite = contextualType && checkMode & 2 /* Inferential */ && !(checkMode & (4 /* SkipContextSensitive */ | 16 /* SkipAddingIntraExpressionSites */)) && (memberDecl.kind === 302 /* PropertyAssignment */ || memberDecl.kind === 173 /* MethodDeclaration */) && isContextSensitive(memberDecl);
+          const propCheckMode = checkMode | (shouldAddAsIntraExpressionInferenceSite ? 16 /* SkipAddingIntraExpressionSites */ : 0);
+          let type = memberDecl.kind === 302 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, propCheckMode) : (
             // avoid resolving the left side of the ShorthandPropertyAssignment outside of the destructuring
             // for error recovery purposes. For example, if a user wrote `{ a = 100 }` instead of `{ a: 100 }`.
             // we don't want to say "could not find 'a'".
-            memberDecl.kind === 303 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(!inDestructuringPattern && memberDecl.objectAssignmentInitializer ? memberDecl.objectAssignmentInitializer : memberDecl.name, checkMode) : checkObjectLiteralMethod(memberDecl, checkMode)
+            memberDecl.kind === 303 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(!inDestructuringPattern && memberDecl.objectAssignmentInitializer ? memberDecl.objectAssignmentInitializer : memberDecl.name, propCheckMode) : checkObjectLiteralMethod(memberDecl, propCheckMode)
           );
           if (isInJavascript) {
             const jsDocType = getTypeForDeclarationFromJSDocComment(memberDecl);
@@ -70239,7 +70238,7 @@ ${lanes.join("\n")}
           prop.links.target = member;
           member = prop;
           allPropertiesTable == null ? void 0 : allPropertiesTable.set(prop.escapedName, prop);
-          if (contextualType && checkMode & 2 /* Inferential */ && !(checkMode & 4 /* SkipContextSensitive */) && (memberDecl.kind === 302 /* PropertyAssignment */ || memberDecl.kind === 173 /* MethodDeclaration */) && isContextSensitive(memberDecl)) {
+          if (shouldAddAsIntraExpressionInferenceSite) {
             const inferenceContext = getInferenceContext(node);
             Debug.assert(inferenceContext);
             const inferenceNode = memberDecl.kind === 302 /* PropertyAssignment */ ? memberDecl.initializer : memberDecl;
@@ -70412,7 +70411,9 @@ ${lanes.join("\n")}
       for (const attributeDecl of attributes.properties) {
         const member = attributeDecl.symbol;
         if (isJsxAttribute(attributeDecl)) {
-          const exprType = checkJsxAttribute(attributeDecl, checkMode);
+          const shouldAddAsIntraExpressionInferenceSite = contextualType && checkMode & 2 /* Inferential */ && !(checkMode & (4 /* SkipContextSensitive */ | 16 /* SkipAddingIntraExpressionSites */)) && isContextSensitive(attributeDecl);
+          const attributeCheckMode = checkMode | (shouldAddAsIntraExpressionInferenceSite ? 16 /* SkipAddingIntraExpressionSites */ : 0);
+          const exprType = checkJsxAttribute(attributeDecl, attributeCheckMode);
           objectFlags |= getObjectFlags(exprType) & 458752 /* PropagatingFlags */;
           const attributeSymbol = createSymbol(4 /* Property */ | member.flags, member.escapedName);
           attributeSymbol.declarations = member.declarations;
@@ -70433,7 +70434,7 @@ ${lanes.join("\n")}
               addDeprecatedSuggestion(attributeDecl.name, prop.declarations, attributeDecl.name.escapedText);
             }
           }
-          if (contextualType && checkMode & 2 /* Inferential */ && !(checkMode & 4 /* SkipContextSensitive */) && isContextSensitive(attributeDecl)) {
+          if (shouldAddAsIntraExpressionInferenceSite) {
             const inferenceContext = getInferenceContext(attributes);
             Debug.assert(inferenceContext);
             const inferenceNode = attributeDecl.initializer.expression;
@@ -72051,7 +72052,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 */ && !(checkMode & 64 /* IsForStringLiteralArgumentCompletions */ && hasSkipDirectInferenceFlag(arg))) {
           const paramType = getTypeAtPosition(signature, i);
           if (couldContainTypeVariables(paramType)) {
             const argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
@@ -72664,12 +72665,12 @@ ${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 */;
+      argCheckMode |= checkMode & 64 /* IsForStringLiteralArgumentCompletions */;
       let candidatesForArgumentError;
       let candidateForArgumentArityError;
       let candidateForTypeArgumentError;
       let result;
-      const signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 212 /* CallExpression */ && node.arguments.hasTrailingComma;
+      const signatureHelpTrailingComma = !!(checkMode & 32 /* IsForSignatureHelp */) && node.kind === 212 /* CallExpression */ && node.arguments.hasTrailingComma;
       if (candidates.length > 1) {
         result = chooseOverload(candidates, subtypeRelation, isSingleNonGenericCandidate, signatureHelpTrailingComma);
       }
@@ -72888,7 +72889,7 @@ ${lanes.join("\n")}
             continue;
           }
           if (argCheckMode) {
-            argCheckMode = checkMode & 32 /* IsForStringLiteralArgumentCompletions */;
+            argCheckMode = checkMode & 64 /* IsForStringLiteralArgumentCompletions */;
             if (inferenceContext) {
               const typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext);
               checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, isInJSFile(candidate.declaration), inferenceContext.inferredTypeParameters);
@@ -75966,7 +75967,7 @@ ${lanes.join("\n")}
         case 36 /* ExclamationEqualsToken */:
         case 37 /* EqualsEqualsEqualsToken */:
         case 38 /* ExclamationEqualsEqualsToken */:
-          if (!(checkMode && checkMode & 128 /* TypeOnly */)) {
+          if (!(checkMode && checkMode & 256 /* TypeOnly */)) {
             if (isLiteralExpressionOfObject(left) || isLiteralExpressionOfObject(right)) {
               const eqType = operator === 35 /* EqualsEqualsToken */ || operator === 37 /* EqualsEqualsEqualsToken */;
               error(errorNode, Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value, eqType ? "false" : "true");
@@ -76625,7 +76626,7 @@ ${lanes.join("\n")}
         }
       }
       const startInvocationCount = flowInvocationCount;
-      const type = checkExpression(node, 128 /* TypeOnly */);
+      const type = checkExpression(node, 256 /* TypeOnly */);
       if (flowInvocationCount !== startInvocationCount) {
         const cache = flowTypeCache || (flowTypeCache = []);
         cache[getNodeId(node)] = type;
@@ -79096,7 +79097,7 @@ ${lanes.join("\n")}
           checkComputedPropertyName(node.propertyName);
         }
         const parent2 = node.parent.parent;
-        const parentCheckMode = node.dotDotDotToken ? 64 /* RestBindingElement */ : 0 /* Normal */;
+        const parentCheckMode = node.dotDotDotToken ? 128 /* RestBindingElement */ : 0 /* Normal */;
         const parentType = getTypeForBindingElementParent(parent2, parentCheckMode);
         const name = node.propertyName || node.name;
         if (parentType && !isBindingPattern(name)) {
@@ -85832,10 +85833,11 @@ ${lanes.join("\n")}
         CheckMode3[CheckMode3["Inferential"] = 2] = "Inferential";
         CheckMode3[CheckMode3["SkipContextSensitive"] = 4] = "SkipContextSensitive";
         CheckMode3[CheckMode3["SkipGenericFunctions"] = 8] = "SkipGenericFunctions";
-        CheckMode3[CheckMode3["IsForSignatureHelp"] = 16] = "IsForSignatureHelp";
-        CheckMode3[CheckMode3["IsForStringLiteralArgumentCompletions"] = 32] = "IsForStringLiteralArgumentCompletions";
-        CheckMode3[CheckMode3["RestBindingElement"] = 64] = "RestBindingElement";
-        CheckMode3[CheckMode3["TypeOnly"] = 128] = "TypeOnly";
+        CheckMode3[CheckMode3["SkipAddingIntraExpressionSites"] = 16] = "SkipAddingIntraExpressionSites";
+        CheckMode3[CheckMode3["IsForSignatureHelp"] = 32] = "IsForSignatureHelp";
+        CheckMode3[CheckMode3["IsForStringLiteralArgumentCompletions"] = 64] = "IsForStringLiteralArgumentCompletions";
+        CheckMode3[CheckMode3["RestBindingElement"] = 128] = "RestBindingElement";
+        CheckMode3[CheckMode3["TypeOnly"] = 256] = "TypeOnly";
         return CheckMode3;
       })(CheckMode || {});
       SignatureCheckMode = /* @__PURE__ */ ((SignatureCheckMode3) => {
@@ -162092,13 +162094,29 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       if (!signature || !candidates.length) {
         return;
       }
-      let pos = 0;
+      let signatureParamPos = 0;
       for (const originalArg of args) {
         const arg = skipParentheses(originalArg);
         if (shouldShowLiteralParameterNameHintsOnly(preferences) && !isHintableLiteral(arg)) {
           continue;
         }
-        const identifierNameInfo = checker.getParameterIdentifierNameAtPosition(signature, pos++);
+        let spreadArgs = 0;
+        if (isSpreadElement(arg)) {
+          const spreadType = checker.getTypeAtLocation(arg.expression);
+          if (checker.isTupleType(spreadType)) {
+            const { elementFlags, fixedLength } = spreadType.target;
+            if (fixedLength === 0) {
+              continue;
+            }
+            const firstOptionalIndex = findIndex(elementFlags, (f) => !(f & 1 /* Required */));
+            const requiredArgs = firstOptionalIndex < 0 ? fixedLength : firstOptionalIndex;
+            if (requiredArgs > 0) {
+              spreadArgs = firstOptionalIndex < 0 ? fixedLength : firstOptionalIndex;
+            }
+          }
+        }
+        const identifierNameInfo = checker.getParameterIdentifierNameAtPosition(signature, signatureParamPos);
+        signatureParamPos = signatureParamPos + (spreadArgs || 1);
         if (identifierNameInfo) {
           const [parameterName, isFirstVariadicArgument] = identifierNameInfo;
           const isParameterNameNotSameAsArgument = preferences.includeInlayParameterNameHintsWhenArgumentMatchesName || !identifierOrAccessExpressionPostfixMatchesParameterName(arg, parameterName);
@@ -162109,17 +162127,6 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
           if (leadingCommentsContainsParameterName(arg, name)) {
             continue;
           }
-          if (isSpreadElement(arg)) {
-            const spreadType = checker.getTypeAtLocation(arg.expression);
-            if (checker.isTupleType(spreadType)) {
-              const { fixedLength, elementFlags } = spreadType.target;
-              for (let i = pos; i < fixedLength; i++) {
-                if (elementFlags[i] & 1 /* Required */) {
-                  pos++;
-                }
-              }
-            }
-          }
           addParameterHints(name, originalArg.getStart(), isFirstVariadicArgument);
         }
       }

package/lib/typescript.js CHANGED Viewed

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-insiders.20230602`;
+      version = `${versionMajorMinor}.0-insiders.20230605`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -45382,9 +45382,9 @@ ${lanes.join("\n")}
         candidatesOutArray,
         /*argumentCount*/
         void 0,
-        32 /* IsForStringLiteralArgumentCompletions */
+        64 /* IsForStringLiteralArgumentCompletions */
       )),
-      getResolvedSignatureForSignatureHelp: (node, candidatesOutArray, argumentCount) => runWithoutResolvedSignatureCaching(node, () => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 16 /* IsForSignatureHelp */)),
+      getResolvedSignatureForSignatureHelp: (node, candidatesOutArray, argumentCount) => runWithoutResolvedSignatureCaching(node, () => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 32 /* IsForSignatureHelp */)),
       getExpandedParameters,
       hasEffectiveRestParameter,
       containsArgumentsReference,
@@ -53339,7 +53339,7 @@ ${lanes.join("\n")}
       return type.flags & (128 /* StringLiteral */ | 256 /* NumberLiteral */) ? "" + type.value : void 0;
     }
     function getTypeForBindingElement(declaration) {
-      const checkMode = declaration.dotDotDotToken ? 64 /* RestBindingElement */ : 0 /* Normal */;
+      const checkMode = declaration.dotDotDotToken ? 128 /* RestBindingElement */ : 0 /* Normal */;
       const parentType = getTypeForBindingElementParent(declaration.parent.parent, checkMode);
       return parentType && getBindingElementTypeFromParentType(declaration, parentType);
     }
@@ -55096,19 +55096,13 @@ ${lanes.join("\n")}
       if (getObjectFlags(type) & 4 /* Reference */) {
         const target = type.target;
         const typeArguments = getTypeArguments(type);
-        if (length(target.typeParameters) === length(typeArguments)) {
-          const ref = createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType]));
-          return needApparentType ? getApparentType(ref) : ref;
-        }
+        return length(target.typeParameters) === length(typeArguments) ? createTypeReference(target, concatenate(typeArguments, [thisArgument || target.thisType])) : type;
       } else if (type.flags & 2097152 /* Intersection */) {
         const types = sameMap(type.types, (t) => getTypeWithThisArgument(t, thisArgument, needApparentType));
         return types !== type.types ? getIntersectionType(types) : type;
       }
       return needApparentType ? getApparentType(type) : type;
     }
-    function getThisArgument(type) {
-      return getObjectFlags(type) & 4 /* Reference */ && length(getTypeArguments(type)) > getTypeReferenceArity(type) ? last(getTypeArguments(type)) : type;
-    }
     function resolveObjectTypeMembers(type, source, typeParameters, typeArguments) {
       let mapper;
       let members;
@@ -56174,7 +56168,7 @@ ${lanes.join("\n")}
         return type.resolvedBaseConstraint;
       }
       const stack = [];
-      return type.resolvedBaseConstraint = getTypeWithThisArgument(getImmediateBaseConstraint(type), getThisArgument(type));
+      return type.resolvedBaseConstraint = getImmediateBaseConstraint(type);
       function getImmediateBaseConstraint(t) {
         if (!t.immediateBaseConstraint) {
           if (!pushTypeResolution(t, 4 /* ImmediateBaseConstraint */)) {
@@ -56266,18 +56260,18 @@ ${lanes.join("\n")}
         }
         if (isGenericTupleType(t)) {
           const newElements = map(getElementTypes(t), (v, i) => {
-            const constraint = t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
-            return constraint && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
+            const constraint = v.flags & 262144 /* TypeParameter */ && t.target.elementFlags[i] & 8 /* Variadic */ && getBaseConstraint(v) || v;
+            return constraint !== v && everyType(constraint, (c) => isArrayOrTupleType(c) && !isGenericTupleType(c)) ? constraint : v;
           });
           return createTupleType(newElements, t.target.elementFlags, t.target.readonly, t.target.labeledElementDeclarations);
         }
         return t;
       }
     }
-    function getApparentTypeOfIntersectionType(type) {
+    function getApparentTypeOfIntersectionType(type, thisArgument) {
       return type.resolvedApparentType || (type.resolvedApparentType = getTypeWithThisArgument(
         type,
-        type,
+        thisArgument,
         /*needApparentType*/
         true
       ));
@@ -56328,8 +56322,9 @@ ${lanes.join("\n")}
       return !!(type.flags & 8388608 /* IndexedAccess */ && getObjectFlags(objectType = type.objectType) & 32 /* Mapped */ && !isGenericMappedType(objectType) && isGenericIndexType(type.indexType) && !(getMappedTypeModifiers(objectType) & 8 /* ExcludeOptional */) && !objectType.declaration.nameType);
     }
     function getApparentType(type) {
-      const t = !(type.flags & 465829888 /* Instantiable */) ? type : getBaseConstraintOfType(type) || unknownType;
-      return getObjectFlags(t) & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
+      const t = type.flags & 465829888 /* Instantiable */ ? getBaseConstraintOfType(type) || unknownType : type;
+      const objectFlags = getObjectFlags(t);
+      return objectFlags & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) : objectFlags & 4 /* Reference */ && t !== type ? getTypeWithThisArgument(t, type) : t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t, type) : t.flags & 402653316 /* StringLike */ ? globalStringType : t.flags & 296 /* NumberLike */ ? globalNumberType : t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType() : t.flags & 528 /* BooleanLike */ ? globalBooleanType : t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType() : t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType : t.flags & 4194304 /* Index */ ? keyofConstraintType : t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType : t;
     }
     function getReducedApparentType(type) {
       return getReducedType(getApparentType(getReducedType(type)));
@@ -63150,7 +63145,7 @@ ${lanes.join("\n")}
             return 3 /* Maybe */;
           }
           const c = target2;
-          if (!c.root.inferTypeParameters && !isDistributionDependent(c.root)) {
+          if (!c.root.inferTypeParameters && !isDistributionDependent(c.root) && !(source2.flags & 16777216 /* Conditional */ && source2.root === c.root)) {
             const skipTrue = !isTypeAssignableTo(getPermissiveInstantiation(c.checkType), getPermissiveInstantiation(c.extendsType));
             const skipFalse = !skipTrue && isTypeAssignableTo(getRestrictiveInstantiation(c.checkType), getRestrictiveInstantiation(c.extendsType));
             if (result2 = skipTrue ? -1 /* True */ : isRelatedTo(
@@ -68236,7 +68231,7 @@ ${lanes.join("\n")}
       return type.flags & 2097152 /* Intersection */ ? some(type.types, isGenericTypeWithoutNullableConstraint) : !!(type.flags & 465829888 /* Instantiable */ && !maybeTypeOfKind(getBaseConstraintOrType(type), 98304 /* Nullable */));
     }
     function hasContextualTypeWithNoGenericTypes(node, checkMode) {
-      const contextualType = (isIdentifier(node) || isPropertyAccessExpression(node) || isElementAccessExpression(node)) && !((isJsxOpeningElement(node.parent) || isJsxSelfClosingElement(node.parent)) && node.parent.tagName === node) && (checkMode && checkMode & 64 /* RestBindingElement */ ? getContextualType2(node, 8 /* SkipBindingPatterns */) : getContextualType2(
+      const contextualType = (isIdentifier(node) || isPropertyAccessExpression(node) || isElementAccessExpression(node)) && !((isJsxOpeningElement(node.parent) || isJsxSelfClosingElement(node.parent)) && node.parent.tagName === node) && (checkMode && checkMode & 128 /* RestBindingElement */ ? getContextualType2(node, 8 /* SkipBindingPatterns */) : getContextualType2(
         node,
         /*contextFlags*/
         void 0
@@ -68993,7 +68988,7 @@ ${lanes.join("\n")}
     function getContextualTypeForBindingElement(declaration, contextFlags) {
       const parent2 = declaration.parent.parent;
       const name = declaration.propertyName || declaration.name;
-      const parentType = getContextualTypeForVariableLikeDeclaration(parent2, contextFlags) || parent2.kind !== 207 /* BindingElement */ && parent2.initializer && checkDeclarationInitializer(parent2, declaration.dotDotDotToken ? 64 /* RestBindingElement */ : 0 /* Normal */);
+      const parentType = getContextualTypeForVariableLikeDeclaration(parent2, contextFlags) || parent2.kind !== 207 /* BindingElement */ && parent2.initializer && checkDeclarationInitializer(parent2, declaration.dotDotDotToken ? 128 /* RestBindingElement */ : 0 /* Normal */);
       if (!parentType || isBindingPattern(name) || isComputedNonLiteralName(name))
         return void 0;
       if (parent2.name.kind === 206 /* ArrayBindingPattern */) {
@@ -70042,7 +70037,9 @@ ${lanes.join("\n")}
           elementTypes.push(undefinedOrMissingType);
           elementFlags.push(2 /* Optional */);
         } else {
-          const type = checkExpressionForMutableLocation(e, checkMode, forceTuple);
+          const shouldAddAsIntraExpressionInferenceSite = inTupleContext && checkMode && checkMode & 2 /* Inferential */ && !(checkMode & (4 /* SkipContextSensitive */ | 16 /* SkipAddingIntraExpressionSites */)) && isContextSensitive(e);
+          const elementCheckMode = (checkMode || 0 /* Normal */) | (shouldAddAsIntraExpressionInferenceSite ? 16 /* SkipAddingIntraExpressionSites */ : 0);
+          const type = checkExpressionForMutableLocation(e, elementCheckMode, forceTuple);
           elementTypes.push(addOptionality(
             type,
             /*isProperty*/
@@ -70050,7 +70047,7 @@ ${lanes.join("\n")}
             hasOmittedExpression
           ));
           elementFlags.push(hasOmittedExpression ? 2 /* Optional */ : 1 /* Required */);
-          if (inTupleContext && checkMode && checkMode & 2 /* Inferential */ && !(checkMode & 4 /* SkipContextSensitive */) && isContextSensitive(e)) {
+          if (shouldAddAsIntraExpressionInferenceSite) {
             const inferenceContext = getInferenceContext(node);
             Debug.assert(inferenceContext);
             addIntraExpressionInferenceSite(inferenceContext, e, type);
@@ -70191,11 +70188,13 @@ ${lanes.join("\n")}
         let member = getSymbolOfDeclaration(memberDecl);
         const computedNameType = memberDecl.name && memberDecl.name.kind === 166 /* ComputedPropertyName */ ? checkComputedPropertyName(memberDecl.name) : void 0;
         if (memberDecl.kind === 302 /* PropertyAssignment */ || memberDecl.kind === 303 /* ShorthandPropertyAssignment */ || isObjectLiteralMethod(memberDecl)) {
-          let type = memberDecl.kind === 302 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) : (
+          const shouldAddAsIntraExpressionInferenceSite = contextualType && checkMode & 2 /* Inferential */ && !(checkMode & (4 /* SkipContextSensitive */ | 16 /* SkipAddingIntraExpressionSites */)) && (memberDecl.kind === 302 /* PropertyAssignment */ || memberDecl.kind === 173 /* MethodDeclaration */) && isContextSensitive(memberDecl);
+          const propCheckMode = checkMode | (shouldAddAsIntraExpressionInferenceSite ? 16 /* SkipAddingIntraExpressionSites */ : 0);
+          let type = memberDecl.kind === 302 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, propCheckMode) : (
             // avoid resolving the left side of the ShorthandPropertyAssignment outside of the destructuring
             // for error recovery purposes. For example, if a user wrote `{ a = 100 }` instead of `{ a: 100 }`.
             // we don't want to say "could not find 'a'".
-            memberDecl.kind === 303 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(!inDestructuringPattern && memberDecl.objectAssignmentInitializer ? memberDecl.objectAssignmentInitializer : memberDecl.name, checkMode) : checkObjectLiteralMethod(memberDecl, checkMode)
+            memberDecl.kind === 303 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(!inDestructuringPattern && memberDecl.objectAssignmentInitializer ? memberDecl.objectAssignmentInitializer : memberDecl.name, propCheckMode) : checkObjectLiteralMethod(memberDecl, propCheckMode)
           );
           if (isInJavascript) {
             const jsDocType = getTypeForDeclarationFromJSDocComment(memberDecl);
@@ -70239,7 +70238,7 @@ ${lanes.join("\n")}
           prop.links.target = member;
           member = prop;
           allPropertiesTable == null ? void 0 : allPropertiesTable.set(prop.escapedName, prop);
-          if (contextualType && checkMode & 2 /* Inferential */ && !(checkMode & 4 /* SkipContextSensitive */) && (memberDecl.kind === 302 /* PropertyAssignment */ || memberDecl.kind === 173 /* MethodDeclaration */) && isContextSensitive(memberDecl)) {
+          if (shouldAddAsIntraExpressionInferenceSite) {
             const inferenceContext = getInferenceContext(node);
             Debug.assert(inferenceContext);
             const inferenceNode = memberDecl.kind === 302 /* PropertyAssignment */ ? memberDecl.initializer : memberDecl;
@@ -70412,7 +70411,9 @@ ${lanes.join("\n")}
       for (const attributeDecl of attributes.properties) {
         const member = attributeDecl.symbol;
         if (isJsxAttribute(attributeDecl)) {
-          const exprType = checkJsxAttribute(attributeDecl, checkMode);
+          const shouldAddAsIntraExpressionInferenceSite = contextualType && checkMode & 2 /* Inferential */ && !(checkMode & (4 /* SkipContextSensitive */ | 16 /* SkipAddingIntraExpressionSites */)) && isContextSensitive(attributeDecl);
+          const attributeCheckMode = checkMode | (shouldAddAsIntraExpressionInferenceSite ? 16 /* SkipAddingIntraExpressionSites */ : 0);
+          const exprType = checkJsxAttribute(attributeDecl, attributeCheckMode);
           objectFlags |= getObjectFlags(exprType) & 458752 /* PropagatingFlags */;
           const attributeSymbol = createSymbol(4 /* Property */ | member.flags, member.escapedName);
           attributeSymbol.declarations = member.declarations;
@@ -70433,7 +70434,7 @@ ${lanes.join("\n")}
               addDeprecatedSuggestion(attributeDecl.name, prop.declarations, attributeDecl.name.escapedText);
             }
           }
-          if (contextualType && checkMode & 2 /* Inferential */ && !(checkMode & 4 /* SkipContextSensitive */) && isContextSensitive(attributeDecl)) {
+          if (shouldAddAsIntraExpressionInferenceSite) {
             const inferenceContext = getInferenceContext(attributes);
             Debug.assert(inferenceContext);
             const inferenceNode = attributeDecl.initializer.expression;
@@ -72051,7 +72052,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 */ && !(checkMode & 64 /* IsForStringLiteralArgumentCompletions */ && hasSkipDirectInferenceFlag(arg))) {
           const paramType = getTypeAtPosition(signature, i);
           if (couldContainTypeVariables(paramType)) {
             const argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
@@ -72664,12 +72665,12 @@ ${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 */;
+      argCheckMode |= checkMode & 64 /* IsForStringLiteralArgumentCompletions */;
       let candidatesForArgumentError;
       let candidateForArgumentArityError;
       let candidateForTypeArgumentError;
       let result;
-      const signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 212 /* CallExpression */ && node.arguments.hasTrailingComma;
+      const signatureHelpTrailingComma = !!(checkMode & 32 /* IsForSignatureHelp */) && node.kind === 212 /* CallExpression */ && node.arguments.hasTrailingComma;
       if (candidates.length > 1) {
         result = chooseOverload(candidates, subtypeRelation, isSingleNonGenericCandidate, signatureHelpTrailingComma);
       }
@@ -72888,7 +72889,7 @@ ${lanes.join("\n")}
             continue;
           }
           if (argCheckMode) {
-            argCheckMode = checkMode & 32 /* IsForStringLiteralArgumentCompletions */;
+            argCheckMode = checkMode & 64 /* IsForStringLiteralArgumentCompletions */;
             if (inferenceContext) {
               const typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext);
               checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, isInJSFile(candidate.declaration), inferenceContext.inferredTypeParameters);
@@ -75966,7 +75967,7 @@ ${lanes.join("\n")}
         case 36 /* ExclamationEqualsToken */:
         case 37 /* EqualsEqualsEqualsToken */:
         case 38 /* ExclamationEqualsEqualsToken */:
-          if (!(checkMode && checkMode & 128 /* TypeOnly */)) {
+          if (!(checkMode && checkMode & 256 /* TypeOnly */)) {
             if (isLiteralExpressionOfObject(left) || isLiteralExpressionOfObject(right)) {
               const eqType = operator === 35 /* EqualsEqualsToken */ || operator === 37 /* EqualsEqualsEqualsToken */;
               error(errorNode, Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value, eqType ? "false" : "true");
@@ -76625,7 +76626,7 @@ ${lanes.join("\n")}
         }
       }
       const startInvocationCount = flowInvocationCount;
-      const type = checkExpression(node, 128 /* TypeOnly */);
+      const type = checkExpression(node, 256 /* TypeOnly */);
       if (flowInvocationCount !== startInvocationCount) {
         const cache = flowTypeCache || (flowTypeCache = []);
         cache[getNodeId(node)] = type;
@@ -79096,7 +79097,7 @@ ${lanes.join("\n")}
           checkComputedPropertyName(node.propertyName);
         }
         const parent2 = node.parent.parent;
-        const parentCheckMode = node.dotDotDotToken ? 64 /* RestBindingElement */ : 0 /* Normal */;
+        const parentCheckMode = node.dotDotDotToken ? 128 /* RestBindingElement */ : 0 /* Normal */;
         const parentType = getTypeForBindingElementParent(parent2, parentCheckMode);
         const name = node.propertyName || node.name;
         if (parentType && !isBindingPattern(name)) {
@@ -85832,10 +85833,11 @@ ${lanes.join("\n")}
         CheckMode3[CheckMode3["Inferential"] = 2] = "Inferential";
         CheckMode3[CheckMode3["SkipContextSensitive"] = 4] = "SkipContextSensitive";
         CheckMode3[CheckMode3["SkipGenericFunctions"] = 8] = "SkipGenericFunctions";
-        CheckMode3[CheckMode3["IsForSignatureHelp"] = 16] = "IsForSignatureHelp";
-        CheckMode3[CheckMode3["IsForStringLiteralArgumentCompletions"] = 32] = "IsForStringLiteralArgumentCompletions";
-        CheckMode3[CheckMode3["RestBindingElement"] = 64] = "RestBindingElement";
-        CheckMode3[CheckMode3["TypeOnly"] = 128] = "TypeOnly";
+        CheckMode3[CheckMode3["SkipAddingIntraExpressionSites"] = 16] = "SkipAddingIntraExpressionSites";
+        CheckMode3[CheckMode3["IsForSignatureHelp"] = 32] = "IsForSignatureHelp";
+        CheckMode3[CheckMode3["IsForStringLiteralArgumentCompletions"] = 64] = "IsForStringLiteralArgumentCompletions";
+        CheckMode3[CheckMode3["RestBindingElement"] = 128] = "RestBindingElement";
+        CheckMode3[CheckMode3["TypeOnly"] = 256] = "TypeOnly";
         return CheckMode3;
       })(CheckMode || {});
       SignatureCheckMode = /* @__PURE__ */ ((SignatureCheckMode3) => {
@@ -162107,13 +162109,29 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       if (!signature || !candidates.length) {
         return;
       }
-      let pos = 0;
+      let signatureParamPos = 0;
       for (const originalArg of args) {
         const arg = skipParentheses(originalArg);
         if (shouldShowLiteralParameterNameHintsOnly(preferences) && !isHintableLiteral(arg)) {
           continue;
         }
-        const identifierNameInfo = checker.getParameterIdentifierNameAtPosition(signature, pos++);
+        let spreadArgs = 0;
+        if (isSpreadElement(arg)) {
+          const spreadType = checker.getTypeAtLocation(arg.expression);
+          if (checker.isTupleType(spreadType)) {
+            const { elementFlags, fixedLength } = spreadType.target;
+            if (fixedLength === 0) {
+              continue;
+            }
+            const firstOptionalIndex = findIndex(elementFlags, (f) => !(f & 1 /* Required */));
+            const requiredArgs = firstOptionalIndex < 0 ? fixedLength : firstOptionalIndex;
+            if (requiredArgs > 0) {
+              spreadArgs = firstOptionalIndex < 0 ? fixedLength : firstOptionalIndex;
+            }
+          }
+        }
+        const identifierNameInfo = checker.getParameterIdentifierNameAtPosition(signature, signatureParamPos);
+        signatureParamPos = signatureParamPos + (spreadArgs || 1);
         if (identifierNameInfo) {
           const [parameterName, isFirstVariadicArgument] = identifierNameInfo;
           const isParameterNameNotSameAsArgument = preferences.includeInlayParameterNameHintsWhenArgumentMatchesName || !identifierOrAccessExpressionPostfixMatchesParameterName(arg, parameterName);
@@ -162124,17 +162142,6 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
           if (leadingCommentsContainsParameterName(arg, name)) {
             continue;
           }
-          if (isSpreadElement(arg)) {
-            const spreadType = checker.getTypeAtLocation(arg.expression);
-            if (checker.isTupleType(spreadType)) {
-              const { fixedLength, elementFlags } = spreadType.target;
-              for (let i = pos; i < fixedLength; i++) {
-                if (elementFlags[i] & 1 /* Required */) {
-                  pos++;
-                }
-              }
-            }
-          }
           addParameterHints(name, originalArg.getStart(), isFirstVariadicArgument);
         }
       }

package/lib/typingsInstaller.js CHANGED Viewed

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-insiders.20230602`;
+var version = `${versionMajorMinor}.0-insiders.20230605`;
 // src/compiler/core.ts
 var emptyArray = [];
@@ -28918,10 +28918,11 @@ var CheckMode = /* @__PURE__ */ ((CheckMode3) => {
   CheckMode3[CheckMode3["Inferential"] = 2] = "Inferential";
   CheckMode3[CheckMode3["SkipContextSensitive"] = 4] = "SkipContextSensitive";
   CheckMode3[CheckMode3["SkipGenericFunctions"] = 8] = "SkipGenericFunctions";
-  CheckMode3[CheckMode3["IsForSignatureHelp"] = 16] = "IsForSignatureHelp";
-  CheckMode3[CheckMode3["IsForStringLiteralArgumentCompletions"] = 32] = "IsForStringLiteralArgumentCompletions";
-  CheckMode3[CheckMode3["RestBindingElement"] = 64] = "RestBindingElement";
-  CheckMode3[CheckMode3["TypeOnly"] = 128] = "TypeOnly";
+  CheckMode3[CheckMode3["SkipAddingIntraExpressionSites"] = 16] = "SkipAddingIntraExpressionSites";
+  CheckMode3[CheckMode3["IsForSignatureHelp"] = 32] = "IsForSignatureHelp";
+  CheckMode3[CheckMode3["IsForStringLiteralArgumentCompletions"] = 64] = "IsForStringLiteralArgumentCompletions";
+  CheckMode3[CheckMode3["RestBindingElement"] = 128] = "RestBindingElement";
+  CheckMode3[CheckMode3["TypeOnly"] = 256] = "TypeOnly";
   return CheckMode3;
 })(CheckMode || {});
 var SignatureCheckMode = /* @__PURE__ */ ((SignatureCheckMode3) => {

package/package.json CHANGED Viewed

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.2.0-pr-54503-2",
+  "version": "5.2.0-pr-54536-13",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -115,5 +115,5 @@
     "node": "20.1.0",
     "npm": "8.19.4"
   },
-  "gitHead": "00fdba9b35eff7d91b97e078960efd9c998efc59"
+  "gitHead": "014d2271f382640d52e637d4b56b59776ff166fa"
 }