@typescript-deploys/pr-build 5.1.0-pr-51328-34 → 5.1.0-pr-53729-10

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-insiders.20230411`;
+var version = `${versionMajorMinor}.0-insiders.20230412`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -7741,8 +7741,7 @@ var Diagnostics = {
   _0_is_possibly_null_or_undefined: diag(18049, 1 /* Error */, "_0_is_possibly_null_or_undefined_18049", "'{0}' is possibly 'null' or 'undefined'."),
   The_value_0_cannot_be_used_here: diag(18050, 1 /* Error */, "The_value_0_cannot_be_used_here_18050", "The value '{0}' cannot be used here."),
   Compiler_option_0_cannot_be_given_an_empty_string: diag(18051, 1 /* Error */, "Compiler_option_0_cannot_be_given_an_empty_string_18051", "Compiler option '{0}' cannot be given an empty string."),
-  Non_abstract_class_0_does_not_implement_all_abstract_members_of_1: diag(18052, 1 /* Error */, "Non_abstract_class_0_does_not_implement_all_abstract_members_of_1_18052", "Non-abstract class '{0}' does not implement all abstract members of '{1}'"),
-  Its_type_0_is_not_a_valid_JSX_element_type: diag(18053, 1 /* Error */, "Its_type_0_is_not_a_valid_JSX_element_type_18053", "Its type '{0}' is not a valid JSX element type.")
+  Non_abstract_class_0_does_not_implement_all_abstract_members_of_1: diag(18052, 1 /* Error */, "Non_abstract_class_0_does_not_implement_all_abstract_members_of_1_18052", "Non-abstract class '{0}' does not implement all abstract members of '{1}'")
 };
 
 // src/compiler/scanner.ts
@@ -43408,6 +43407,8 @@ function createTypeChecker(host) {
   var resolutionTargets = [];
   var resolutionResults = [];
   var resolutionPropertyNames = [];
+  var resolutionStart = 0;
+  var inVarianceComputation = false;
   var suggestionCount = 0;
   var maximumSuggestionCount = 10;
   var mergedSymbols = [];
@@ -50608,7 +50609,7 @@ function createTypeChecker(host) {
     return true;
   }
   function findResolutionCycleStartIndex(target, propertyName) {
-    for (let i = resolutionTargets.length - 1; i >= 0; i--) {
+    for (let i = resolutionTargets.length - 1; i >= resolutionStart; i--) {
       if (resolutionTargetHasProperty(resolutionTargets[i], resolutionPropertyNames[i])) {
         return -1;
       }
@@ -61580,40 +61581,31 @@ function createTypeChecker(host) {
     return getPropertiesOfType(type).filter((targetProp) => containsMissingType(getTypeOfSymbol(targetProp)));
   }
   function getBestMatchingType(source, target, isRelatedTo = compareTypesAssignable) {
-    return findMatchingDiscriminantType(
-      source,
-      target,
-      isRelatedTo,
-      /*skipPartial*/
-      true
-    ) || findMatchingTypeReferenceOrTypeAliasReference(source, target) || findBestTypeForObjectLiteral(source, target) || findBestTypeForInvokable(source, target) || findMostOverlappyType(source, target);
+    return findMatchingDiscriminantType(source, target, isRelatedTo) || findMatchingTypeReferenceOrTypeAliasReference(source, target) || findBestTypeForObjectLiteral(source, target) || findBestTypeForInvokable(source, target) || findMostOverlappyType(source, target);
   }
-  function discriminateTypeByDiscriminableItems(target, discriminators, related, defaultValue, skipPartial) {
-    const discriminable = target.types.map((_) => void 0);
+  function discriminateTypeByDiscriminableItems(target, discriminators, related) {
+    const types = target.types;
+    const include = types.map((t) => t.flags & 402784252 /* Primitive */ ? 0 /* False */ : -1 /* True */);
     for (const [getDiscriminatingType, propertyName] of discriminators) {
-      const targetProp = getUnionOrIntersectionProperty(target, propertyName);
-      if (skipPartial && targetProp && getCheckFlags(targetProp) & 16 /* ReadPartial */) {
-        continue;
+      let matched = false;
+      for (let i = 0; i < types.length; i++) {
+        if (include[i]) {
+          const targetType = getTypeOfPropertyOfType(types[i], propertyName);
+          if (targetType && related(getDiscriminatingType(), targetType)) {
+            matched = true;
+          } else {
+            include[i] = 3 /* Maybe */;
+          }
+        }
       }
-      let i = 0;
-      for (const type of target.types) {
-        const targetType = getTypeOfPropertyOfType(type, propertyName);
-        if (targetType && related(getDiscriminatingType(), targetType)) {
-          discriminable[i] = discriminable[i] === void 0 ? true : discriminable[i];
-        } else {
-          discriminable[i] = false;
+      for (let i = 0; i < types.length; i++) {
+        if (include[i] === 3 /* Maybe */) {
+          include[i] = matched ? 0 /* False */ : -1 /* True */;
         }
-        i++;
       }
     }
-    const match = discriminable.indexOf(
-      /*searchElement*/
-      true
-    );
-    if (match === -1) {
-      return defaultValue;
-    }
-    return getUnionType(target.types.filter((_, index) => discriminable[index]));
+    const filtered = contains(include, 0 /* False */) ? getUnionType(types.filter((_, i) => include[i])) : target;
+    return filtered.flags & 131072 /* Never */ ? target : filtered;
   }
   function isWeakType(type) {
     if (type.flags & 524288 /* Object */) {
@@ -61644,6 +61636,11 @@ function createTypeChecker(host) {
     const links = getSymbolLinks(symbol);
     if (!links.variances) {
       (_a2 = tracing) == null ? void 0 : _a2.push(tracing.Phase.CheckTypes, "getVariancesWorker", { arity: typeParameters.length, id: getTypeId(getDeclaredTypeOfSymbol(symbol)) });
+      const oldVarianceComputation = inVarianceComputation;
+      if (!inVarianceComputation) {
+        inVarianceComputation = true;
+        resolutionStart = resolutionTargets.length;
+      }
       links.variances = emptyArray;
       const variances = [];
       for (const tp of typeParameters) {
@@ -61672,6 +61669,10 @@ function createTypeChecker(host) {
         }
         variances.push(variance);
       }
+      if (!oldVarianceComputation) {
+        inVarianceComputation = false;
+        resolutionStart = 0;
+      }
       links.variances = variances;
       (_b = tracing) == null ? void 0 : _b.pop({ variances: variances.map(Debug.formatVariance) });
     }
@@ -66908,8 +66909,7 @@ function createTypeChecker(host) {
           (s) => [() => undefinedType, s.escapedName]
         )
       ),
-      isTypeAssignableTo,
-      contextualType
+      isTypeAssignableTo
     );
   }
   function discriminateContextualTypeByJSXAttributes(node, contextualType) {
@@ -66928,8 +66928,7 @@ function createTypeChecker(host) {
           (s) => [() => undefinedType, s.escapedName]
         )
       ),
-      isTypeAssignableTo,
-      contextualType
+      isTypeAssignableTo
     );
   }
   function getApparentTypeOfContextualType(node, contextFlags) {
@@ -68169,12 +68168,6 @@ function createTypeChecker(host) {
       return getUnionType([jsxElementType, nullType]);
     }
   }
-  function getJsxElementTypeTypeAt(location) {
-    const type = getJsxType(JsxNames.ElementType, location);
-    if (isErrorType(type))
-      return void 0;
-    return type;
-  }
   function getJsxIntrinsicTagNamesAt(location) {
     const intrinsics = getJsxType(JsxNames.IntrinsicElements, location);
     return intrinsics ? getPropertiesOfType(intrinsics) : emptyArray;
@@ -68237,24 +68230,7 @@ function createTypeChecker(host) {
       const jsxOpeningLikeNode = node;
       const sig = getResolvedSignature(jsxOpeningLikeNode);
       checkDeprecatedSignature(sig, node);
-      const elementTypeConstraint = getJsxElementTypeTypeAt(jsxOpeningLikeNode);
-      if (elementTypeConstraint !== void 0) {
-        const tagType = isJsxIntrinsicIdentifier(jsxOpeningLikeNode.tagName) ? (
-          // TODO: Should this be a literal that library authors could potentially check against?
-          stringType
-        ) : getApparentType(checkExpression(jsxOpeningLikeNode.tagName));
-        checkTypeRelatedTo(tagType, elementTypeConstraint, assignableRelation, jsxOpeningLikeNode.tagName, Diagnostics.Its_type_0_is_not_a_valid_JSX_element_type, () => {
-          const componentName = getTextOfNode(jsxOpeningLikeNode.tagName);
-          return chainDiagnosticMessages(
-            /*details*/
-            void 0,
-            Diagnostics._0_cannot_be_used_as_a_JSX_component,
-            componentName
-          );
-        });
-      } else {
-        checkJsxReturnAssignableToAppropriateBound(getJsxReferenceKind(jsxOpeningLikeNode), getReturnTypeOfSignature(sig), jsxOpeningLikeNode);
-      }
+      checkJsxReturnAssignableToAppropriateBound(getJsxReferenceKind(jsxOpeningLikeNode), getReturnTypeOfSignature(sig), jsxOpeningLikeNode);
     }
   }
   function isKnownProperty(targetType, name, isComparingJsxAttributes) {
@@ -82966,7 +82942,7 @@ function createTypeChecker(host) {
     }
     return type;
   }
-  function findMatchingDiscriminantType(source, target, isRelatedTo, skipPartial) {
+  function findMatchingDiscriminantType(source, target, isRelatedTo) {
     if (target.flags & 1048576 /* Union */ && source.flags & (2097152 /* Intersection */ | 524288 /* Object */)) {
       const match = getMatchingUnionConstituentForType(target, source);
       if (match) {
@@ -82976,14 +82952,10 @@ function createTypeChecker(host) {
       if (sourceProperties) {
         const sourcePropertiesFiltered = findDiscriminantProperties(sourceProperties, target);
         if (sourcePropertiesFiltered) {
-          return discriminateTypeByDiscriminableItems(
-            target,
-            map(sourcePropertiesFiltered, (p) => [() => getTypeOfSymbol(p), p.escapedName]),
-            isRelatedTo,
-            /*defaultValue*/
-            void 0,
-            skipPartial
-          );
+          const discriminated = discriminateTypeByDiscriminableItems(target, map(sourcePropertiesFiltered, (p) => [() => getTypeOfSymbol(p), p.escapedName]), isRelatedTo);
+          if (discriminated !== target) {
+            return discriminated;
+          }
         }
       }
     }
@@ -83017,7 +82989,6 @@ var JsxNames;
   JsxNames2.ElementAttributesPropertyNameContainer = "ElementAttributesProperty";
   JsxNames2.ElementChildrenAttributeNameContainer = "ElementChildrenAttribute";
   JsxNames2.Element = "Element";
-  JsxNames2.ElementType = "ElementType";
   JsxNames2.IntrinsicAttributes = "IntrinsicAttributes";
   JsxNames2.IntrinsicClassAttributes = "IntrinsicClassAttributes";
   JsxNames2.LibraryManagedAttributes = "LibraryManagedAttributes";

package/lib/tsserver.js

@@ -2293,7 +2293,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-insiders.20230411`;
+var version = `${versionMajorMinor}.0-insiders.20230412`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -11242,8 +11242,7 @@ var Diagnostics = {
   _0_is_possibly_null_or_undefined: diag(18049, 1 /* Error */, "_0_is_possibly_null_or_undefined_18049", "'{0}' is possibly 'null' or 'undefined'."),
   The_value_0_cannot_be_used_here: diag(18050, 1 /* Error */, "The_value_0_cannot_be_used_here_18050", "The value '{0}' cannot be used here."),
   Compiler_option_0_cannot_be_given_an_empty_string: diag(18051, 1 /* Error */, "Compiler_option_0_cannot_be_given_an_empty_string_18051", "Compiler option '{0}' cannot be given an empty string."),
-  Non_abstract_class_0_does_not_implement_all_abstract_members_of_1: diag(18052, 1 /* Error */, "Non_abstract_class_0_does_not_implement_all_abstract_members_of_1_18052", "Non-abstract class '{0}' does not implement all abstract members of '{1}'"),
-  Its_type_0_is_not_a_valid_JSX_element_type: diag(18053, 1 /* Error */, "Its_type_0_is_not_a_valid_JSX_element_type_18053", "Its type '{0}' is not a valid JSX element type.")
+  Non_abstract_class_0_does_not_implement_all_abstract_members_of_1: diag(18052, 1 /* Error */, "Non_abstract_class_0_does_not_implement_all_abstract_members_of_1_18052", "Non-abstract class '{0}' does not implement all abstract members of '{1}'")
 };
 
 // src/compiler/scanner.ts
