@typescript-deploys/pr-build 5.1.0-pr-53739-12 → 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 = [];
@@ -42568,7 +42568,6 @@ function isInstantiatedModule(node, preserveConstEnums) {
   const moduleState = getModuleInstanceState(node);
   return moduleState === 1 /* Instantiated */ || preserveConstEnums && moduleState === 2 /* ConstEnumOnly */;
 }
-var UNION_CROSS_PRODUCT_SIZE_LIMIT = 1e5;
 function createTypeChecker(host) {
   var getPackagesMap = memoize(() => {
     var map2 = /* @__PURE__ */ new Map();
@@ -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;
       }
@@ -51741,12 +51742,7 @@ function createTypeChecker(host) {
     if (!links.type) {
       Debug.assertIsDefined(links.deferralParent);
       Debug.assertIsDefined(links.deferralConstituents);
-      const operation = links.deferralParent.flags & 1048576 /* Union */ ? getUnionType : getIntersectionType;
-      let result = operation(links.deferralConstituents);
-      for (const part of links.deferredMismatchedParts || emptyArray) {
-        result = operation([result, getTypeOfSymbol(part)]);
-      }
-      links.type = result;
+      links.type = links.deferralParent.flags & 1048576 /* Union */ ? getUnionType(links.deferralConstituents) : getIntersectionType(links.deferralConstituents);
     }
     return links.type;
   }
@@ -51754,12 +51750,8 @@ function createTypeChecker(host) {
     const links = getSymbolLinks(symbol);
     if (!links.writeType && links.deferralWriteConstituents) {
       Debug.assertIsDefined(links.deferralParent);
-      const operation = links.deferralParent.flags & 1048576 /* Union */ ? getUnionType : getIntersectionType;
-      let result = operation(links.deferralWriteConstituents);
-      for (const part of links.deferredMismatchedParts || emptyArray) {
-        result = operation([result, getTypeOfSymbol(part)]);
-      }
-      links.writeType = result;
+      Debug.assertIsDefined(links.deferralConstituents);
+      links.writeType = links.deferralParent.flags & 1048576 /* Union */ ? getUnionType(links.deferralWriteConstituents) : getIntersectionType(links.deferralWriteConstituents);
     }
     return links.writeType;
   }
@@ -53796,7 +53788,7 @@ function createTypeChecker(host) {
     return getReducedType(getApparentType(getReducedType(type)));
   }
   function createUnionOrIntersectionProperty(containingType, name, skipObjectFunctionPropertyAugment) {
-    var _a2, _b, _c, _d;
+    var _a2, _b, _c;
     let singleProp;
     let propSet;
     let indexTypes;
@@ -53878,9 +53870,8 @@ function createTypeChecker(host) {
     let declarations;
     let firstType;
     let nameType;
-    let propTypes = [];
+    const propTypes = [];
     let writeTypes;
-    let deferredMismatchedParts;
     let firstValueDeclaration;
     let hasNonUniformValueDeclaration = false;
     for (const prop of props) {
@@ -53890,24 +53881,6 @@ function createTypeChecker(host) {
         hasNonUniformValueDeclaration = true;
       }
       declarations = addRange(declarations, prop.declarations);
-      if (getCheckFlags(prop) & 65536 /* DeferredType */) {
-        checkFlags |= getCheckFlags(prop) & (131072 /* HasNeverType */ | 64 /* HasNonUniformType */ | 128 /* HasLiteralType */);
-        if (!nameType) {
-          nameType = getSymbolLinks(prop).nameType;
-        }
-        if ((((_d = getSymbolLinks(prop).deferralParent) == null ? void 0 : _d.flags) & 3145728 /* UnionOrIntersection */) === (containingType.flags & 3145728 /* UnionOrIntersection */)) {
-          const deferredWriteTypes = getSymbolLinks(prop).deferralWriteConstituents;
-          if (deferredWriteTypes) {
-            writeTypes = concatenate(!writeTypes ? propTypes.slice() : writeTypes, deferredWriteTypes);
-          }
-          propTypes = concatenate(propTypes, getSymbolLinks(prop).deferralConstituents);
-          deferredMismatchedParts = concatenate(deferredMismatchedParts, getSymbolLinks(prop).deferredMismatchedParts);
-          break;
-        } else {
-          deferredMismatchedParts = append(deferredMismatchedParts, prop);
-          break;
-        }
-      }
       const type = getTypeOfSymbol(prop);
       if (!firstType) {
         firstType = type;
@@ -53938,12 +53911,11 @@ function createTypeChecker(host) {
     }
     result.declarations = declarations;
     result.links.nameType = nameType;
-    if (propTypes.length > 2 || deferredMismatchedParts) {
+    if (propTypes.length > 2) {
       result.links.checkFlags |= 65536 /* DeferredType */;
       result.links.deferralParent = containingType;
       result.links.deferralConstituents = propTypes;
       result.links.deferralWriteConstituents = writeTypes;
-      result.links.deferredMismatchedParts = deferredMismatchedParts;
     } else {
       result.links.type = isUnion ? getUnionType(propTypes) : getIntersectionType(propTypes);
       if (writeTypes) {
@@ -56300,7 +56272,7 @@ function createTypeChecker(host) {
   function getIntersectionType(types, aliasSymbol, aliasTypeArguments, noSupertypeReduction) {
     const typeMembershipMap = /* @__PURE__ */ new Map();
     const includes = addTypesToIntersection(typeMembershipMap, 0, types);
-    let typeSet = arrayFrom(typeMembershipMap.values());
+    const typeSet = arrayFrom(typeMembershipMap.values());
     if (includes & 131072 /* Never */) {
       return contains(typeSet, silentNeverType) ? silentNeverType : neverType;
     }
@@ -56332,8 +56304,6 @@ function createTypeChecker(host) {
     const id = getTypeListId(typeSet) + getAliasId(aliasSymbol, aliasTypeArguments);
     let result = intersectionTypes.get(id);
     if (!result) {
-      const originalSet = typeSet;
-      let runningResult;
       if (includes & 1048576 /* Union */) {
         if (intersectUnionsOfPrimitiveTypes(typeSet)) {
           result = getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
@@ -56345,32 +56315,12 @@ function createTypeChecker(host) {
           removeFromEach(typeSet, 65536 /* Null */);
           result = getUnionType([getIntersectionType(typeSet), nullType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
         } else {
-          if (getCrossProductUnionSize(typeSet) >= UNION_CROSS_PRODUCT_SIZE_LIMIT && every(typeSet, (t) => !!(t.flags & 1048576 /* Union */) || !!(t.flags & 402784252 /* Primitive */))) {
-            if (typeSet.length > 2 || some(typeSet, (t) => getReducedType(t) !== t)) {
-              runningResult = getReducedType(typeSet[0]);
-              for (let i = 1; i < typeSet.length; i++) {
-                const reducedElem = getReducedType(typeSet[i]);
-                runningResult = reducedElem.flags & 402784252 /* Primitive */ && everyType(runningResult, (t) => !!(t.flags & 524288 /* Object */)) ? neverType : getReducedType(intersectTypes(runningResult, reducedElem));
-                if (i === typeSet.length - 1 || isTypeAny(runningResult) || runningResult.flags & 131072 /* Never */) {
-                  return runningResult;
-                }
-                if (!(runningResult.flags & 1048576 /* Union */) || runningResult.types.length > typeSet.length) {
-                  typeSet = typeSet.slice(i + 1);
-                  break;
-                }
-              }
-            }
-          }
           if (!checkCrossProductUnion(typeSet)) {
             return errorType;
           }
           const constituents = getCrossProductIntersections(typeSet);
-          if (runningResult && runningResult !== typeSet[0]) {
-            result = getIntersectionType([runningResult, getUnionType(constituents, 1 /* Literal */)], aliasSymbol, aliasTypeArguments);
-          } else {
-            const origin = some(constituents, (t) => !!(t.flags & 2097152 /* Intersection */)) && getConstituentCountOfTypes(constituents) > getConstituentCountOfTypes(typeSet) ? createOriginUnionOrIntersectionType(2097152 /* Intersection */, originalSet) : void 0;
-            result = getUnionType(constituents, 1 /* Literal */, aliasSymbol, aliasTypeArguments, origin);
-          }
+          const origin = some(constituents, (t) => !!(t.flags & 2097152 /* Intersection */)) && getConstituentCountOfTypes(constituents) > getConstituentCountOfTypes(typeSet) ? createOriginUnionOrIntersectionType(2097152 /* Intersection */, typeSet) : void 0;
+          result = getUnionType(constituents, 1 /* Literal */, aliasSymbol, aliasTypeArguments, origin);
         }
       } else {
         result = createIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
@@ -56385,7 +56335,7 @@ function createTypeChecker(host) {
   function checkCrossProductUnion(types) {
     var _a2;
     const size = getCrossProductUnionSize(types);
-    if (size >= UNION_CROSS_PRODUCT_SIZE_LIMIT) {
+    if (size >= 1e5) {
       (_a2 = tracing) == null ? void 0 : _a2.instant(tracing.Phase.CheckTypes, "checkCrossProductUnion_DepthLimit", { typeIds: types.map((t) => t.id), size });
       error(currentNode, Diagnostics.Expression_produces_a_union_type_that_is_too_complex_to_represent);
       return false;
@@ -61631,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 */) {
@@ -61695,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) {
@@ -61723,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) });
     }
@@ -66959,8 +66909,7 @@ function createTypeChecker(host) {
           (s) => [() => undefinedType, s.escapedName]
         )
       ),
-      isTypeAssignableTo,
-      contextualType
+      isTypeAssignableTo
     );
   }
   function discriminateContextualTypeByJSXAttributes(node, contextualType) {
@@ -66979,8 +66928,7 @@ function createTypeChecker(host) {
           (s) => [() => undefinedType, s.escapedName]
         )
       ),
-      isTypeAssignableTo,
-      contextualType
+      isTypeAssignableTo
     );
   }
   function getApparentTypeOfContextualType(node, contextFlags) {
@@ -82994,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) {
@@ -83004,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;
+          }
         }
       }
     }

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";
@@ -47218,7 +47218,6 @@ function isInstantiatedModule(node, preserveConstEnums) {
   const moduleState = getModuleInstanceState(node);
   return moduleState === 1 /* Instantiated */ || preserveConstEnums && moduleState === 2 /* ConstEnumOnly */;
 }
-var UNION_CROSS_PRODUCT_SIZE_LIMIT = 1e5;
 function createTypeChecker(host) {
   var getPackagesMap = memoize(() => {
     var map2 = /* @__PURE__ */ new Map();
@@ -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;
       }
@@ -56391,12 +56392,7 @@ function createTypeChecker(host) {
     if (!links.type) {
       Debug.assertIsDefined(links.deferralParent);
       Debug.assertIsDefined(links.deferralConstituents);
-      const operation = links.deferralParent.flags & 1048576 /* Union */ ? getUnionType : getIntersectionType;
-      let result = operation(links.deferralConstituents);
-      for (const part of links.deferredMismatchedParts || emptyArray) {
-        result = operation([result, getTypeOfSymbol(part)]);
-      }
-      links.type = result;
+      links.type = links.deferralParent.flags & 1048576 /* Union */ ? getUnionType(links.deferralConstituents) : getIntersectionType(links.deferralConstituents);
     }
     return links.type;
   }
@@ -56404,12 +56400,8 @@ function createTypeChecker(host) {
     const links = getSymbolLinks(symbol);
     if (!links.writeType && links.deferralWriteConstituents) {
       Debug.assertIsDefined(links.deferralParent);
-      const operation = links.deferralParent.flags & 1048576 /* Union */ ? getUnionType : getIntersectionType;
-      let result = operation(links.deferralWriteConstituents);
-      for (const part of links.deferredMismatchedParts || emptyArray) {
-        result = operation([result, getTypeOfSymbol(part)]);
-      }
-      links.writeType = result;
+      Debug.assertIsDefined(links.deferralConstituents);
+      links.writeType = links.deferralParent.flags & 1048576 /* Union */ ? getUnionType(links.deferralWriteConstituents) : getIntersectionType(links.deferralWriteConstituents);
     }
     return links.writeType;
   }
@@ -58446,7 +58438,7 @@ function createTypeChecker(host) {
     return getReducedType(getApparentType(getReducedType(type)));
   }
   function createUnionOrIntersectionProperty(containingType, name, skipObjectFunctionPropertyAugment) {
-    var _a2, _b, _c, _d;
+    var _a2, _b, _c;
     let singleProp;
     let propSet;
     let indexTypes;
@@ -58528,9 +58520,8 @@ function createTypeChecker(host) {
     let declarations;
     let firstType;
     let nameType;
-    let propTypes = [];
+    const propTypes = [];
     let writeTypes;
-    let deferredMismatchedParts;
     let firstValueDeclaration;
     let hasNonUniformValueDeclaration = false;
     for (const prop of props) {
@@ -58540,24 +58531,6 @@ function createTypeChecker(host) {
         hasNonUniformValueDeclaration = true;
       }
       declarations = addRange(declarations, prop.declarations);
-      if (getCheckFlags(prop) & 65536 /* DeferredType */) {
-        checkFlags |= getCheckFlags(prop) & (131072 /* HasNeverType */ | 64 /* HasNonUniformType */ | 128 /* HasLiteralType */);
-        if (!nameType) {
-          nameType = getSymbolLinks(prop).nameType;
-        }
-        if ((((_d = getSymbolLinks(prop).deferralParent) == null ? void 0 : _d.flags) & 3145728 /* UnionOrIntersection */) === (containingType.flags & 3145728 /* UnionOrIntersection */)) {
-          const deferredWriteTypes = getSymbolLinks(prop).deferralWriteConstituents;
-          if (deferredWriteTypes) {
-            writeTypes = concatenate(!writeTypes ? propTypes.slice() : writeTypes, deferredWriteTypes);
-          }
-          propTypes = concatenate(propTypes, getSymbolLinks(prop).deferralConstituents);
-          deferredMismatchedParts = concatenate(deferredMismatchedParts, getSymbolLinks(prop).deferredMismatchedParts);
-          break;
-        } else {
-          deferredMismatchedParts = append(deferredMismatchedParts, prop);
-          break;
-        }
-      }
       const type = getTypeOfSymbol(prop);
       if (!firstType) {
         firstType = type;
@@ -58588,12 +58561,11 @@ function createTypeChecker(host) {
     }
     result.declarations = declarations;
     result.links.nameType = nameType;
-    if (propTypes.length > 2 || deferredMismatchedParts) {
+    if (propTypes.length > 2) {
       result.links.checkFlags |= 65536 /* DeferredType */;
       result.links.deferralParent = containingType;
       result.links.deferralConstituents = propTypes;
       result.links.deferralWriteConstituents = writeTypes;
-      result.links.deferredMismatchedParts = deferredMismatchedParts;
     } else {
       result.links.type = isUnion ? getUnionType(propTypes) : getIntersectionType(propTypes);
       if (writeTypes) {
@@ -60950,7 +60922,7 @@ function createTypeChecker(host) {
   function getIntersectionType(types, aliasSymbol, aliasTypeArguments, noSupertypeReduction) {
     const typeMembershipMap = /* @__PURE__ */ new Map();
     const includes = addTypesToIntersection(typeMembershipMap, 0, types);
-    let typeSet = arrayFrom(typeMembershipMap.values());
+    const typeSet = arrayFrom(typeMembershipMap.values());
     if (includes & 131072 /* Never */) {
       return contains(typeSet, silentNeverType) ? silentNeverType : neverType;
     }
@@ -60982,8 +60954,6 @@ function createTypeChecker(host) {
     const id = getTypeListId(typeSet) + getAliasId(aliasSymbol, aliasTypeArguments);
     let result = intersectionTypes.get(id);
     if (!result) {
-      const originalSet = typeSet;
-      let runningResult;
       if (includes & 1048576 /* Union */) {
         if (intersectUnionsOfPrimitiveTypes(typeSet)) {
           result = getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
@@ -60995,32 +60965,12 @@ function createTypeChecker(host) {
           removeFromEach(typeSet, 65536 /* Null */);
           result = getUnionType([getIntersectionType(typeSet), nullType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
         } else {
-          if (getCrossProductUnionSize(typeSet) >= UNION_CROSS_PRODUCT_SIZE_LIMIT && every(typeSet, (t) => !!(t.flags & 1048576 /* Union */) || !!(t.flags & 402784252 /* Primitive */))) {
-            if (typeSet.length > 2 || some(typeSet, (t) => getReducedType(t) !== t)) {
-              runningResult = getReducedType(typeSet[0]);
-              for (let i = 1; i < typeSet.length; i++) {
-                const reducedElem = getReducedType(typeSet[i]);
-                runningResult = reducedElem.flags & 402784252 /* Primitive */ && everyType(runningResult, (t) => !!(t.flags & 524288 /* Object */)) ? neverType : getReducedType(intersectTypes(runningResult, reducedElem));
-                if (i === typeSet.length - 1 || isTypeAny(runningResult) || runningResult.flags & 131072 /* Never */) {
-                  return runningResult;
-                }
-                if (!(runningResult.flags & 1048576 /* Union */) || runningResult.types.length > typeSet.length) {
-                  typeSet = typeSet.slice(i + 1);
-                  break;
-                }
-              }
-            }
-          }
           if (!checkCrossProductUnion(typeSet)) {
             return errorType;
           }
           const constituents = getCrossProductIntersections(typeSet);
-          if (runningResult && runningResult !== typeSet[0]) {
-            result = getIntersectionType([runningResult, getUnionType(constituents, 1 /* Literal */)], aliasSymbol, aliasTypeArguments);
-          } else {
-            const origin = some(constituents, (t) => !!(t.flags & 2097152 /* Intersection */)) && getConstituentCountOfTypes(constituents) > getConstituentCountOfTypes(typeSet) ? createOriginUnionOrIntersectionType(2097152 /* Intersection */, originalSet) : void 0;
-            result = getUnionType(constituents, 1 /* Literal */, aliasSymbol, aliasTypeArguments, origin);
-          }
+          const origin = some(constituents, (t) => !!(t.flags & 2097152 /* Intersection */)) && getConstituentCountOfTypes(constituents) > getConstituentCountOfTypes(typeSet) ? createOriginUnionOrIntersectionType(2097152 /* Intersection */, typeSet) : void 0;
+          result = getUnionType(constituents, 1 /* Literal */, aliasSymbol, aliasTypeArguments, origin);
         }
       } else {
         result = createIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
@@ -61035,7 +60985,7 @@ function createTypeChecker(host) {
   function checkCrossProductUnion(types) {
     var _a2;
     const size = getCrossProductUnionSize(types);
-    if (size >= UNION_CROSS_PRODUCT_SIZE_LIMIT) {
+    if (size >= 1e5) {
       (_a2 = tracing) == null ? void 0 : _a2.instant(tracing.Phase.CheckTypes, "checkCrossProductUnion_DepthLimit", { typeIds: types.map((t) => t.id), size });
       error(currentNode, Diagnostics.Expression_produces_a_union_type_that_is_too_complex_to_represent);
       return false;
@@ -66281,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 */) {
@@ -66345,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) {
@@ -66373,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) });
     }
@@ -71609,8 +71559,7 @@ function createTypeChecker(host) {
           (s) => [() => undefinedType, s.escapedName]
         )
       ),
-      isTypeAssignableTo,
-      contextualType
+      isTypeAssignableTo
     );
   }
   function discriminateContextualTypeByJSXAttributes(node, contextualType) {
@@ -71629,8 +71578,7 @@ function createTypeChecker(host) {
           (s) => [() => undefinedType, s.escapedName]
         )
       ),
-      isTypeAssignableTo,
-      contextualType
+      isTypeAssignableTo
     );
   }
   function getApparentTypeOfContextualType(node, contextFlags) {
@@ -87644,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) {
@@ -87654,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;
+          }
         }
       }
     }
@@ -156326,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;
@@ -156350,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));