@typescript-deploys/pr-build 5.1.0-pr-53292-2 → 5.1.0-pr-49863-27

package/lib/tsc.js

@@ -23,7 +23,7 @@ var __export = (target, all) => {
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-insiders.20230316`;
+var version = `${versionMajorMinor}.0-insiders.20230317`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -3721,7 +3721,7 @@ var TypeFlags = /* @__PURE__ */ ((TypeFlags2) => {
   TypeFlags2[TypeFlags2["IncludesWildcard"] = 8388608 /* IndexedAccess */] = "IncludesWildcard";
   TypeFlags2[TypeFlags2["IncludesEmptyObject"] = 16777216 /* Conditional */] = "IncludesEmptyObject";
   TypeFlags2[TypeFlags2["IncludesInstantiable"] = 33554432 /* Substitution */] = "IncludesInstantiable";
-  TypeFlags2[TypeFlags2["NotPrimitiveUnion"] = 36323363] = "NotPrimitiveUnion";
+  TypeFlags2[TypeFlags2["NotPrimitiveUnion"] = 36323331] = "NotPrimitiveUnion";
   return TypeFlags2;
 })(TypeFlags || {});
 var ObjectFlags = /* @__PURE__ */ ((ObjectFlags3) => {
@@ -7333,6 +7333,7 @@ var Diagnostics = {
   Specify_emit_Slashchecking_behavior_for_imports_that_are_only_used_for_types: diag(6718, 3 /* Message */, "Specify_emit_Slashchecking_behavior_for_imports_that_are_only_used_for_types_6718", "Specify emit/checking behavior for imports that are only used for types."),
   Default_catch_clause_variables_as_unknown_instead_of_any: diag(6803, 3 /* Message */, "Default_catch_clause_variables_as_unknown_instead_of_any_6803", "Default catch clause variables as 'unknown' instead of 'any'."),
   Do_not_transform_or_elide_any_imports_or_exports_not_marked_as_type_only_ensuring_they_are_written_in_the_output_file_s_format_based_on_the_module_setting: diag(6804, 3 /* Message */, "Do_not_transform_or_elide_any_imports_or_exports_not_marked_as_type_only_ensuring_they_are_written_i_6804", "Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting."),
+  Default_type_arguments_to_parameter_constraint_or_unknown_instead_of_any_for_instance_checks: diag(6805, 3 /* Message */, "Default_type_arguments_to_parameter_constraint_or_unknown_instead_of_any_for_instance_checks_6805", "Default type arguments to parameter constraint or 'unknown' instead of 'any' for instance checks."),
   one_of_Colon: diag(6900, 3 /* Message */, "one_of_Colon_6900", "one of:"),
   one_or_more_Colon: diag(6901, 3 /* Message */, "one_or_more_Colon_6901", "one or more:"),
   type_Colon: diag(6902, 3 /* Message */, "type_Colon_6902", "type:"),
@@ -33858,6 +33859,16 @@ var commandOptionsWithoutBuild = [
     description: Diagnostics.Default_catch_clause_variables_as_unknown_instead_of_any,
     defaultValueDescription: false
   },
+  {
+    name: "strictInstanceOfTypeParameters",
+    type: "boolean",
+    affectsSemanticDiagnostics: true,
+    affectsBuildInfo: true,
+    strictFlag: true,
+    category: Diagnostics.Type_Checking,
+    description: Diagnostics.Default_type_arguments_to_parameter_constraint_or_unknown_instead_of_any_for_instance_checks,
+    defaultValueDescription: false
+  },
   {
     name: "alwaysStrict",
     type: "boolean",
@@ -42661,6 +42672,7 @@ function createTypeChecker(host) {
   var noImplicitAny = getStrictOptionValue(compilerOptions, "noImplicitAny");
   var noImplicitThis = getStrictOptionValue(compilerOptions, "noImplicitThis");
   var useUnknownInCatchVariables = getStrictOptionValue(compilerOptions, "useUnknownInCatchVariables");
+  var strictInstanceOfTypeParameters = getStrictOptionValue(compilerOptions, "strictInstanceOfTypeParameters");
   var keyofStringsOnly = !!compilerOptions.keyofStringsOnly;
   var defaultIndexFlags = keyofStringsOnly ? 1 /* StringsOnly */ : 0 /* None */;
   var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 8192 /* FreshLiteral */;
@@ -50627,9 +50639,32 @@ function createTypeChecker(host) {
       }
     }).parent;
   }
+  function getInstanceTypeOfClassSymbol(classSymbol) {
+    const classType = getDeclaredTypeOfSymbol(classSymbol);
+    const objectFlags = getObjectFlags(classType);
+    if (!(objectFlags & 3 /* ClassOrInterface */) || !classType.typeParameters) {
+      return classType;
+    }
+    const variances = getVariances(classType);
+    const typeArguments = map(classType.typeParameters, (typeParameter, i) => {
+      if (!strictInstanceOfTypeParameters) {
+        return anyType;
+      }
+      const variance = variances[i];
+      switch (variance & 7 /* VarianceMask */) {
+        case 4 /* Independent */:
+        case 3 /* Bivariant */:
+          return anyType;
+        case 2 /* Contravariant */:
+          return neverType;
+      }
+      return getBaseConstraintOfType(typeParameter) || unknownType;
+    });
+    return createTypeReference(classType, typeArguments);
+  }
   function getTypeOfPrototypeProperty(prototype) {
-    const classType = getDeclaredTypeOfSymbol(getParentOfSymbol(prototype));
-    return classType.typeParameters ? createTypeReference(classType, map(classType.typeParameters, (_) => anyType)) : classType;
+    const classSymbol = getParentOfSymbol(prototype);
+    return getInstanceTypeOfClassSymbol(classSymbol);
   }
   function getTypeOfPropertyOfType(type, name) {
     const prop = getPropertyOfType(type, name);
@@ -56000,7 +56035,7 @@ function createTypeChecker(host) {
         origin = createOriginUnionOrIntersectionType(1048576 /* Union */, reducedTypes);
       }
     }
-    const objectFlags = (includes & 36323363 /* NotPrimitiveUnion */ ? 0 : 32768 /* PrimitiveUnion */) | (includes & 2097152 /* Intersection */ ? 16777216 /* ContainsIntersections */ : 0);
+    const objectFlags = (includes & 36323331 /* NotPrimitiveUnion */ ? 0 : 32768 /* PrimitiveUnion */) | (includes & 2097152 /* Intersection */ ? 16777216 /* ContainsIntersections */ : 0);
     return getUnionTypeFromSortedList(typeSet, objectFlags, aliasSymbol, aliasTypeArguments, origin);
   }
   function getUnionOrIntersectionTypePredicate(signatures, kind) {
@@ -56125,7 +56160,7 @@ function createTypeChecker(host) {
   function eachUnionContains(unionTypes2, type) {
     for (const u of unionTypes2) {
       if (!containsType(u.types, type)) {
-        const primitive = type.flags & 128 /* StringLiteral */ ? stringType : type.flags & 256 /* NumberLiteral */ ? numberType : type.flags & 2048 /* BigIntLiteral */ ? bigintType : type.flags & 8192 /* UniqueESSymbol */ ? esSymbolType : void 0;
+        const primitive = type.flags & 128 /* StringLiteral */ ? stringType : type.flags & (32 /* Enum */ | 256 /* NumberLiteral */) ? numberType : type.flags & 2048 /* BigIntLiteral */ ? bigintType : type.flags & 8192 /* UniqueESSymbol */ ? esSymbolType : void 0;
         if (!primitive || !containsType(u.types, primitive)) {
           return false;
         }
@@ -56152,9 +56187,6 @@ function createTypeChecker(host) {
     }
     return false;
   }
-  function eachIsUnionContaining(types, flag) {
-    return every(types, (t) => !!(t.flags & 1048576 /* Union */) && some(t.types, (tt) => !!(tt.flags & flag)));
-  }
   function removeFromEach(types, flag) {
     for (let i = 0; i < types.length; i++) {
       types[i] = filterType(types[i], (t) => !(t.flags & flag));
@@ -56243,11 +56275,11 @@ function createTypeChecker(host) {
       if (includes & 1048576 /* Union */) {
         if (intersectUnionsOfPrimitiveTypes(typeSet)) {
           result = getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
-        } else if (eachIsUnionContaining(typeSet, 32768 /* Undefined */)) {
+        } else if (every(typeSet, (t) => !!(t.flags & 1048576 /* Union */ && t.types[0].flags & 32768 /* Undefined */))) {
           const containedUndefinedType = some(typeSet, containsMissingType) ? missingType : undefinedType;
           removeFromEach(typeSet, 32768 /* Undefined */);
           result = getUnionType([getIntersectionType(typeSet), containedUndefinedType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
-        } else if (eachIsUnionContaining(typeSet, 65536 /* Null */)) {
+        } else if (every(typeSet, (t) => !!(t.flags & 1048576 /* Union */ && (t.types[0].flags & 65536 /* Null */ || t.types[1].flags & 65536 /* Null */)))) {
           removeFromEach(typeSet, 65536 /* Null */);
           result = getUnionType([getIntersectionType(typeSet), nullType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
         } else {
@@ -59772,6 +59804,11 @@ function createTypeChecker(host) {
         if (containsType(targetTypes, source2)) {
           return -1 /* True */;
         }
+        if (getObjectFlags(target2) & 32768 /* PrimitiveUnion */ && !(source2.flags & 1024 /* EnumLiteral */) && (source2.flags & (128 /* StringLiteral */ | 512 /* BooleanLiteral */ | 2048 /* BigIntLiteral */) || (relation === subtypeRelation || relation === strictSubtypeRelation) && source2.flags & 256 /* NumberLiteral */)) {
+          const alternateForm = source2 === source2.regularType ? source2.freshType : source2.regularType;
+          const primitive = source2.flags & 128 /* StringLiteral */ ? stringType : source2.flags & 256 /* NumberLiteral */ ? numberType : source2.flags & 2048 /* BigIntLiteral */ ? bigintType : void 0;
+          return primitive && containsType(targetTypes, primitive) || alternateForm && containsType(targetTypes, alternateForm) ? -1 /* True */ : 0 /* False */;
+        }
         const match = getMatchingUnionConstituentForType(target2, source2);
         if (match) {
           const related = isRelatedTo(
@@ -65073,8 +65110,8 @@ function createTypeChecker(host) {
       if (symbol === void 0) {
         return type;
       }
-      const classSymbol = symbol.parent;
-      const targetType = hasStaticModifier(Debug.checkDefined(symbol.valueDeclaration, "should always have a declaration")) ? getTypeOfSymbol(classSymbol) : getDeclaredTypeOfSymbol(classSymbol);
+      const classSymbol = getParentOfSymbol(symbol);
+      const targetType = hasStaticModifier(Debug.checkDefined(symbol.valueDeclaration, "should always have a declaration")) ? getTypeOfSymbol(classSymbol) : getInstanceTypeOfClassSymbol(classSymbol);
       return getNarrowedType(
         type,
         targetType,
@@ -66525,7 +66562,7 @@ function createTypeChecker(host) {
               return void 0;
             }
           }
-          return isInJSFile(decl2) ? void 0 : getTypeOfExpression(binaryExpression.left);
+          return isInJSFile(decl2) || decl2 === binaryExpression.left ? void 0 : getTypeOfExpression(binaryExpression.left);
         }
       case 1 /* ExportsProperty */:
       case 6 /* Prototype */:
@@ -67423,7 +67460,7 @@ function createTypeChecker(host) {
     const inConstContext = isConstContext(node);
     const checkFlags = inConstContext ? 8 /* Readonly */ : 0;
     const isInJavascript = isInJSFile(node) && !isInJsonFile(node);
-    const enumTag = getJSDocEnumTag(node);
+    const enumTag = isInJavascript ? getJSDocEnumTag(node) : void 0;
     const isJSObjectLiteral = !contextualType && isInJavascript && !enumTag;
     let objectFlags = freshObjectLiteralFlag;
     let patternWithComputedProperties = false;
@@ -72180,6 +72217,11 @@ function createTypeChecker(host) {
           } else {
             assignNonContextualParameterTypes(signature);
           }
+        } else if (contextualSignature && !node.typeParameters && contextualSignature.parameters.length > node.parameters.length) {
+          const inferenceContext = getInferenceContext(node);
+          if (checkMode && checkMode & 2 /* Inferential */) {
+            inferFromAnnotatedParameters(signature, contextualSignature, inferenceContext);
+          }
         }
         if (contextualSignature && !getReturnTypeFromAnnotation(node) && !signature.resolvedReturnType) {
           const returnType = getReturnTypeFromBody(node, checkMode);

package/lib/tsserver.js

@@ -2285,7 +2285,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-insiders.20230316`;
+var version = `${versionMajorMinor}.0-insiders.20230317`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -6642,7 +6642,7 @@ var TypeFlags = /* @__PURE__ */ ((TypeFlags2) => {
   TypeFlags2[TypeFlags2["IncludesWildcard"] = 8388608 /* IndexedAccess */] = "IncludesWildcard";
   TypeFlags2[TypeFlags2["IncludesEmptyObject"] = 16777216 /* Conditional */] = "IncludesEmptyObject";
   TypeFlags2[TypeFlags2["IncludesInstantiable"] = 33554432 /* Substitution */] = "IncludesInstantiable";
-  TypeFlags2[TypeFlags2["NotPrimitiveUnion"] = 36323363] = "NotPrimitiveUnion";
+  TypeFlags2[TypeFlags2["NotPrimitiveUnion"] = 36323331] = "NotPrimitiveUnion";
   return TypeFlags2;
 })(TypeFlags || {});
 var ObjectFlags = /* @__PURE__ */ ((ObjectFlags3) => {
@@ -10795,6 +10795,7 @@ var Diagnostics = {
   Specify_emit_Slashchecking_behavior_for_imports_that_are_only_used_for_types: diag(6718, 3 /* Message */, "Specify_emit_Slashchecking_behavior_for_imports_that_are_only_used_for_types_6718", "Specify emit/checking behavior for imports that are only used for types."),
   Default_catch_clause_variables_as_unknown_instead_of_any: diag(6803, 3 /* Message */, "Default_catch_clause_variables_as_unknown_instead_of_any_6803", "Default catch clause variables as 'unknown' instead of 'any'."),
   Do_not_transform_or_elide_any_imports_or_exports_not_marked_as_type_only_ensuring_they_are_written_in_the_output_file_s_format_based_on_the_module_setting: diag(6804, 3 /* Message */, "Do_not_transform_or_elide_any_imports_or_exports_not_marked_as_type_only_ensuring_they_are_written_i_6804", "Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting."),
+  Default_type_arguments_to_parameter_constraint_or_unknown_instead_of_any_for_instance_checks: diag(6805, 3 /* Message */, "Default_type_arguments_to_parameter_constraint_or_unknown_instead_of_any_for_instance_checks_6805", "Default type arguments to parameter constraint or 'unknown' instead of 'any' for instance checks."),
   one_of_Colon: diag(6900, 3 /* Message */, "one_of_Colon_6900", "one of:"),
   one_or_more_Colon: diag(6901, 3 /* Message */, "one_or_more_Colon_6901", "one or more:"),
   type_Colon: diag(6902, 3 /* Message */, "type_Colon_6902", "type:"),
@@ -38194,6 +38195,16 @@ var commandOptionsWithoutBuild = [
     description: Diagnostics.Default_catch_clause_variables_as_unknown_instead_of_any,
     defaultValueDescription: false
   },
+  {
+    name: "strictInstanceOfTypeParameters",
+    type: "boolean",
+    affectsSemanticDiagnostics: true,
+    affectsBuildInfo: true,
+    strictFlag: true,
+    category: Diagnostics.Type_Checking,
+    description: Diagnostics.Default_type_arguments_to_parameter_constraint_or_unknown_instead_of_any_for_instance_checks,
+    defaultValueDescription: false
+  },
   {
     name: "alwaysStrict",
     type: "boolean",
@@ -47258,6 +47269,7 @@ function createTypeChecker(host) {
   var noImplicitAny = getStrictOptionValue(compilerOptions, "noImplicitAny");
   var noImplicitThis = getStrictOptionValue(compilerOptions, "noImplicitThis");
   var useUnknownInCatchVariables = getStrictOptionValue(compilerOptions, "useUnknownInCatchVariables");
+  var strictInstanceOfTypeParameters = getStrictOptionValue(compilerOptions, "strictInstanceOfTypeParameters");
   var keyofStringsOnly = !!compilerOptions.keyofStringsOnly;
   var defaultIndexFlags = keyofStringsOnly ? 1 /* StringsOnly */ : 0 /* None */;
   var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 8192 /* FreshLiteral */;
@@ -55224,9 +55236,32 @@ function createTypeChecker(host) {
       }
     }).parent;
   }
+  function getInstanceTypeOfClassSymbol(classSymbol) {
+    const classType = getDeclaredTypeOfSymbol(classSymbol);
+    const objectFlags = getObjectFlags(classType);
+    if (!(objectFlags & 3 /* ClassOrInterface */) || !classType.typeParameters) {
+      return classType;
+    }
+    const variances = getVariances(classType);
+    const typeArguments = map(classType.typeParameters, (typeParameter, i) => {
+      if (!strictInstanceOfTypeParameters) {
+        return anyType;
+      }
+      const variance = variances[i];
+      switch (variance & 7 /* VarianceMask */) {
+        case 4 /* Independent */:
+        case 3 /* Bivariant */:
+          return anyType;
+        case 2 /* Contravariant */:
+          return neverType;
+      }
+      return getBaseConstraintOfType(typeParameter) || unknownType;
+    });
+    return createTypeReference(classType, typeArguments);
+  }
   function getTypeOfPrototypeProperty(prototype) {
-    const classType = getDeclaredTypeOfSymbol(getParentOfSymbol(prototype));
-    return classType.typeParameters ? createTypeReference(classType, map(classType.typeParameters, (_) => anyType)) : classType;
+    const classSymbol = getParentOfSymbol(prototype);
+    return getInstanceTypeOfClassSymbol(classSymbol);
   }
   function getTypeOfPropertyOfType(type, name) {
     const prop = getPropertyOfType(type, name);
@@ -60597,7 +60632,7 @@ function createTypeChecker(host) {
         origin = createOriginUnionOrIntersectionType(1048576 /* Union */, reducedTypes);
       }
     }
-    const objectFlags = (includes & 36323363 /* NotPrimitiveUnion */ ? 0 : 32768 /* PrimitiveUnion */) | (includes & 2097152 /* Intersection */ ? 16777216 /* ContainsIntersections */ : 0);
+    const objectFlags = (includes & 36323331 /* NotPrimitiveUnion */ ? 0 : 32768 /* PrimitiveUnion */) | (includes & 2097152 /* Intersection */ ? 16777216 /* ContainsIntersections */ : 0);
     return getUnionTypeFromSortedList(typeSet, objectFlags, aliasSymbol, aliasTypeArguments, origin);
   }
   function getUnionOrIntersectionTypePredicate(signatures, kind) {
@@ -60722,7 +60757,7 @@ function createTypeChecker(host) {
   function eachUnionContains(unionTypes2, type) {
     for (const u of unionTypes2) {
       if (!containsType(u.types, type)) {
-        const primitive = type.flags & 128 /* StringLiteral */ ? stringType : type.flags & 256 /* NumberLiteral */ ? numberType : type.flags & 2048 /* BigIntLiteral */ ? bigintType : type.flags & 8192 /* UniqueESSymbol */ ? esSymbolType : void 0;
+        const primitive = type.flags & 128 /* StringLiteral */ ? stringType : type.flags & (32 /* Enum */ | 256 /* NumberLiteral */) ? numberType : type.flags & 2048 /* BigIntLiteral */ ? bigintType : type.flags & 8192 /* UniqueESSymbol */ ? esSymbolType : void 0;
         if (!primitive || !containsType(u.types, primitive)) {
           return false;
         }
@@ -60749,9 +60784,6 @@ function createTypeChecker(host) {
     }
     return false;
   }
-  function eachIsUnionContaining(types, flag) {
-    return every(types, (t) => !!(t.flags & 1048576 /* Union */) && some(t.types, (tt) => !!(tt.flags & flag)));
-  }
   function removeFromEach(types, flag) {
     for (let i = 0; i < types.length; i++) {
       types[i] = filterType(types[i], (t) => !(t.flags & flag));
@@ -60840,11 +60872,11 @@ function createTypeChecker(host) {
       if (includes & 1048576 /* Union */) {
         if (intersectUnionsOfPrimitiveTypes(typeSet)) {
           result = getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
-        } else if (eachIsUnionContaining(typeSet, 32768 /* Undefined */)) {
+        } else if (every(typeSet, (t) => !!(t.flags & 1048576 /* Union */ && t.types[0].flags & 32768 /* Undefined */))) {
           const containedUndefinedType = some(typeSet, containsMissingType) ? missingType : undefinedType;
           removeFromEach(typeSet, 32768 /* Undefined */);
           result = getUnionType([getIntersectionType(typeSet), containedUndefinedType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
-        } else if (eachIsUnionContaining(typeSet, 65536 /* Null */)) {
+        } else if (every(typeSet, (t) => !!(t.flags & 1048576 /* Union */ && (t.types[0].flags & 65536 /* Null */ || t.types[1].flags & 65536 /* Null */)))) {
           removeFromEach(typeSet, 65536 /* Null */);
           result = getUnionType([getIntersectionType(typeSet), nullType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
         } else {
@@ -64369,6 +64401,11 @@ function createTypeChecker(host) {
         if (containsType(targetTypes, source2)) {
           return -1 /* True */;
         }
+        if (getObjectFlags(target2) & 32768 /* PrimitiveUnion */ && !(source2.flags & 1024 /* EnumLiteral */) && (source2.flags & (128 /* StringLiteral */ | 512 /* BooleanLiteral */ | 2048 /* BigIntLiteral */) || (relation === subtypeRelation || relation === strictSubtypeRelation) && source2.flags & 256 /* NumberLiteral */)) {
+          const alternateForm = source2 === source2.regularType ? source2.freshType : source2.regularType;
+          const primitive = source2.flags & 128 /* StringLiteral */ ? stringType : source2.flags & 256 /* NumberLiteral */ ? numberType : source2.flags & 2048 /* BigIntLiteral */ ? bigintType : void 0;
+          return primitive && containsType(targetTypes, primitive) || alternateForm && containsType(targetTypes, alternateForm) ? -1 /* True */ : 0 /* False */;
+        }
         const match = getMatchingUnionConstituentForType(target2, source2);
         if (match) {
           const related = isRelatedTo(
@@ -69670,8 +69707,8 @@ function createTypeChecker(host) {
       if (symbol === void 0) {
         return type;
       }
-      const classSymbol = symbol.parent;
-      const targetType = hasStaticModifier(Debug.checkDefined(symbol.valueDeclaration, "should always have a declaration")) ? getTypeOfSymbol(classSymbol) : getDeclaredTypeOfSymbol(classSymbol);
+      const classSymbol = getParentOfSymbol(symbol);
+      const targetType = hasStaticModifier(Debug.checkDefined(symbol.valueDeclaration, "should always have a declaration")) ? getTypeOfSymbol(classSymbol) : getInstanceTypeOfClassSymbol(classSymbol);
       return getNarrowedType(
         type,
         targetType,
@@ -71122,7 +71159,7 @@ function createTypeChecker(host) {
               return void 0;
             }
           }
-          return isInJSFile(decl2) ? void 0 : getTypeOfExpression(binaryExpression.left);
+          return isInJSFile(decl2) || decl2 === binaryExpression.left ? void 0 : getTypeOfExpression(binaryExpression.left);
         }
       case 1 /* ExportsProperty */:
       case 6 /* Prototype */:
@@ -72020,7 +72057,7 @@ function createTypeChecker(host) {
     const inConstContext = isConstContext(node);
     const checkFlags = inConstContext ? 8 /* Readonly */ : 0;
     const isInJavascript = isInJSFile(node) && !isInJsonFile(node);
-    const enumTag = getJSDocEnumTag(node);
+    const enumTag = isInJavascript ? getJSDocEnumTag(node) : void 0;
     const isJSObjectLiteral = !contextualType && isInJavascript && !enumTag;
     let objectFlags = freshObjectLiteralFlag;
     let patternWithComputedProperties = false;
@@ -76777,6 +76814,11 @@ function createTypeChecker(host) {
           } else {
             assignNonContextualParameterTypes(signature);
           }
+        } else if (contextualSignature && !node.typeParameters && contextualSignature.parameters.length > node.parameters.length) {
+          const inferenceContext = getInferenceContext(node);
+          if (checkMode && checkMode & 2 /* Inferential */) {
+            inferFromAnnotatedParameters(signature, contextualSignature, inferenceContext);
+          }
         }
         if (contextualSignature && !getReturnTypeFromAnnotation(node) && !signature.resolvedReturnType) {
           const returnType = getReturnTypeFromBody(node, checkMode);

package/lib/tsserverlibrary.d.ts

@@ -7141,6 +7141,7 @@ declare namespace ts {
         strictBindCallApply?: boolean;
         strictNullChecks?: boolean;
         strictPropertyInitialization?: boolean;
+        strictInstanceOfTypeParameters?: boolean;
         stripInternal?: boolean;
         suppressExcessPropertyErrors?: boolean;
         suppressImplicitAnyIndexErrors?: boolean;

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-insiders.20230316`;
+      version = `${versionMajorMinor}.0-insiders.20230317`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -4449,7 +4449,7 @@ ${lanes.join("\n")}
         TypeFlags2[TypeFlags2["IncludesWildcard"] = 8388608 /* IndexedAccess */] = "IncludesWildcard";
         TypeFlags2[TypeFlags2["IncludesEmptyObject"] = 16777216 /* Conditional */] = "IncludesEmptyObject";
         TypeFlags2[TypeFlags2["IncludesInstantiable"] = 33554432 /* Substitution */] = "IncludesInstantiable";
-        TypeFlags2[TypeFlags2["NotPrimitiveUnion"] = 36323363] = "NotPrimitiveUnion";
+        TypeFlags2[TypeFlags2["NotPrimitiveUnion"] = 36323331] = "NotPrimitiveUnion";
         return TypeFlags2;
       })(TypeFlags || {});
       ObjectFlags = /* @__PURE__ */ ((ObjectFlags3) => {
@@ -8619,6 +8619,7 @@ ${lanes.join("\n")}
         Specify_emit_Slashchecking_behavior_for_imports_that_are_only_used_for_types: diag(6718, 3 /* Message */, "Specify_emit_Slashchecking_behavior_for_imports_that_are_only_used_for_types_6718", "Specify emit/checking behavior for imports that are only used for types."),
         Default_catch_clause_variables_as_unknown_instead_of_any: diag(6803, 3 /* Message */, "Default_catch_clause_variables_as_unknown_instead_of_any_6803", "Default catch clause variables as 'unknown' instead of 'any'."),
         Do_not_transform_or_elide_any_imports_or_exports_not_marked_as_type_only_ensuring_they_are_written_in_the_output_file_s_format_based_on_the_module_setting: diag(6804, 3 /* Message */, "Do_not_transform_or_elide_any_imports_or_exports_not_marked_as_type_only_ensuring_they_are_written_i_6804", "Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting."),
+        Default_type_arguments_to_parameter_constraint_or_unknown_instead_of_any_for_instance_checks: diag(6805, 3 /* Message */, "Default_type_arguments_to_parameter_constraint_or_unknown_instead_of_any_for_instance_checks_6805", "Default type arguments to parameter constraint or 'unknown' instead of 'any' for instance checks."),
         one_of_Colon: diag(6900, 3 /* Message */, "one_of_Colon_6900", "one of:"),
         one_or_more_Colon: diag(6901, 3 /* Message */, "one_or_more_Colon_6901", "one or more:"),
         type_Colon: diag(6902, 3 /* Message */, "type_Colon_6902", "type:"),
@@ -37848,6 +37849,16 @@ ${lanes.join("\n")}
           description: Diagnostics.Default_catch_clause_variables_as_unknown_instead_of_any,
           defaultValueDescription: false
         },
+        {
+          name: "strictInstanceOfTypeParameters",
+          type: "boolean",
+          affectsSemanticDiagnostics: true,
+          affectsBuildInfo: true,
+          strictFlag: true,
+          category: Diagnostics.Type_Checking,
+          description: Diagnostics.Default_type_arguments_to_parameter_constraint_or_unknown_instead_of_any_for_instance_checks,
+          defaultValueDescription: false
+        },
         {
           name: "alwaysStrict",
           type: "boolean",
@@ -45068,6 +45079,7 @@ ${lanes.join("\n")}
     var noImplicitAny = getStrictOptionValue(compilerOptions, "noImplicitAny");
     var noImplicitThis = getStrictOptionValue(compilerOptions, "noImplicitThis");
     var useUnknownInCatchVariables = getStrictOptionValue(compilerOptions, "useUnknownInCatchVariables");
+    var strictInstanceOfTypeParameters = getStrictOptionValue(compilerOptions, "strictInstanceOfTypeParameters");
     var keyofStringsOnly = !!compilerOptions.keyofStringsOnly;
     var defaultIndexFlags = keyofStringsOnly ? 1 /* StringsOnly */ : 0 /* None */;
     var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 8192 /* FreshLiteral */;
@@ -53034,9 +53046,32 @@ ${lanes.join("\n")}
         }
       }).parent;
     }
+    function getInstanceTypeOfClassSymbol(classSymbol) {
+      const classType = getDeclaredTypeOfSymbol(classSymbol);
+      const objectFlags = getObjectFlags(classType);
+      if (!(objectFlags & 3 /* ClassOrInterface */) || !classType.typeParameters) {
+        return classType;
+      }
+      const variances = getVariances(classType);
+      const typeArguments = map(classType.typeParameters, (typeParameter, i) => {
+        if (!strictInstanceOfTypeParameters) {
+          return anyType;
+        }
+        const variance = variances[i];
+        switch (variance & 7 /* VarianceMask */) {
+          case 4 /* Independent */:
+          case 3 /* Bivariant */:
+            return anyType;
+          case 2 /* Contravariant */:
+            return neverType;
+        }
+        return getBaseConstraintOfType(typeParameter) || unknownType;
+      });
+      return createTypeReference(classType, typeArguments);
+    }
     function getTypeOfPrototypeProperty(prototype) {
-      const classType = getDeclaredTypeOfSymbol(getParentOfSymbol(prototype));
-      return classType.typeParameters ? createTypeReference(classType, map(classType.typeParameters, (_) => anyType)) : classType;
+      const classSymbol = getParentOfSymbol(prototype);
+      return getInstanceTypeOfClassSymbol(classSymbol);
     }
     function getTypeOfPropertyOfType(type, name) {
       const prop = getPropertyOfType(type, name);
@@ -58407,7 +58442,7 @@ ${lanes.join("\n")}
           origin = createOriginUnionOrIntersectionType(1048576 /* Union */, reducedTypes);
         }
       }
-      const objectFlags = (includes & 36323363 /* NotPrimitiveUnion */ ? 0 : 32768 /* PrimitiveUnion */) | (includes & 2097152 /* Intersection */ ? 16777216 /* ContainsIntersections */ : 0);
+      const objectFlags = (includes & 36323331 /* NotPrimitiveUnion */ ? 0 : 32768 /* PrimitiveUnion */) | (includes & 2097152 /* Intersection */ ? 16777216 /* ContainsIntersections */ : 0);
       return getUnionTypeFromSortedList(typeSet, objectFlags, aliasSymbol, aliasTypeArguments, origin);
     }
     function getUnionOrIntersectionTypePredicate(signatures, kind) {
@@ -58532,7 +58567,7 @@ ${lanes.join("\n")}
     function eachUnionContains(unionTypes2, type) {
       for (const u of unionTypes2) {
         if (!containsType(u.types, type)) {
-          const primitive = type.flags & 128 /* StringLiteral */ ? stringType : type.flags & 256 /* NumberLiteral */ ? numberType : type.flags & 2048 /* BigIntLiteral */ ? bigintType : type.flags & 8192 /* UniqueESSymbol */ ? esSymbolType : void 0;
+          const primitive = type.flags & 128 /* StringLiteral */ ? stringType : type.flags & (32 /* Enum */ | 256 /* NumberLiteral */) ? numberType : type.flags & 2048 /* BigIntLiteral */ ? bigintType : type.flags & 8192 /* UniqueESSymbol */ ? esSymbolType : void 0;
           if (!primitive || !containsType(u.types, primitive)) {
             return false;
           }
@@ -58559,9 +58594,6 @@ ${lanes.join("\n")}
       }
       return false;
     }
-    function eachIsUnionContaining(types, flag) {
-      return every(types, (t) => !!(t.flags & 1048576 /* Union */) && some(t.types, (tt) => !!(tt.flags & flag)));
-    }
     function removeFromEach(types, flag) {
       for (let i = 0; i < types.length; i++) {
         types[i] = filterType(types[i], (t) => !(t.flags & flag));
@@ -58650,11 +58682,11 @@ ${lanes.join("\n")}
         if (includes & 1048576 /* Union */) {
           if (intersectUnionsOfPrimitiveTypes(typeSet)) {
             result = getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
-          } else if (eachIsUnionContaining(typeSet, 32768 /* Undefined */)) {
+          } else if (every(typeSet, (t) => !!(t.flags & 1048576 /* Union */ && t.types[0].flags & 32768 /* Undefined */))) {
             const containedUndefinedType = some(typeSet, containsMissingType) ? missingType : undefinedType;
             removeFromEach(typeSet, 32768 /* Undefined */);
             result = getUnionType([getIntersectionType(typeSet), containedUndefinedType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
-          } else if (eachIsUnionContaining(typeSet, 65536 /* Null */)) {
+          } else if (every(typeSet, (t) => !!(t.flags & 1048576 /* Union */ && (t.types[0].flags & 65536 /* Null */ || t.types[1].flags & 65536 /* Null */)))) {
             removeFromEach(typeSet, 65536 /* Null */);
             result = getUnionType([getIntersectionType(typeSet), nullType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
           } else {
@@ -62179,6 +62211,11 @@ ${lanes.join("\n")}
           if (containsType(targetTypes, source2)) {
             return -1 /* True */;
           }
+          if (getObjectFlags(target2) & 32768 /* PrimitiveUnion */ && !(source2.flags & 1024 /* EnumLiteral */) && (source2.flags & (128 /* StringLiteral */ | 512 /* BooleanLiteral */ | 2048 /* BigIntLiteral */) || (relation === subtypeRelation || relation === strictSubtypeRelation) && source2.flags & 256 /* NumberLiteral */)) {
+            const alternateForm = source2 === source2.regularType ? source2.freshType : source2.regularType;
+            const primitive = source2.flags & 128 /* StringLiteral */ ? stringType : source2.flags & 256 /* NumberLiteral */ ? numberType : source2.flags & 2048 /* BigIntLiteral */ ? bigintType : void 0;
+            return primitive && containsType(targetTypes, primitive) || alternateForm && containsType(targetTypes, alternateForm) ? -1 /* True */ : 0 /* False */;
+          }
           const match = getMatchingUnionConstituentForType(target2, source2);
           if (match) {
             const related = isRelatedTo(
@@ -67480,8 +67517,8 @@ ${lanes.join("\n")}
         if (symbol === void 0) {
           return type;
         }
-        const classSymbol = symbol.parent;
-        const targetType = hasStaticModifier(Debug.checkDefined(symbol.valueDeclaration, "should always have a declaration")) ? getTypeOfSymbol(classSymbol) : getDeclaredTypeOfSymbol(classSymbol);
+        const classSymbol = getParentOfSymbol(symbol);
+        const targetType = hasStaticModifier(Debug.checkDefined(symbol.valueDeclaration, "should always have a declaration")) ? getTypeOfSymbol(classSymbol) : getInstanceTypeOfClassSymbol(classSymbol);
         return getNarrowedType(
           type,
           targetType,
@@ -68932,7 +68969,7 @@ ${lanes.join("\n")}
                 return void 0;
               }
             }
-            return isInJSFile(decl2) ? void 0 : getTypeOfExpression(binaryExpression.left);
+            return isInJSFile(decl2) || decl2 === binaryExpression.left ? void 0 : getTypeOfExpression(binaryExpression.left);
           }
         case 1 /* ExportsProperty */:
         case 6 /* Prototype */:
@@ -69830,7 +69867,7 @@ ${lanes.join("\n")}
       const inConstContext = isConstContext(node);
       const checkFlags = inConstContext ? 8 /* Readonly */ : 0;
       const isInJavascript = isInJSFile(node) && !isInJsonFile(node);
-      const enumTag = getJSDocEnumTag(node);
+      const enumTag = isInJavascript ? getJSDocEnumTag(node) : void 0;
       const isJSObjectLiteral = !contextualType && isInJavascript && !enumTag;
       let objectFlags = freshObjectLiteralFlag;
       let patternWithComputedProperties = false;
@@ -74587,6 +74624,11 @@ ${lanes.join("\n")}
             } else {
               assignNonContextualParameterTypes(signature);
             }
+          } else if (contextualSignature && !node.typeParameters && contextualSignature.parameters.length > node.parameters.length) {
+            const inferenceContext = getInferenceContext(node);
+            if (checkMode && checkMode & 2 /* Inferential */) {
+              inferFromAnnotatedParameters(signature, contextualSignature, inferenceContext);
+            }
           }
           if (contextualSignature && !getReturnTypeFromAnnotation(node) && !signature.resolvedReturnType) {
             const returnType = getReturnTypeFromBody(node, checkMode);

package/lib/typescript.d.ts

@@ -3198,6 +3198,7 @@ declare namespace ts {
         strictBindCallApply?: boolean;
         strictNullChecks?: boolean;
         strictPropertyInitialization?: boolean;
+        strictInstanceOfTypeParameters?: boolean;
         stripInternal?: boolean;
         suppressExcessPropertyErrors?: boolean;
         suppressImplicitAnyIndexErrors?: boolean;

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-insiders.20230316`;
+      version = `${versionMajorMinor}.0-insiders.20230317`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -4449,7 +4449,7 @@ ${lanes.join("\n")}
         TypeFlags2[TypeFlags2["IncludesWildcard"] = 8388608 /* IndexedAccess */] = "IncludesWildcard";
         TypeFlags2[TypeFlags2["IncludesEmptyObject"] = 16777216 /* Conditional */] = "IncludesEmptyObject";
         TypeFlags2[TypeFlags2["IncludesInstantiable"] = 33554432 /* Substitution */] = "IncludesInstantiable";
-        TypeFlags2[TypeFlags2["NotPrimitiveUnion"] = 36323363] = "NotPrimitiveUnion";
+        TypeFlags2[TypeFlags2["NotPrimitiveUnion"] = 36323331] = "NotPrimitiveUnion";
         return TypeFlags2;
       })(TypeFlags || {});
       ObjectFlags = /* @__PURE__ */ ((ObjectFlags3) => {
@@ -8619,6 +8619,7 @@ ${lanes.join("\n")}
         Specify_emit_Slashchecking_behavior_for_imports_that_are_only_used_for_types: diag(6718, 3 /* Message */, "Specify_emit_Slashchecking_behavior_for_imports_that_are_only_used_for_types_6718", "Specify emit/checking behavior for imports that are only used for types."),
         Default_catch_clause_variables_as_unknown_instead_of_any: diag(6803, 3 /* Message */, "Default_catch_clause_variables_as_unknown_instead_of_any_6803", "Default catch clause variables as 'unknown' instead of 'any'."),
         Do_not_transform_or_elide_any_imports_or_exports_not_marked_as_type_only_ensuring_they_are_written_in_the_output_file_s_format_based_on_the_module_setting: diag(6804, 3 /* Message */, "Do_not_transform_or_elide_any_imports_or_exports_not_marked_as_type_only_ensuring_they_are_written_i_6804", "Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting."),
+        Default_type_arguments_to_parameter_constraint_or_unknown_instead_of_any_for_instance_checks: diag(6805, 3 /* Message */, "Default_type_arguments_to_parameter_constraint_or_unknown_instead_of_any_for_instance_checks_6805", "Default type arguments to parameter constraint or 'unknown' instead of 'any' for instance checks."),
         one_of_Colon: diag(6900, 3 /* Message */, "one_of_Colon_6900", "one of:"),
         one_or_more_Colon: diag(6901, 3 /* Message */, "one_or_more_Colon_6901", "one or more:"),
         type_Colon: diag(6902, 3 /* Message */, "type_Colon_6902", "type:"),
@@ -37848,6 +37849,16 @@ ${lanes.join("\n")}
           description: Diagnostics.Default_catch_clause_variables_as_unknown_instead_of_any,
           defaultValueDescription: false
         },
+        {
+          name: "strictInstanceOfTypeParameters",
+          type: "boolean",
+          affectsSemanticDiagnostics: true,
+          affectsBuildInfo: true,
+          strictFlag: true,
+          category: Diagnostics.Type_Checking,
+          description: Diagnostics.Default_type_arguments_to_parameter_constraint_or_unknown_instead_of_any_for_instance_checks,
+          defaultValueDescription: false
+        },
         {
           name: "alwaysStrict",
           type: "boolean",
@@ -45068,6 +45079,7 @@ ${lanes.join("\n")}
     var noImplicitAny = getStrictOptionValue(compilerOptions, "noImplicitAny");
     var noImplicitThis = getStrictOptionValue(compilerOptions, "noImplicitThis");
     var useUnknownInCatchVariables = getStrictOptionValue(compilerOptions, "useUnknownInCatchVariables");
+    var strictInstanceOfTypeParameters = getStrictOptionValue(compilerOptions, "strictInstanceOfTypeParameters");
     var keyofStringsOnly = !!compilerOptions.keyofStringsOnly;
     var defaultIndexFlags = keyofStringsOnly ? 1 /* StringsOnly */ : 0 /* None */;
     var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 8192 /* FreshLiteral */;
@@ -53034,9 +53046,32 @@ ${lanes.join("\n")}
         }
       }).parent;
     }
+    function getInstanceTypeOfClassSymbol(classSymbol) {
+      const classType = getDeclaredTypeOfSymbol(classSymbol);
+      const objectFlags = getObjectFlags(classType);
+      if (!(objectFlags & 3 /* ClassOrInterface */) || !classType.typeParameters) {
+        return classType;
+      }
+      const variances = getVariances(classType);
+      const typeArguments = map(classType.typeParameters, (typeParameter, i) => {
+        if (!strictInstanceOfTypeParameters) {
+          return anyType;
+        }
+        const variance = variances[i];
+        switch (variance & 7 /* VarianceMask */) {
+          case 4 /* Independent */:
+          case 3 /* Bivariant */:
+            return anyType;
+          case 2 /* Contravariant */:
+            return neverType;
+        }
+        return getBaseConstraintOfType(typeParameter) || unknownType;
+      });
+      return createTypeReference(classType, typeArguments);
+    }
     function getTypeOfPrototypeProperty(prototype) {
-      const classType = getDeclaredTypeOfSymbol(getParentOfSymbol(prototype));
-      return classType.typeParameters ? createTypeReference(classType, map(classType.typeParameters, (_) => anyType)) : classType;
+      const classSymbol = getParentOfSymbol(prototype);
+      return getInstanceTypeOfClassSymbol(classSymbol);
     }
     function getTypeOfPropertyOfType(type, name) {
       const prop = getPropertyOfType(type, name);
@@ -58407,7 +58442,7 @@ ${lanes.join("\n")}
           origin = createOriginUnionOrIntersectionType(1048576 /* Union */, reducedTypes);
         }
       }
-      const objectFlags = (includes & 36323363 /* NotPrimitiveUnion */ ? 0 : 32768 /* PrimitiveUnion */) | (includes & 2097152 /* Intersection */ ? 16777216 /* ContainsIntersections */ : 0);
+      const objectFlags = (includes & 36323331 /* NotPrimitiveUnion */ ? 0 : 32768 /* PrimitiveUnion */) | (includes & 2097152 /* Intersection */ ? 16777216 /* ContainsIntersections */ : 0);
       return getUnionTypeFromSortedList(typeSet, objectFlags, aliasSymbol, aliasTypeArguments, origin);
     }
     function getUnionOrIntersectionTypePredicate(signatures, kind) {
@@ -58532,7 +58567,7 @@ ${lanes.join("\n")}
     function eachUnionContains(unionTypes2, type) {
       for (const u of unionTypes2) {
         if (!containsType(u.types, type)) {
-          const primitive = type.flags & 128 /* StringLiteral */ ? stringType : type.flags & 256 /* NumberLiteral */ ? numberType : type.flags & 2048 /* BigIntLiteral */ ? bigintType : type.flags & 8192 /* UniqueESSymbol */ ? esSymbolType : void 0;
+          const primitive = type.flags & 128 /* StringLiteral */ ? stringType : type.flags & (32 /* Enum */ | 256 /* NumberLiteral */) ? numberType : type.flags & 2048 /* BigIntLiteral */ ? bigintType : type.flags & 8192 /* UniqueESSymbol */ ? esSymbolType : void 0;
           if (!primitive || !containsType(u.types, primitive)) {
             return false;
           }
@@ -58559,9 +58594,6 @@ ${lanes.join("\n")}
       }
       return false;
     }
-    function eachIsUnionContaining(types, flag) {
-      return every(types, (t) => !!(t.flags & 1048576 /* Union */) && some(t.types, (tt) => !!(tt.flags & flag)));
-    }
     function removeFromEach(types, flag) {
       for (let i = 0; i < types.length; i++) {
         types[i] = filterType(types[i], (t) => !(t.flags & flag));
@@ -58650,11 +58682,11 @@ ${lanes.join("\n")}
         if (includes & 1048576 /* Union */) {
           if (intersectUnionsOfPrimitiveTypes(typeSet)) {
             result = getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
-          } else if (eachIsUnionContaining(typeSet, 32768 /* Undefined */)) {
+          } else if (every(typeSet, (t) => !!(t.flags & 1048576 /* Union */ && t.types[0].flags & 32768 /* Undefined */))) {
             const containedUndefinedType = some(typeSet, containsMissingType) ? missingType : undefinedType;
             removeFromEach(typeSet, 32768 /* Undefined */);
             result = getUnionType([getIntersectionType(typeSet), containedUndefinedType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
-          } else if (eachIsUnionContaining(typeSet, 65536 /* Null */)) {
+          } else if (every(typeSet, (t) => !!(t.flags & 1048576 /* Union */ && (t.types[0].flags & 65536 /* Null */ || t.types[1].flags & 65536 /* Null */)))) {
             removeFromEach(typeSet, 65536 /* Null */);
             result = getUnionType([getIntersectionType(typeSet), nullType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
           } else {
@@ -62179,6 +62211,11 @@ ${lanes.join("\n")}
           if (containsType(targetTypes, source2)) {
             return -1 /* True */;
           }
+          if (getObjectFlags(target2) & 32768 /* PrimitiveUnion */ && !(source2.flags & 1024 /* EnumLiteral */) && (source2.flags & (128 /* StringLiteral */ | 512 /* BooleanLiteral */ | 2048 /* BigIntLiteral */) || (relation === subtypeRelation || relation === strictSubtypeRelation) && source2.flags & 256 /* NumberLiteral */)) {
+            const alternateForm = source2 === source2.regularType ? source2.freshType : source2.regularType;
+            const primitive = source2.flags & 128 /* StringLiteral */ ? stringType : source2.flags & 256 /* NumberLiteral */ ? numberType : source2.flags & 2048 /* BigIntLiteral */ ? bigintType : void 0;
+            return primitive && containsType(targetTypes, primitive) || alternateForm && containsType(targetTypes, alternateForm) ? -1 /* True */ : 0 /* False */;
+          }
           const match = getMatchingUnionConstituentForType(target2, source2);
           if (match) {
             const related = isRelatedTo(
@@ -67480,8 +67517,8 @@ ${lanes.join("\n")}
         if (symbol === void 0) {
           return type;
         }
-        const classSymbol = symbol.parent;
-        const targetType = hasStaticModifier(Debug.checkDefined(symbol.valueDeclaration, "should always have a declaration")) ? getTypeOfSymbol(classSymbol) : getDeclaredTypeOfSymbol(classSymbol);
+        const classSymbol = getParentOfSymbol(symbol);
+        const targetType = hasStaticModifier(Debug.checkDefined(symbol.valueDeclaration, "should always have a declaration")) ? getTypeOfSymbol(classSymbol) : getInstanceTypeOfClassSymbol(classSymbol);
         return getNarrowedType(
           type,
           targetType,
@@ -68932,7 +68969,7 @@ ${lanes.join("\n")}
                 return void 0;
               }
             }
-            return isInJSFile(decl2) ? void 0 : getTypeOfExpression(binaryExpression.left);
+            return isInJSFile(decl2) || decl2 === binaryExpression.left ? void 0 : getTypeOfExpression(binaryExpression.left);
           }
         case 1 /* ExportsProperty */:
         case 6 /* Prototype */:
@@ -69830,7 +69867,7 @@ ${lanes.join("\n")}
       const inConstContext = isConstContext(node);
       const checkFlags = inConstContext ? 8 /* Readonly */ : 0;
       const isInJavascript = isInJSFile(node) && !isInJsonFile(node);
-      const enumTag = getJSDocEnumTag(node);
+      const enumTag = isInJavascript ? getJSDocEnumTag(node) : void 0;
       const isJSObjectLiteral = !contextualType && isInJavascript && !enumTag;
       let objectFlags = freshObjectLiteralFlag;
       let patternWithComputedProperties = false;
@@ -74587,6 +74624,11 @@ ${lanes.join("\n")}
             } else {
               assignNonContextualParameterTypes(signature);
             }
+          } else if (contextualSignature && !node.typeParameters && contextualSignature.parameters.length > node.parameters.length) {
+            const inferenceContext = getInferenceContext(node);
+            if (checkMode && checkMode & 2 /* Inferential */) {
+              inferFromAnnotatedParameters(signature, contextualSignature, inferenceContext);
+            }
           }
           if (contextualSignature && !getReturnTypeFromAnnotation(node) && !signature.resolvedReturnType) {
             const returnType = getReturnTypeFromBody(node, checkMode);

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-insiders.20230316`;
+var version = `${versionMajorMinor}.0-insiders.20230317`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -3127,7 +3127,7 @@ var TypeFlags = /* @__PURE__ */ ((TypeFlags2) => {
   TypeFlags2[TypeFlags2["IncludesWildcard"] = 8388608 /* IndexedAccess */] = "IncludesWildcard";
   TypeFlags2[TypeFlags2["IncludesEmptyObject"] = 16777216 /* Conditional */] = "IncludesEmptyObject";
   TypeFlags2[TypeFlags2["IncludesInstantiable"] = 33554432 /* Substitution */] = "IncludesInstantiable";
-  TypeFlags2[TypeFlags2["NotPrimitiveUnion"] = 36323363] = "NotPrimitiveUnion";
+  TypeFlags2[TypeFlags2["NotPrimitiveUnion"] = 36323331] = "NotPrimitiveUnion";
   return TypeFlags2;
 })(TypeFlags || {});
 var ObjectFlags = /* @__PURE__ */ ((ObjectFlags3) => {
@@ -6689,6 +6689,7 @@ var Diagnostics = {
   Specify_emit_Slashchecking_behavior_for_imports_that_are_only_used_for_types: diag(6718, 3 /* Message */, "Specify_emit_Slashchecking_behavior_for_imports_that_are_only_used_for_types_6718", "Specify emit/checking behavior for imports that are only used for types."),
   Default_catch_clause_variables_as_unknown_instead_of_any: diag(6803, 3 /* Message */, "Default_catch_clause_variables_as_unknown_instead_of_any_6803", "Default catch clause variables as 'unknown' instead of 'any'."),
   Do_not_transform_or_elide_any_imports_or_exports_not_marked_as_type_only_ensuring_they_are_written_in_the_output_file_s_format_based_on_the_module_setting: diag(6804, 3 /* Message */, "Do_not_transform_or_elide_any_imports_or_exports_not_marked_as_type_only_ensuring_they_are_written_i_6804", "Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting."),
+  Default_type_arguments_to_parameter_constraint_or_unknown_instead_of_any_for_instance_checks: diag(6805, 3 /* Message */, "Default_type_arguments_to_parameter_constraint_or_unknown_instead_of_any_for_instance_checks_6805", "Default type arguments to parameter constraint or 'unknown' instead of 'any' for instance checks."),
   one_of_Colon: diag(6900, 3 /* Message */, "one_of_Colon_6900", "one of:"),
   one_or_more_Colon: diag(6901, 3 /* Message */, "one_or_more_Colon_6901", "one or more:"),
   type_Colon: diag(6902, 3 /* Message */, "type_Colon_6902", "type:"),
@@ -25897,6 +25898,16 @@ var commandOptionsWithoutBuild = [
     description: Diagnostics.Default_catch_clause_variables_as_unknown_instead_of_any,
     defaultValueDescription: false
   },
+  {
+    name: "strictInstanceOfTypeParameters",
+    type: "boolean",
+    affectsSemanticDiagnostics: true,
+    affectsBuildInfo: true,
+    strictFlag: true,
+    category: Diagnostics.Type_Checking,
+    description: Diagnostics.Default_type_arguments_to_parameter_constraint_or_unknown_instead_of_any_for_instance_checks,
+    defaultValueDescription: false
+  },
   {
     name: "alwaysStrict",
     type: "boolean",
@@ -31585,24 +31596,21 @@ function installNpmPackages(npmPath, tsVersion, packageNames, install) {
   for (let remaining = packageNames.length; remaining > 0; ) {
     const result = getNpmCommandForInstallation(npmPath, tsVersion, packageNames, remaining);
     remaining = result.remaining;
-    hasError = install(result.command, result.args) || hasError;
+    hasError = install(result.command) || hasError;
   }
   return hasError;
 }
 function getNpmCommandForInstallation(npmPath, tsVersion, packageNames, remaining) {
   const sliceStart = packageNames.length - remaining;
-  let toSlice = remaining;
-  let args;
+  let command, toSlice = remaining;
   while (true) {
-    const slice = toSlice === packageNames.length ? packageNames : packageNames.slice(sliceStart, sliceStart + toSlice);
-    const length2 = reduceLeft(slice, (total, pkg) => total + pkg.length, 0);
-    if (length2 < 8e3) {
-      args = ["install", "--ignore-scripts", ...slice, "--save-dev", `--user-agent=typesInstaller/${tsVersion}`];
+    command = `${npmPath} install --ignore-scripts ${(toSlice === packageNames.length ? packageNames : packageNames.slice(sliceStart, sliceStart + toSlice)).join(" ")} --save-dev --user-agent="typesInstaller/${tsVersion}"`;
+    if (command.length < 8e3) {
       break;
     }
     toSlice = toSlice - Math.floor(toSlice / 2);
   }
-  return { command: npmPath, args, remaining: remaining - toSlice };
+  return { command, remaining: remaining - toSlice };
 }
 function endsWith2(str, suffix, caseSensitive) {
   const expectedPos = str.length - suffix.length;
@@ -32062,13 +32070,13 @@ var NodeTypingsInstaller = class extends TypingsInstaller {
       this.log.writeLine(`NPM location: ${this.npmPath} (explicit '${Arguments.NpmLocation}' ${npmLocation2 === void 0 ? "not " : ""} provided)`);
       this.log.writeLine(`validateDefaultNpmLocation: ${validateDefaultNpmLocation2}`);
     }
-    ({ execSync: this.nodeExecFileSync } = require("child_process"));
+    ({ execSync: this.nodeExecSync } = require("child_process"));
     this.ensurePackageDirectoryExists(globalTypingsCacheLocation2);
     try {
       if (this.log.isEnabled()) {
         this.log.writeLine(`Updating ${typesRegistryPackageName} npm package...`);
       }
-      this.execFileSyncAndLog(this.npmPath, ["install", "--ignore-scripts", `${typesRegistryPackageName}@${this.latestDistTag}`], { cwd: globalTypingsCacheLocation2 });
+      this.execSyncAndLog(`${this.npmPath} install --ignore-scripts ${typesRegistryPackageName}@${this.latestDistTag}`, { cwd: globalTypingsCacheLocation2 });
       if (this.log.isEnabled()) {
         this.log.writeLine(`Updated ${typesRegistryPackageName} npm package`);
       }
@@ -32139,19 +32147,19 @@ var NodeTypingsInstaller = class extends TypingsInstaller {
       this.log.writeLine(`#${requestId} with arguments'${JSON.stringify(packageNames)}'.`);
     }
     const start = Date.now();
-    const hasError = installNpmPackages(this.npmPath, version, packageNames, (command, args) => this.execFileSyncAndLog(command, args, { cwd }));
+    const hasError = installNpmPackages(this.npmPath, version, packageNames, (command) => this.execSyncAndLog(command, { cwd }));
     if (this.log.isEnabled()) {
       this.log.writeLine(`npm install #${requestId} took: ${Date.now() - start} ms`);
     }
     onRequestCompleted(!hasError);
   }
   /** Returns 'true' in case of error. */
-  execFileSyncAndLog(command, args, options) {
+  execSyncAndLog(command, options) {
     if (this.log.isEnabled()) {
       this.log.writeLine(`Exec: ${command}`);
     }
     try {
-      const stdout = this.nodeExecFileSync(command, args, { ...options, encoding: "utf-8", timeout: 1e4 });
+      const stdout = this.nodeExecSync(command, { ...options, encoding: "utf-8" });
       if (this.log.isEnabled()) {
         this.log.writeLine(`    Succeeded. stdout:${indent(sys.newLine, stdout)}`);
       }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.1.0-pr-53292-2",
+  "version": "5.1.0-pr-49863-27",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -79,7 +79,7 @@
     "node-fetch": "^3.2.10",
     "source-map-support": "^0.5.21",
     "tslib": "^2.5.0",
-    "typescript": "5.0.1-rc",
+    "typescript": "^5.0.2",
     "which": "^2.0.2"
   },
   "overrides": {
@@ -114,5 +114,5 @@
     "node": "14.21.1",
     "npm": "8.19.3"
   },
-  "gitHead": "d914d6c336c9c603779e8e9001e3be829e54b878"
+  "gitHead": "a6ea599f1c25108b1745bc28aef501251ff356b9"
 }