@@ -48058,6 +48057,8 @@ function createTypeChecker(host) {
   var resolutionTargets = [];
   var resolutionResults = [];
   var resolutionPropertyNames = [];
+  var resolutionStart = 0;
+  var inVarianceComputation = false;
   var suggestionCount = 0;
   var maximumSuggestionCount = 10;
   var mergedSymbols = [];
@@ -55258,7 +55259,7 @@ function createTypeChecker(host) {
     return true;
   }
   function findResolutionCycleStartIndex(target, propertyName) {
-    for (let i = resolutionTargets.length - 1; i >= 0; i--) {
+    for (let i = resolutionTargets.length - 1; i >= resolutionStart; i--) {
       if (resolutionTargetHasProperty(resolutionTargets[i], resolutionPropertyNames[i])) {
         return -1;
       }
@@ -66230,40 +66231,31 @@ function createTypeChecker(host) {
     return getPropertiesOfType(type).filter((targetProp) => containsMissingType(getTypeOfSymbol(targetProp)));
   }
   function getBestMatchingType(source, target, isRelatedTo = compareTypesAssignable) {
-    return findMatchingDiscriminantType(
-      source,
-      target,
-      isRelatedTo,
-      /*skipPartial*/
-      true
-    ) || findMatchingTypeReferenceOrTypeAliasReference(source, target) || findBestTypeForObjectLiteral(source, target) || findBestTypeForInvokable(source, target) || findMostOverlappyType(source, target);
+    return findMatchingDiscriminantType(source, target, isRelatedTo) || findMatchingTypeReferenceOrTypeAliasReference(source, target) || findBestTypeForObjectLiteral(source, target) || findBestTypeForInvokable(source, target) || findMostOverlappyType(source, target);
   }
-  function discriminateTypeByDiscriminableItems(target, discriminators, related, defaultValue, skipPartial) {
-    const discriminable = target.types.map((_) => void 0);
+  function discriminateTypeByDiscriminableItems(target, discriminators, related) {
+    const types = target.types;
+    const include = types.map((t) => t.flags & 402784252 /* Primitive */ ? 0 /* False */ : -1 /* True */);
     for (const [getDiscriminatingType, propertyName] of discriminators) {
-      const targetProp = getUnionOrIntersectionProperty(target, propertyName);
-      if (skipPartial && targetProp && getCheckFlags(targetProp) & 16 /* ReadPartial */) {
-        continue;
+      let matched = false;
+      for (let i = 0; i < types.length; i++) {
+        if (include[i]) {
+          const targetType = getTypeOfPropertyOfType(types[i], propertyName);
+          if (targetType && related(getDiscriminatingType(), targetType)) {
+            matched = true;
+          } else {
+            include[i] = 3 /* Maybe */;
+          }
+        }
       }
-      let i = 0;
-      for (const type of target.types) {
-        const targetType = getTypeOfPropertyOfType(type, propertyName);
-        if (targetType && related(getDiscriminatingType(), targetType)) {
-          discriminable[i] = discriminable[i] === void 0 ? true : discriminable[i];
-        } else {
-          discriminable[i] = false;
+      for (let i = 0; i < types.length; i++) {
+        if (include[i] === 3 /* Maybe */) {
+          include[i] = matched ? 0 /* False */ : -1 /* True */;
         }
-        i++;
       }
     }
-    const match = discriminable.indexOf(
-      /*searchElement*/
-      true
-    );
-    if (match === -1) {
-      return defaultValue;
-    }
-    return getUnionType(target.types.filter((_, index) => discriminable[index]));
+    const filtered = contains(include, 0 /* False */) ? getUnionType(types.filter((_, i) => include[i])) : target;
+    return filtered.flags & 131072 /* Never */ ? target : filtered;
   }
   function isWeakType(type) {
     if (type.flags & 524288 /* Object */) {
@@ -66294,6 +66286,11 @@ function createTypeChecker(host) {
     const links = getSymbolLinks(symbol);
     if (!links.variances) {
       (_a2 = tracing) == null ? void 0 : _a2.push(tracing.Phase.CheckTypes, "getVariancesWorker", { arity: typeParameters.length, id: getTypeId(getDeclaredTypeOfSymbol(symbol)) });
+      const oldVarianceComputation = inVarianceComputation;
+      if (!inVarianceComputation) {
+        inVarianceComputation = true;
+        resolutionStart = resolutionTargets.length;
+      }
       links.variances = emptyArray;
       const variances = [];
       for (const tp of typeParameters) {
@@ -66322,6 +66319,10 @@ function createTypeChecker(host) {
         }
         variances.push(variance);
       }
+      if (!oldVarianceComputation) {
+        inVarianceComputation = false;
+        resolutionStart = 0;
+      }
       links.variances = variances;
       (_b = tracing) == null ? void 0 : _b.pop({ variances: variances.map(Debug.formatVariance) });
     }
@@ -71558,8 +71559,7 @@ function createTypeChecker(host) {
           (s) => [() => undefinedType, s.escapedName]
         )
       ),
-      isTypeAssignableTo,
-      contextualType
+      isTypeAssignableTo
     );
   }
   function discriminateContextualTypeByJSXAttributes(node, contextualType) {
@@ -71578,8 +71578,7 @@ function createTypeChecker(host) {
           (s) => [() => undefinedType, s.escapedName]
         )
       ),
-      isTypeAssignableTo,
-      contextualType
+      isTypeAssignableTo
     );
   }
   function getApparentTypeOfContextualType(node, contextFlags) {
@@ -72819,12 +72818,6 @@ function createTypeChecker(host) {
       return getUnionType([jsxElementType, nullType]);
     }
   }
-  function getJsxElementTypeTypeAt(location) {
-    const type = getJsxType(JsxNames.ElementType, location);
-    if (isErrorType(type))
-      return void 0;
-    return type;
-  }
   function getJsxIntrinsicTagNamesAt(location) {
     const intrinsics = getJsxType(JsxNames.IntrinsicElements, location);
     return intrinsics ? getPropertiesOfType(intrinsics) : emptyArray;
@@ -72887,24 +72880,7 @@ function createTypeChecker(host) {
       const jsxOpeningLikeNode = node;
       const sig = getResolvedSignature(jsxOpeningLikeNode);
       checkDeprecatedSignature(sig, node);
-      const elementTypeConstraint = getJsxElementTypeTypeAt(jsxOpeningLikeNode);
-      if (elementTypeConstraint !== void 0) {
-        const tagType = isJsxIntrinsicIdentifier(jsxOpeningLikeNode.tagName) ? (
-          // TODO: Should this be a literal that library authors could potentially check against?
-          stringType
-        ) : getApparentType(checkExpression(jsxOpeningLikeNode.tagName));
-        checkTypeRelatedTo(tagType, elementTypeConstraint, assignableRelation, jsxOpeningLikeNode.tagName, Diagnostics.Its_type_0_is_not_a_valid_JSX_element_type, () => {
-          const componentName = getTextOfNode(jsxOpeningLikeNode.tagName);
-          return chainDiagnosticMessages(
-            /*details*/
-            void 0,
-            Diagnostics._0_cannot_be_used_as_a_JSX_component,
-            componentName
-          );
-        });
-      } else {
-        checkJsxReturnAssignableToAppropriateBound(getJsxReferenceKind(jsxOpeningLikeNode), getReturnTypeOfSignature(sig), jsxOpeningLikeNode);
-      }
+      checkJsxReturnAssignableToAppropriateBound(getJsxReferenceKind(jsxOpeningLikeNode), getReturnTypeOfSignature(sig), jsxOpeningLikeNode);
     }
   }
   function isKnownProperty(targetType, name, isComparingJsxAttributes) {
@@ -87616,7 +87592,7 @@ function createTypeChecker(host) {
     }
     return type;
   }
-  function findMatchingDiscriminantType(source, target, isRelatedTo, skipPartial) {
+  function findMatchingDiscriminantType(source, target, isRelatedTo) {
     if (target.flags & 1048576 /* Union */ && source.flags & (2097152 /* Intersection */ | 524288 /* Object */)) {
       const match = getMatchingUnionConstituentForType(target, source);
       if (match) {
@@ -87626,14 +87602,10 @@ function createTypeChecker(host) {
       if (sourceProperties) {
         const sourcePropertiesFiltered = findDiscriminantProperties(sourceProperties, target);
         if (sourcePropertiesFiltered) {
-          return discriminateTypeByDiscriminableItems(
-            target,
-            map(sourcePropertiesFiltered, (p) => [() => getTypeOfSymbol(p), p.escapedName]),
-            isRelatedTo,
-            /*defaultValue*/
-            void 0,
-            skipPartial
-          );
+          const discriminated = discriminateTypeByDiscriminableItems(target, map(sourcePropertiesFiltered, (p) => [() => getTypeOfSymbol(p), p.escapedName]), isRelatedTo);
+          if (discriminated !== target) {
+            return discriminated;
+          }
         }
       }
     }
@@ -87667,7 +87639,6 @@ var JsxNames;
   JsxNames2.ElementAttributesPropertyNameContainer = "ElementAttributesProperty";
   JsxNames2.ElementChildrenAttributeNameContainer = "ElementChildrenAttribute";
   JsxNames2.Element = "Element";
-  JsxNames2.ElementType = "ElementType";
   JsxNames2.IntrinsicAttributes = "IntrinsicAttributes";
   JsxNames2.IntrinsicClassAttributes = "IntrinsicClassAttributes";
   JsxNames2.LibraryManagedAttributes = "LibraryManagedAttributes";
@@ -156299,6 +156270,7 @@ function getReferenceAtPosition(sourceFile, position, program) {
   return void 0;
 }
 function getTypeDefinitionAtPosition(typeChecker, sourceFile, position) {
+  var _a2;
   const node = getTouchingPropertyName(sourceFile, position);
   if (node === sourceFile) {
     return void 0;
@@ -156323,8 +156295,9 @@ function getTypeDefinitionAtPosition(typeChecker, sourceFile, position) {
   const typeAtLocation = typeChecker.getTypeOfSymbolAtLocation(symbol, node);
   const returnType = tryGetReturnTypeOfFunction(symbol, typeAtLocation, typeChecker);
   const fromReturnType = returnType && definitionFromType(returnType, typeChecker, node, failedAliasResolution);
-  const typeDefinitions = fromReturnType && fromReturnType.length !== 0 ? fromReturnType : definitionFromType(typeAtLocation, typeChecker, node, failedAliasResolution);
-  return typeDefinitions.length ? typeDefinitions : !(symbol.flags & 111551 /* Value */) && symbol.flags & 788968 /* Type */ ? getDefinitionFromSymbol(typeChecker, skipAlias(symbol, typeChecker), node, failedAliasResolution) : void 0;
+  const [resolvedType, typeDefinitions] = fromReturnType && fromReturnType.length !== 0 ? [returnType, fromReturnType] : [typeAtLocation, definitionFromType(typeAtLocation, typeChecker, node, failedAliasResolution)];
+  const singleTypeArgumentDefinition = !!(getObjectFlags(resolvedType) & 4 /* Reference */) && ((_a2 = resolvedType.resolvedTypeArguments) == null ? void 0 : _a2.length) === 1 ? definitionFromType(resolvedType.resolvedTypeArguments[0], typeChecker, node, failedAliasResolution) : [];
+  return typeDefinitions.length ? [...singleTypeArgumentDefinition, ...typeDefinitions] : !(symbol.flags & 111551 /* Value */) && symbol.flags & 788968 /* Type */ ? getDefinitionFromSymbol(typeChecker, skipAlias(symbol, typeChecker), node, failedAliasResolution) : void 0;
 }
 function definitionFromType(type, checker, node, failedAliasResolution) {
   return flatMap(type.isUnion() && !(type.flags & 32 /* Enum */) ? type.types : [type], (t) => t.symbol && getDefinitionFromSymbol(checker, t.symbol, node, failedAliasResolution));

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-insiders.20230411`;
+      version = `${versionMajorMinor}.0-insiders.20230412`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -9058,8 +9058,7 @@ ${lanes.join("\n")}
         _0_is_possibly_null_or_undefined: diag(18049, 1 /* Error */, "_0_is_possibly_null_or_undefined_18049", "'{0}' is possibly 'null' or 'undefined'."),
         The_value_0_cannot_be_used_here: diag(18050, 1 /* Error */, "The_value_0_cannot_be_used_here_18050", "The value '{0}' cannot be used here."),
         Compiler_option_0_cannot_be_given_an_empty_string: diag(18051, 1 /* Error */, "Compiler_option_0_cannot_be_given_an_empty_string_18051", "Compiler option '{0}' cannot be given an empty string."),
-        Non_abstract_class_0_does_not_implement_all_abstract_members_of_1: diag(18052, 1 /* Error */, "Non_abstract_class_0_does_not_implement_all_abstract_members_of_1_18052", "Non-abstract class '{0}' does not implement all abstract members of '{1}'"),
-        Its_type_0_is_not_a_valid_JSX_element_type: diag(18053, 1 /* Error */, "Its_type_0_is_not_a_valid_JSX_element_type_18053", "Its type '{0}' is not a valid JSX element type.")
+        Non_abstract_class_0_does_not_implement_all_abstract_members_of_1: diag(18052, 1 /* Error */, "Non_abstract_class_0_does_not_implement_all_abstract_members_of_1_18052", "Non-abstract class '{0}' does not implement all abstract members of '{1}'")
       };
     }
   });
@@ -45859,6 +45858,8 @@ ${lanes.join("\n")}
     var resolutionTargets = [];
     var resolutionResults = [];
     var resolutionPropertyNames = [];
+    var resolutionStart = 0;
+    var inVarianceComputation = false;
     var suggestionCount = 0;
     var maximumSuggestionCount = 10;
     var mergedSymbols = [];
@@ -53059,7 +53060,7 @@ ${lanes.join("\n")}
       return true;
     }
     function findResolutionCycleStartIndex(target, propertyName) {
-      for (let i = resolutionTargets.length - 1; i >= 0; i--) {
+      for (let i = resolutionTargets.length - 1; i >= resolutionStart; i--) {
         if (resolutionTargetHasProperty(resolutionTargets[i], resolutionPropertyNames[i])) {
           return -1;
         }
@@ -64031,40 +64032,31 @@ ${lanes.join("\n")}
       return getPropertiesOfType(type).filter((targetProp) => containsMissingType(getTypeOfSymbol(targetProp)));
     }
     function getBestMatchingType(source, target, isRelatedTo = compareTypesAssignable) {
-      return findMatchingDiscriminantType(
-        source,
-        target,
-        isRelatedTo,
-        /*skipPartial*/
-        true
-      ) || findMatchingTypeReferenceOrTypeAliasReference(source, target) || findBestTypeForObjectLiteral(source, target) || findBestTypeForInvokable(source, target) || findMostOverlappyType(source, target);
+      return findMatchingDiscriminantType(source, target, isRelatedTo) || findMatchingTypeReferenceOrTypeAliasReference(source, target) || findBestTypeForObjectLiteral(source, target) || findBestTypeForInvokable(source, target) || findMostOverlappyType(source, target);
     }
-    function discriminateTypeByDiscriminableItems(target, discriminators, related, defaultValue, skipPartial) {
-      const discriminable = target.types.map((_) => void 0);
+    function discriminateTypeByDiscriminableItems(target, discriminators, related) {
+      const types = target.types;
+      const include = types.map((t) => t.flags & 402784252 /* Primitive */ ? 0 /* False */ : -1 /* True */);
       for (const [getDiscriminatingType, propertyName] of discriminators) {
-        const targetProp = getUnionOrIntersectionProperty(target, propertyName);
-        if (skipPartial && targetProp && getCheckFlags(targetProp) & 16 /* ReadPartial */) {
-          continue;
+        let matched = false;
+        for (let i = 0; i < types.length; i++) {
+          if (include[i]) {
+            const targetType = getTypeOfPropertyOfType(types[i], propertyName);
+            if (targetType && related(getDiscriminatingType(), targetType)) {
+              matched = true;
+            } else {
+              include[i] = 3 /* Maybe */;
+            }
+          }
         }
-        let i = 0;
-        for (const type of target.types) {
-          const targetType = getTypeOfPropertyOfType(type, propertyName);
-          if (targetType && related(getDiscriminatingType(), targetType)) {
-            discriminable[i] = discriminable[i] === void 0 ? true : discriminable[i];
-          } else {
-            discriminable[i] = false;
+        for (let i = 0; i < types.length; i++) {
+          if (include[i] === 3 /* Maybe */) {
+            include[i] = matched ? 0 /* False */ : -1 /* True */;
           }
-          i++;
         }
       }
-      const match = discriminable.indexOf(
-        /*searchElement*/
-        true
-      );
-      if (match === -1) {
-        return defaultValue;
-      }
-      return getUnionType(target.types.filter((_, index) => discriminable[index]));
+      const filtered = contains(include, 0 /* False */) ? getUnionType(types.filter((_, i) => include[i])) : target;
+      return filtered.flags & 131072 /* Never */ ? target : filtered;
     }
     function isWeakType(type) {
       if (type.flags & 524288 /* Object */) {
@@ -64095,6 +64087,11 @@ ${lanes.join("\n")}
       const links = getSymbolLinks(symbol);
       if (!links.variances) {
         (_a2 = tracing) == null ? void 0 : _a2.push(tracing.Phase.CheckTypes, "getVariancesWorker", { arity: typeParameters.length, id: getTypeId(getDeclaredTypeOfSymbol(symbol)) });
+        const oldVarianceComputation = inVarianceComputation;
+        if (!inVarianceComputation) {
+          inVarianceComputation = true;
+          resolutionStart = resolutionTargets.length;
+        }
         links.variances = emptyArray;
         const variances = [];
         for (const tp of typeParameters) {
@@ -64123,6 +64120,10 @@ ${lanes.join("\n")}
           }
           variances.push(variance);
         }
+        if (!oldVarianceComputation) {
+          inVarianceComputation = false;
+          resolutionStart = 0;
+        }
         links.variances = variances;
         (_b = tracing) == null ? void 0 : _b.pop({ variances: variances.map(Debug.formatVariance) });
       }
@@ -69359,8 +69360,7 @@ ${lanes.join("\n")}
             (s) => [() => undefinedType, s.escapedName]
           )
         ),
-        isTypeAssignableTo,
-        contextualType
+        isTypeAssignableTo
       );
     }
     function discriminateContextualTypeByJSXAttributes(node, contextualType) {
@@ -69379,8 +69379,7 @@ ${lanes.join("\n")}
             (s) => [() => undefinedType, s.escapedName]
           )
         ),
-        isTypeAssignableTo,
-        contextualType
+        isTypeAssignableTo
       );
     }
     function getApparentTypeOfContextualType(node, contextFlags) {
@@ -70620,12 +70619,6 @@ ${lanes.join("\n")}
         return getUnionType([jsxElementType, nullType]);
       }
     }
-    function getJsxElementTypeTypeAt(location) {
-      const type = getJsxType(JsxNames.ElementType, location);
-      if (isErrorType(type))
-        return void 0;
-      return type;
-    }
     function getJsxIntrinsicTagNamesAt(location) {
       const intrinsics = getJsxType(JsxNames.IntrinsicElements, location);
       return intrinsics ? getPropertiesOfType(intrinsics) : emptyArray;
@@ -70688,24 +70681,7 @@ ${lanes.join("\n")}
         const jsxOpeningLikeNode = node;
         const sig = getResolvedSignature(jsxOpeningLikeNode);
         checkDeprecatedSignature(sig, node);
-        const elementTypeConstraint = getJsxElementTypeTypeAt(jsxOpeningLikeNode);
-        if (elementTypeConstraint !== void 0) {
-          const tagType = isJsxIntrinsicIdentifier(jsxOpeningLikeNode.tagName) ? (
-            // TODO: Should this be a literal that library authors could potentially check against?
-            stringType
-          ) : getApparentType(checkExpression(jsxOpeningLikeNode.tagName));
-          checkTypeRelatedTo(tagType, elementTypeConstraint, assignableRelation, jsxOpeningLikeNode.tagName, Diagnostics.Its_type_0_is_not_a_valid_JSX_element_type, () => {
-            const componentName = getTextOfNode(jsxOpeningLikeNode.tagName);
-            return chainDiagnosticMessages(
-              /*details*/
-              void 0,
-              Diagnostics._0_cannot_be_used_as_a_JSX_component,
-              componentName
-            );
-          });
-        } else {
-          checkJsxReturnAssignableToAppropriateBound(getJsxReferenceKind(jsxOpeningLikeNode), getReturnTypeOfSignature(sig), jsxOpeningLikeNode);
-        }
+        checkJsxReturnAssignableToAppropriateBound(getJsxReferenceKind(jsxOpeningLikeNode), getReturnTypeOfSignature(sig), jsxOpeningLikeNode);
       }
     }
     function isKnownProperty(targetType, name, isComparingJsxAttributes) {
@@ -85417,7 +85393,7 @@ ${lanes.join("\n")}
       }
       return type;
     }
-    function findMatchingDiscriminantType(source, target, isRelatedTo, skipPartial) {
+    function findMatchingDiscriminantType(source, target, isRelatedTo) {
       if (target.flags & 1048576 /* Union */ && source.flags & (2097152 /* Intersection */ | 524288 /* Object */)) {
         const match = getMatchingUnionConstituentForType(target, source);
         if (match) {
@@ -85427,14 +85403,10 @@ ${lanes.join("\n")}
         if (sourceProperties) {
           const sourcePropertiesFiltered = findDiscriminantProperties(sourceProperties, target);
           if (sourcePropertiesFiltered) {
-            return discriminateTypeByDiscriminableItems(
-              target,
-              map(sourcePropertiesFiltered, (p) => [() => getTypeOfSymbol(p), p.escapedName]),
-              isRelatedTo,
-              /*defaultValue*/
-              void 0,
-              skipPartial
-            );
+            const discriminated = discriminateTypeByDiscriminableItems(target, map(sourcePropertiesFiltered, (p) => [() => getTypeOfSymbol(p), p.escapedName]), isRelatedTo);
+            if (discriminated !== target) {
+              return discriminated;
+            }
           }
         }
       }
@@ -85633,7 +85605,6 @@ ${lanes.join("\n")}
         JsxNames2.ElementAttributesPropertyNameContainer = "ElementAttributesProperty";
         JsxNames2.ElementChildrenAttributeNameContainer = "ElementChildrenAttribute";
         JsxNames2.Element = "Element";
-        JsxNames2.ElementType = "ElementType";
         JsxNames2.IntrinsicAttributes = "IntrinsicAttributes";
         JsxNames2.IntrinsicClassAttributes = "IntrinsicClassAttributes";
         JsxNames2.LibraryManagedAttributes = "LibraryManagedAttributes";
@@ -155451,6 +155422,7 @@ ${lanes.join("\n")}
     return void 0;
   }
   function getTypeDefinitionAtPosition(typeChecker, sourceFile, position) {
+    var _a2;
     const node = getTouchingPropertyName(sourceFile, position);
     if (node === sourceFile) {
       return void 0;
@@ -155475,8 +155447,9 @@ ${lanes.join("\n")}
     const typeAtLocation = typeChecker.getTypeOfSymbolAtLocation(symbol, node);
     const returnType = tryGetReturnTypeOfFunction(symbol, typeAtLocation, typeChecker);
     const fromReturnType = returnType && definitionFromType(returnType, typeChecker, node, failedAliasResolution);
-    const typeDefinitions = fromReturnType && fromReturnType.length !== 0 ? fromReturnType : definitionFromType(typeAtLocation, typeChecker, node, failedAliasResolution);
-    return typeDefinitions.length ? typeDefinitions : !(symbol.flags & 111551 /* Value */) && symbol.flags & 788968 /* Type */ ? getDefinitionFromSymbol(typeChecker, skipAlias(symbol, typeChecker), node, failedAliasResolution) : void 0;
+    const [resolvedType, typeDefinitions] = fromReturnType && fromReturnType.length !== 0 ? [returnType, fromReturnType] : [typeAtLocation, definitionFromType(typeAtLocation, typeChecker, node, failedAliasResolution)];
+    const singleTypeArgumentDefinition = !!(getObjectFlags(resolvedType) & 4 /* Reference */) && ((_a2 = resolvedType.resolvedTypeArguments) == null ? void 0 : _a2.length) === 1 ? definitionFromType(resolvedType.resolvedTypeArguments[0], typeChecker, node, failedAliasResolution) : [];
+    return typeDefinitions.length ? [...singleTypeArgumentDefinition, ...typeDefinitions] : !(symbol.flags & 111551 /* Value */) && symbol.flags & 788968 /* Type */ ? getDefinitionFromSymbol(typeChecker, skipAlias(symbol, typeChecker), node, failedAliasResolution) : void 0;
   }
   function definitionFromType(type, checker, node, failedAliasResolution) {
     return flatMap(type.isUnion() && !(type.flags & 32 /* Enum */) ? type.types : [type], (t) => t.symbol && getDefinitionFromSymbol(checker, t.symbol, node, failedAliasResolution));

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-insiders.20230411`;
+      version = `${versionMajorMinor}.0-insiders.20230412`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -9058,8 +9058,7 @@ ${lanes.join("\n")}
         _0_is_possibly_null_or_undefined: diag(18049, 1 /* Error */, "_0_is_possibly_null_or_undefined_18049", "'{0}' is possibly 'null' or 'undefined'."),
         The_value_0_cannot_be_used_here: diag(18050, 1 /* Error */, "The_value_0_cannot_be_used_here_18050", "The value '{0}' cannot be used here."),
         Compiler_option_0_cannot_be_given_an_empty_string: diag(18051, 1 /* Error */, "Compiler_option_0_cannot_be_given_an_empty_string_18051", "Compiler option '{0}' cannot be given an empty string."),
-        Non_abstract_class_0_does_not_implement_all_abstract_members_of_1: diag(18052, 1 /* Error */, "Non_abstract_class_0_does_not_implement_all_abstract_members_of_1_18052", "Non-abstract class '{0}' does not implement all abstract members of '{1}'"),
-        Its_type_0_is_not_a_valid_JSX_element_type: diag(18053, 1 /* Error */, "Its_type_0_is_not_a_valid_JSX_element_type_18053", "Its type '{0}' is not a valid JSX element type.")
+        Non_abstract_class_0_does_not_implement_all_abstract_members_of_1: diag(18052, 1 /* Error */, "Non_abstract_class_0_does_not_implement_all_abstract_members_of_1_18052", "Non-abstract class '{0}' does not implement all abstract members of '{1}'")
       };
     }
   });
@@ -45859,6 +45858,8 @@ ${lanes.join("\n")}
     var resolutionTargets = [];
     var resolutionResults = [];
     var resolutionPropertyNames = [];
+    var resolutionStart = 0;
+    var inVarianceComputation = false;
     var suggestionCount = 0;
     var maximumSuggestionCount = 10;
     var mergedSymbols = [];
@@ -53059,7 +53060,7 @@ ${lanes.join("\n")}
       return true;
     }
     function findResolutionCycleStartIndex(target, propertyName) {
-      for (let i = resolutionTargets.length - 1; i >= 0; i--) {
+      for (let i = resolutionTargets.length - 1; i >= resolutionStart; i--) {
         if (resolutionTargetHasProperty(resolutionTargets[i], resolutionPropertyNames[i])) {
           return -1;
         }
@@ -64031,40 +64032,31 @@ ${lanes.join("\n")}
       return getPropertiesOfType(type).filter((targetProp) => containsMissingType(getTypeOfSymbol(targetProp)));
     }
     function getBestMatchingType(source, target, isRelatedTo = compareTypesAssignable) {
-      return findMatchingDiscriminantType(
-        source,
-        target,
-        isRelatedTo,
-        /*skipPartial*/
-        true
-      ) || findMatchingTypeReferenceOrTypeAliasReference(source, target) || findBestTypeForObjectLiteral(source, target) || findBestTypeForInvokable(source, target) || findMostOverlappyType(source, target);
+      return findMatchingDiscriminantType(source, target, isRelatedTo) || findMatchingTypeReferenceOrTypeAliasReference(source, target) || findBestTypeForObjectLiteral(source, target) || findBestTypeForInvokable(source, target) || findMostOverlappyType(source, target);
     }
-    function discriminateTypeByDiscriminableItems(target, discriminators, related, defaultValue, skipPartial) {
-      const discriminable = target.types.map((_) => void 0);
+    function discriminateTypeByDiscriminableItems(target, discriminators, related) {
+      const types = target.types;
+      const include = types.map((t) => t.flags & 402784252 /* Primitive */ ? 0 /* False */ : -1 /* True */);
       for (const [getDiscriminatingType, propertyName] of discriminators) {
-        const targetProp = getUnionOrIntersectionProperty(target, propertyName);
-        if (skipPartial && targetProp && getCheckFlags(targetProp) & 16 /* ReadPartial */) {
-          continue;
+        let matched = false;
+        for (let i = 0; i < types.length; i++) {
+          if (include[i]) {
+            const targetType = getTypeOfPropertyOfType(types[i], propertyName);
+            if (targetType && related(getDiscriminatingType(), targetType)) {
+              matched = true;
+            } else {
+              include[i] = 3 /* Maybe */;
+            }
+          }
         }
-        let i = 0;
-        for (const type of target.types) {
-          const targetType = getTypeOfPropertyOfType(type, propertyName);
-          if (targetType && related(getDiscriminatingType(), targetType)) {
-            discriminable[i] = discriminable[i] === void 0 ? true : discriminable[i];
-          } else {
-            discriminable[i] = false;
+        for (let i = 0; i < types.length; i++) {
+          if (include[i] === 3 /* Maybe */) {
+            include[i] = matched ? 0 /* False */ : -1 /* True */;
           }
-          i++;
         }
       }
-      const match = discriminable.indexOf(
-        /*searchElement*/
-        true
-      );
-      if (match === -1) {
-        return defaultValue;
-      }
-      return getUnionType(target.types.filter((_, index) => discriminable[index]));
+      const filtered = contains(include, 0 /* False */) ? getUnionType(types.filter((_, i) => include[i])) : target;
+      return filtered.flags & 131072 /* Never */ ? target : filtered;
     }
     function isWeakType(type) {
       if (type.flags & 524288 /* Object */) {
@@ -64095,6 +64087,11 @@ ${lanes.join("\n")}
       const links = getSymbolLinks(symbol);
       if (!links.variances) {
         (_a2 = tracing) == null ? void 0 : _a2.push(tracing.Phase.CheckTypes, "getVariancesWorker", { arity: typeParameters.length, id: getTypeId(getDeclaredTypeOfSymbol(symbol)) });
+        const oldVarianceComputation = inVarianceComputation;
+        if (!inVarianceComputation) {
+          inVarianceComputation = true;
+          resolutionStart = resolutionTargets.length;
+        }
         links.variances = emptyArray;
         const variances = [];
         for (const tp of typeParameters) {
@@ -64123,6 +64120,10 @@ ${lanes.join("\n")}
           }
           variances.push(variance);
         }
+        if (!oldVarianceComputation) {
+          inVarianceComputation = false;
+          resolutionStart = 0;
+        }
         links.variances = variances;
         (_b = tracing) == null ? void 0 : _b.pop({ variances: variances.map(Debug.formatVariance) });
       }
@@ -69359,8 +69360,7 @@ ${lanes.join("\n")}
             (s) => [() => undefinedType, s.escapedName]
           )
         ),
-        isTypeAssignableTo,
-        contextualType
+        isTypeAssignableTo
       );
     }
     function discriminateContextualTypeByJSXAttributes(node, contextualType) {
@@ -69379,8 +69379,7 @@ ${lanes.join("\n")}
             (s) => [() => undefinedType, s.escapedName]
           )
         ),
-        isTypeAssignableTo,
-        contextualType
+        isTypeAssignableTo
       );
     }
     function getApparentTypeOfContextualType(node, contextFlags) {
@@ -70620,12 +70619,6 @@ ${lanes.join("\n")}
         return getUnionType([jsxElementType, nullType]);
       }
     }
-    function getJsxElementTypeTypeAt(location) {
-      const type = getJsxType(JsxNames.ElementType, location);
-      if (isErrorType(type))
-        return void 0;
-      return type;
-    }
     function getJsxIntrinsicTagNamesAt(location) {
       const intrinsics = getJsxType(JsxNames.IntrinsicElements, location);
       return intrinsics ? getPropertiesOfType(intrinsics) : emptyArray;
@@ -70688,24 +70681,7 @@ ${lanes.join("\n")}
         const jsxOpeningLikeNode = node;
         const sig = getResolvedSignature(jsxOpeningLikeNode);
         checkDeprecatedSignature(sig, node);
-        const elementTypeConstraint = getJsxElementTypeTypeAt(jsxOpeningLikeNode);
-        if (elementTypeConstraint !== void 0) {
-          const tagType = isJsxIntrinsicIdentifier(jsxOpeningLikeNode.tagName) ? (
-            // TODO: Should this be a literal that library authors could potentially check against?
-            stringType
-          ) : getApparentType(checkExpression(jsxOpeningLikeNode.tagName));
-          checkTypeRelatedTo(tagType, elementTypeConstraint, assignableRelation, jsxOpeningLikeNode.tagName, Diagnostics.Its_type_0_is_not_a_valid_JSX_element_type, () => {
-            const componentName = getTextOfNode(jsxOpeningLikeNode.tagName);
-            return chainDiagnosticMessages(
-              /*details*/
-              void 0,
-              Diagnostics._0_cannot_be_used_as_a_JSX_component,
-              componentName
-            );
-          });
-        } else {
-          checkJsxReturnAssignableToAppropriateBound(getJsxReferenceKind(jsxOpeningLikeNode), getReturnTypeOfSignature(sig), jsxOpeningLikeNode);
-        }
+        checkJsxReturnAssignableToAppropriateBound(getJsxReferenceKind(jsxOpeningLikeNode), getReturnTypeOfSignature(sig), jsxOpeningLikeNode);
       }
     }
     function isKnownProperty(targetType, name, isComparingJsxAttributes) {
@@ -85417,7 +85393,7 @@ ${lanes.join("\n")}
       }
       return type;
     }
-    function findMatchingDiscriminantType(source, target, isRelatedTo, skipPartial) {
+    function findMatchingDiscriminantType(source, target, isRelatedTo) {
       if (target.flags & 1048576 /* Union */ && source.flags & (2097152 /* Intersection */ | 524288 /* Object */)) {
         const match = getMatchingUnionConstituentForType(target, source);
         if (match) {
@@ -85427,14 +85403,10 @@ ${lanes.join("\n")}
         if (sourceProperties) {
           const sourcePropertiesFiltered = findDiscriminantProperties(sourceProperties, target);
           if (sourcePropertiesFiltered) {
-            return discriminateTypeByDiscriminableItems(
-              target,
-              map(sourcePropertiesFiltered, (p) => [() => getTypeOfSymbol(p), p.escapedName]),
-              isRelatedTo,
-              /*defaultValue*/
-              void 0,
-              skipPartial
-            );
+            const discriminated = discriminateTypeByDiscriminableItems(target, map(sourcePropertiesFiltered, (p) => [() => getTypeOfSymbol(p), p.escapedName]), isRelatedTo);
+            if (discriminated !== target) {
+              return discriminated;
+            }
           }
         }
       }
@@ -85633,7 +85605,6 @@ ${lanes.join("\n")}
         JsxNames2.ElementAttributesPropertyNameContainer = "ElementAttributesProperty";
         JsxNames2.ElementChildrenAttributeNameContainer = "ElementChildrenAttribute";
         JsxNames2.Element = "Element";
-        JsxNames2.ElementType = "ElementType";
         JsxNames2.IntrinsicAttributes = "IntrinsicAttributes";
         JsxNames2.IntrinsicClassAttributes = "IntrinsicClassAttributes";
         JsxNames2.LibraryManagedAttributes = "LibraryManagedAttributes";
@@ -155465,6 +155436,7 @@ ${lanes.join("\n")}
     return void 0;
   }
   function getTypeDefinitionAtPosition(typeChecker, sourceFile, position) {
+    var _a2;
     const node = getTouchingPropertyName(sourceFile, position);
     if (node === sourceFile) {
       return void 0;
@@ -155489,8 +155461,9 @@ ${lanes.join("\n")}
     const typeAtLocation = typeChecker.getTypeOfSymbolAtLocation(symbol, node);
     const returnType = tryGetReturnTypeOfFunction(symbol, typeAtLocation, typeChecker);
     const fromReturnType = returnType && definitionFromType(returnType, typeChecker, node, failedAliasResolution);
-    const typeDefinitions = fromReturnType && fromReturnType.length !== 0 ? fromReturnType : definitionFromType(typeAtLocation, typeChecker, node, failedAliasResolution);
-    return typeDefinitions.length ? typeDefinitions : !(symbol.flags & 111551 /* Value */) && symbol.flags & 788968 /* Type */ ? getDefinitionFromSymbol(typeChecker, skipAlias(symbol, typeChecker), node, failedAliasResolution) : void 0;
+    const [resolvedType, typeDefinitions] = fromReturnType && fromReturnType.length !== 0 ? [returnType, fromReturnType] : [typeAtLocation, definitionFromType(typeAtLocation, typeChecker, node, failedAliasResolution)];
+    const singleTypeArgumentDefinition = !!(getObjectFlags(resolvedType) & 4 /* Reference */) && ((_a2 = resolvedType.resolvedTypeArguments) == null ? void 0 : _a2.length) === 1 ? definitionFromType(resolvedType.resolvedTypeArguments[0], typeChecker, node, failedAliasResolution) : [];
+    return typeDefinitions.length ? [...singleTypeArgumentDefinition, ...typeDefinitions] : !(symbol.flags & 111551 /* Value */) && symbol.flags & 788968 /* Type */ ? getDefinitionFromSymbol(typeChecker, skipAlias(symbol, typeChecker), node, failedAliasResolution) : void 0;
   }
   function definitionFromType(type, checker, node, failedAliasResolution) {
     return flatMap(type.isUnion() && !(type.flags & 32 /* Enum */) ? type.types : [type], (t) => t.symbol && getDefinitionFromSymbol(checker, t.symbol, node, failedAliasResolution));

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.20230411`;
+var version = `${versionMajorMinor}.0-insiders.20230412`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -7121,8 +7121,7 @@ var Diagnostics = {
   _0_is_possibly_null_or_undefined: diag(18049, 1 /* Error */, "_0_is_possibly_null_or_undefined_18049", "'{0}' is possibly 'null' or 'undefined'."),
   The_value_0_cannot_be_used_here: diag(18050, 1 /* Error */, "The_value_0_cannot_be_used_here_18050", "The value '{0}' cannot be used here."),
   Compiler_option_0_cannot_be_given_an_empty_string: diag(18051, 1 /* Error */, "Compiler_option_0_cannot_be_given_an_empty_string_18051", "Compiler option '{0}' cannot be given an empty string."),
-  Non_abstract_class_0_does_not_implement_all_abstract_members_of_1: diag(18052, 1 /* Error */, "Non_abstract_class_0_does_not_implement_all_abstract_members_of_1_18052", "Non-abstract class '{0}' does not implement all abstract members of '{1}'"),
-  Its_type_0_is_not_a_valid_JSX_element_type: diag(18053, 1 /* Error */, "Its_type_0_is_not_a_valid_JSX_element_type_18053", "Its type '{0}' is not a valid JSX element type.")
+  Non_abstract_class_0_does_not_implement_all_abstract_members_of_1: diag(18052, 1 /* Error */, "Non_abstract_class_0_does_not_implement_all_abstract_members_of_1_18052", "Non-abstract class '{0}' does not implement all abstract members of '{1}'")
 };
 
 // src/compiler/scanner.ts
@@ -28888,7 +28887,6 @@ var JsxNames;
   JsxNames2.ElementAttributesPropertyNameContainer = "ElementAttributesProperty";
   JsxNames2.ElementChildrenAttributeNameContainer = "ElementChildrenAttribute";
   JsxNames2.Element = "Element";
-  JsxNames2.ElementType = "ElementType";
   JsxNames2.IntrinsicAttributes = "IntrinsicAttributes";
   JsxNames2.IntrinsicClassAttributes = "IntrinsicClassAttributes";
   JsxNames2.LibraryManagedAttributes = "LibraryManagedAttributes";

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-51328-34",
+  "version": "5.1.0-pr-53729-10",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -114,5 +114,5 @@
     "node": "14.21.1",
     "npm": "8.19.3"
   },
-  "gitHead": "4c0ad0eb588205a6ba5138b2e0b20babfe3896d3"
+  "gitHead": "70986e011d048e97c7e5db3daf0e326977b3a4c3"
 }