@typescript-deploys/pr-build 6.0.0-pr-53017-20 → 6.0.0-pr-54029-2

package/lib/_tsc.js

@@ -17397,15 +17397,16 @@ function getCheckFlags(symbol) {
   return symbol.flags & 33554432 /* Transient */ ? symbol.links.checkFlags : 0;
 }
 function getDeclarationModifierFlagsFromSymbol(s, isWrite = false) {
-  if (s.valueDeclaration) {
+  const checkFlags = getCheckFlags(s);
+  if (!(checkFlags & 8192 /* ReverseMapped */) && s.valueDeclaration) {
     const declaration = isWrite && s.declarations && find(s.declarations, isSetAccessorDeclaration) || s.flags & 32768 /* GetAccessor */ && find(s.declarations, isGetAccessorDeclaration) || s.valueDeclaration;
     const flags = getCombinedModifierFlags(declaration);
     return s.parent && s.parent.flags & 32 /* Class */ ? flags : flags & ~7 /* AccessibilityModifier */;
   }
-  if (getCheckFlags(s) & 6 /* Synthetic */) {
-    const checkFlags = s.links.checkFlags;
-    const accessModifier = checkFlags & 1024 /* ContainsPrivate */ ? 2 /* Private */ : checkFlags & 256 /* ContainsPublic */ ? 1 /* Public */ : 4 /* Protected */;
-    const staticModifier = checkFlags & 2048 /* ContainsStatic */ ? 256 /* Static */ : 0;
+  if (checkFlags & 6 /* Synthetic */) {
+    const checkFlags2 = s.links.checkFlags;
+    const accessModifier = checkFlags2 & 1024 /* ContainsPrivate */ ? 2 /* Private */ : checkFlags2 & 256 /* ContainsPublic */ ? 1 /* Public */ : 4 /* Protected */;
+    const staticModifier = checkFlags2 & 2048 /* ContainsStatic */ ? 256 /* Static */ : 0;
     return accessModifier | staticModifier;
   }
   if (s.flags & 4194304 /* Prototype */) {
@@ -58284,7 +58285,13 @@ function createTypeChecker(host) {
     const modifiers = getMappedTypeModifiers(type.mappedType);
     const readonlyMask = modifiers & 1 /* IncludeReadonly */ ? false : true;
     const optionalMask = modifiers & 4 /* IncludeOptional */ ? 0 : 16777216 /* Optional */;
-    const indexInfos = indexInfo ? [createIndexInfo(stringType, inferReverseMappedType(indexInfo.type, type.mappedType, type.constraintType) || unknownType, readonlyMask && indexInfo.isReadonly)] : emptyArray;
+    const indexInfos = indexInfo ? [createIndexInfo(stringType, inferReverseMappedType(
+      indexInfo.type,
+      type.mappedType,
+      type.constraintType,
+      /*sourceValueDeclaration*/
+      void 0
+    ) || unknownType, readonlyMask && indexInfo.isReadonly)] : emptyArray;
     const members = createSymbolTable();
     const limitedConstraint = getLimitedConstraint(type);
     for (const prop of getPropertiesOfType(type.source)) {
@@ -58297,6 +58304,7 @@ function createTypeChecker(host) {
       const checkFlags = 8192 /* ReverseMapped */ | (readonlyMask && isReadonlySymbol(prop) ? 8 /* Readonly */ : 0);
       const inferredProp = createSymbol(4 /* Property */ | prop.flags & optionalMask, prop.escapedName, checkFlags);
       inferredProp.declarations = prop.declarations;
+      inferredProp.valueDeclaration = prop.valueDeclaration;
       inferredProp.links.nameType = getSymbolLinks(prop).nameType;
       inferredProp.links.propertyType = getTypeOfSymbol(prop);
       if (type.constraintType.type.flags & 8388608 /* IndexedAccess */ && type.constraintType.type.objectType.flags & 262144 /* TypeParameter */ && type.constraintType.type.indexType.flags & 262144 /* TypeParameter */) {
@@ -68107,7 +68115,10 @@ function createTypeChecker(host) {
       map(context.inferences, (i) => i.typeParameter),
       map(context.inferences, (inference, i) => () => {
         if (!inference.isFixed) {
-          inferFromIntraExpressionSites(context);
+          if (context.intraExpressionInferenceSites) {
+            inferFromIntraExpressionSites(context.inferences, context.intraExpressionInferenceSites);
+            context.intraExpressionInferenceSites = void 0;
+          }
           clearCachedInferences(context.inferences);
           inference.isFixed = true;
         }
@@ -68131,17 +68142,38 @@ function createTypeChecker(host) {
     }
   }
   function addIntraExpressionInferenceSite(context, node, type) {
-    (context.intraExpressionInferenceSites ?? (context.intraExpressionInferenceSites = [])).push({ node, type });
+    const site = { node, type };
+    (context.intraExpressionInferenceSites ?? (context.intraExpressionInferenceSites = [])).push(site);
+    if (context.reverseMappedIntraExpressionInferenceSites) {
+      for (const reverseMappedSites of context.reverseMappedIntraExpressionInferenceSites) {
+        reverseMappedSites.push(site);
+      }
+    }
   }
-  function inferFromIntraExpressionSites(context) {
-    if (context.intraExpressionInferenceSites) {
-      for (const { node, type } of context.intraExpressionInferenceSites) {
-        const contextualType = node.kind === 175 /* MethodDeclaration */ ? getContextualTypeForObjectLiteralMethod(node, 2 /* NoConstraints */) : getContextualType(node, 2 /* NoConstraints */);
-        if (contextualType) {
-          inferTypes(context.inferences, type, contextualType);
+  function pushReverseMappedTypeIntraExpressionInferenceScope(context, node) {
+    (context.reverseMappedIntraExpressionInferenceScopeNodes ?? (context.reverseMappedIntraExpressionInferenceScopeNodes = [])).push(node);
+    (context.reverseMappedIntraExpressionInferenceSites ?? (context.reverseMappedIntraExpressionInferenceSites = [])).push([]);
+  }
+  function popReverseMappedTypeIntraExpressionInferenceScope(context) {
+    context.reverseMappedIntraExpressionInferenceScopeNodes.pop();
+    context.reverseMappedIntraExpressionInferenceSites.pop();
+  }
+  function findReverseMappedTypeIntraExpressionInferenceScope(context, node) {
+    if (context == null ? void 0 : context.reverseMappedIntraExpressionInferenceScopeNodes) {
+      for (let i = context.reverseMappedIntraExpressionInferenceScopeNodes.length - 1; i >= 0; i--) {
+        if (context.reverseMappedIntraExpressionInferenceScopeNodes[i] === node) {
+          return i;
         }
       }
-      context.intraExpressionInferenceSites = void 0;
+    }
+    return -1;
+  }
+  function inferFromIntraExpressionSites(inferences, intraExpressionInferenceSites) {
+    for (const { node, type } of intraExpressionInferenceSites) {
+      const contextualType = node.kind === 175 /* MethodDeclaration */ ? getContextualTypeForObjectLiteralMethod(node, 2 /* NoConstraints */) : getContextualType(node, 2 /* NoConstraints */);
+      if (contextualType) {
+        inferTypes(inferences, type, contextualType);
+      }
     }
   }
   function createInferenceInfo(typeParameter) {
@@ -68153,8 +68185,7 @@ function createTypeChecker(host) {
       priority: void 0,
       topLevel: true,
       isFixed: false,
-      impliedArity: void 0,
-      indexes: void 0
+      impliedArity: void 0
     };
   }
   function cloneInferenceInfo(inference) {
@@ -68166,8 +68197,7 @@ function createTypeChecker(host) {
       priority: inference.priority,
       topLevel: inference.topLevel,
       isFixed: inference.isFixed,
-      impliedArity: inference.impliedArity,
-      indexes: inference.indexes && inference.indexes.slice()
+      impliedArity: inference.impliedArity
     };
   }
   function cloneInferredPartOfContext(context) {
@@ -68241,22 +68271,31 @@ function createTypeChecker(host) {
     reverseHomomorphicMappedCache.set(cacheKey, type);
     return type;
   }
-  function isPartiallyInferableType(type) {
-    return !(getObjectFlags(type) & 262144 /* NonInferrableType */) || isObjectLiteralType(type) && some(getPropertiesOfType(type), (prop) => isPartiallyInferableType(getTypeOfSymbol(prop))) || isTupleType(type) && some(getElementTypes(type), isPartiallyInferableType);
-  }
   function createReverseMappedType(source, target, constraint) {
-    if (!(getIndexInfoOfType(source, stringType) || getPropertiesOfType(source).length !== 0 && isPartiallyInferableType(source))) {
+    if (!getIndexInfoOfType(source, stringType) && !getPropertiesOfType(source).length) {
       return void 0;
     }
     if (isArrayType(source)) {
-      const elementType = inferReverseMappedType(getTypeArguments(source)[0], target, constraint);
+      const elementType = inferReverseMappedType(
+        getTypeArguments(source)[0],
+        target,
+        constraint,
+        /*sourceValueDeclaration*/
+        void 0
+      );
       if (!elementType) {
         return void 0;
       }
       return createArrayType(elementType, isReadonlyArrayType(source));
     }
     if (isTupleType(source)) {
-      const elementTypes = map(getElementTypes(source), (t) => inferReverseMappedType(t, target, constraint));
+      const elementTypes = map(getElementTypes(source), (t) => inferReverseMappedType(
+        t,
+        target,
+        constraint,
+        /*sourceValueDeclaration*/
+        void 0
+      ));
       if (!every(elementTypes, (t) => !!t)) {
         return void 0;
       }
@@ -68276,19 +68315,39 @@ function createTypeChecker(host) {
   function getTypeOfReverseMappedSymbol(symbol) {
     const links = getSymbolLinks(symbol);
     if (!links.type) {
-      links.type = inferReverseMappedType(symbol.links.propertyType, symbol.links.mappedType, symbol.links.constraintType) || unknownType;
+      links.type = inferReverseMappedType(symbol.links.propertyType, symbol.links.mappedType, symbol.links.constraintType, symbol.valueDeclaration) || unknownType;
     }
     return links.type;
   }
-  function inferReverseMappedTypeWorker(sourceType, target, constraint) {
+  function inferReverseMappedTypeWorker(sourceType, target, constraint, sourceValueDeclaration) {
     const typeParameter = getIndexedAccessType(constraint.type, getTypeParameterFromMappedType(target));
     const templateType = getTemplateTypeFromMappedType(target);
     const inference = createInferenceInfo(typeParameter);
     inferTypes([inference], sourceType, templateType);
-    return getTypeFromInference(inference) || (inference.indexes ? getIntersectionType(inference.indexes) : unknownType);
+    if (sourceValueDeclaration && getObjectFlags(sourceType) & 262144 /* NonInferrableType */) {
+      const scopeNode = sourceValueDeclaration.parent;
+      const inferenceContext = getInferenceContext(scopeNode);
+      const index = findReverseMappedTypeIntraExpressionInferenceScope(inferenceContext, scopeNode);
+      if (index !== -1) {
+        Debug.assert(inferenceContext);
+        const intraExpressionSites = inferenceContext.reverseMappedIntraExpressionInferenceSites[index];
+        const recordSymbol = getGlobalRecordSymbol();
+        if (intraExpressionSites.length && recordSymbol) {
+          pushContextualType(
+            scopeNode,
+            getTypeAliasInstantiation(recordSymbol, [stringNumberSymbolType, templateType]),
+            /*isCache*/
+            false
+          );
+          inferFromIntraExpressionSites([inference], intraExpressionSites);
+          popContextualType();
+        }
+      }
+    }
+    return getTypeFromInference(inference) || unknownType;
   }
-  function inferReverseMappedType(source, target, constraint) {
-    const cacheKey = source.id + "," + target.id + "," + constraint.id;
+  function inferReverseMappedType(source, target, constraint, sourceValueDeclaration) {
+    const cacheKey = source.id + "," + target.id + "," + constraint.id + (sourceValueDeclaration && getObjectFlags(source) & 262144 /* NonInferrableType */ ? "," + getNodeId(sourceValueDeclaration) : "");
     if (reverseMappedCache.has(cacheKey)) {
       return reverseMappedCache.get(cacheKey) || unknownType;
     }
@@ -68299,7 +68358,7 @@ function createTypeChecker(host) {
     if (isDeeplyNestedType(target, reverseMappedTargetStack, reverseMappedTargetStack.length, 2)) reverseExpandingFlags |= 2 /* Target */;
     let type;
     if (reverseExpandingFlags !== 3 /* Both */) {
-      type = inferReverseMappedTypeWorker(source, target, constraint);
+      type = inferReverseMappedTypeWorker(source, target, constraint, sourceValueDeclaration);
     }
     reverseMappedSourceStack.pop();
     reverseMappedTargetStack.pop();
@@ -68626,24 +68685,6 @@ function createTypeChecker(host) {
       } else if (source.flags & 8388608 /* IndexedAccess */ && target.flags & 8388608 /* IndexedAccess */) {
         inferFromTypes(source.objectType, target.objectType);
         inferFromTypes(source.indexType, target.indexType);
-      } else if (!(priority & 1 /* NakedTypeVariable */) && target.flags & 8388608 /* IndexedAccess */) {
-        if (isFromInferenceBlockedSource(source)) {
-          return;
-        }
-        const inference = getInferenceInfoForType(getActualTypeVariable(target.objectType));
-        if (inference) {
-          if (getObjectFlags(source) & 262144 /* NonInferrableType */ || source === nonInferrableAnyType) {
-            return;
-          }
-          if (!inference.isFixed) {
-            const inferenceTypeSymbol = getGlobalSymbol("PartialInference", 788968 /* Type */, Diagnostics.Cannot_find_global_type_0);
-            const inferenceType = inferenceTypeSymbol && getDeclaredTypeOfSymbol(inferenceTypeSymbol);
-            if (inferenceType && inferenceType !== unknownType) {
-              const mapper = createTypeMapper(getSymbolLinks(inferenceTypeSymbol).typeParameters, [source, target.indexType]);
-              inference.indexes = append(inference.indexes, instantiateType(inferenceType, mapper));
-            }
-          }
-        }
       } else if (source.flags & 268435456 /* StringMapping */ && target.flags & 268435456 /* StringMapping */) {
         if (source.symbol === target.symbol) {
           inferFromTypes(source.type, target.type);
@@ -68837,7 +68878,7 @@ function createTypeChecker(host) {
       }
     }
     function inferToMappedType(source, target, constraintType) {
-      if (constraintType.flags & 1048576 /* Union */ || constraintType.flags & 2097152 /* Intersection */) {
+      if (constraintType.flags & 3145728 /* UnionOrIntersection */) {
         let result = false;
         for (const type of constraintType.types) {
           result = inferToMappedType(source, target, type) || result;
@@ -69147,51 +69188,6 @@ function createTypeChecker(host) {
           const preferCovariantType = inferredCovariantType && (!inferredContravariantType || !(inferredCovariantType.flags & (131072 /* Never */ | 1 /* Any */)) && some(inference.contraCandidates, (t) => isTypeAssignableTo(inferredCovariantType, t)) && every(context.inferences, (other) => other !== inference && getConstraintOfTypeParameter(other.typeParameter) !== inference.typeParameter || every(other.candidates, (t) => isTypeAssignableTo(t, inferredCovariantType))));
           inferredType = preferCovariantType ? inferredCovariantType : inferredContravariantType;
           fallbackType = preferCovariantType ? inferredContravariantType : inferredCovariantType;
-        } else if (inference.indexes) {
-          let aggregateInference = getIntersectionType(inference.indexes);
-          const constraint2 = getConstraintOfTypeParameter(inference.typeParameter);
-          if (constraint2) {
-            const instantiatedConstraint = instantiateType(constraint2, context.nonFixingMapper);
-            if (instantiatedConstraint.flags & 1048576 /* Union */ && !context.compareTypes(aggregateInference, getTypeWithThisArgument(instantiatedConstraint, aggregateInference))) {
-              const discriminantProps = findDiscriminantProperties(getPropertiesOfType(aggregateInference), instantiatedConstraint);
-              if (discriminantProps) {
-                let match;
-                findDiscriminant:
-                  for (const p of discriminantProps) {
-                    const candidatePropType = getTypeOfPropertyOfType(aggregateInference, p.escapedName);
-                    for (const type of instantiatedConstraint.types) {
-                      const propType = getTypeOfPropertyOfType(type, p.escapedName);
-                      if (propType && candidatePropType && checkTypeAssignableTo(
-                        candidatePropType,
-                        propType,
-                        /*errorNode*/
-                        void 0
-                      )) {
-                        if (match && match !== type) {
-                          match = void 0;
-                          break findDiscriminant;
-                        } else {
-                          match = type;
-                        }
-                      }
-                    }
-                  }
-                if (match) {
-                  aggregateInference = getSpreadType(
-                    match,
-                    aggregateInference,
-                    /*symbol*/
-                    void 0,
-                    /*propegatedFlags*/
-                    0,
-                    /*readonly*/
-                    false
-                  );
-                }
-              }
-            }
-          }
-          inferredType = aggregateInference;
         } else if (context.flags & 1 /* NoDefault */) {
           inferredType = silentNeverType;
         } else {
@@ -74046,17 +74042,25 @@ function createTypeChecker(host) {
         checkComputedPropertyName(elem.name);
       }
     }
+    const intraExpressionInferenceContext = contextualType && checkMode & 2 /* Inferential */ && !(checkMode & 4 /* SkipContextSensitive */) ? getInferenceContext(node) : void 0;
     let offset = 0;
     for (const memberDecl of node.properties) {
       let member = getSymbolOfDeclaration(memberDecl);
       const computedNameType = memberDecl.name && memberDecl.name.kind === 168 /* ComputedPropertyName */ ? checkComputedPropertyName(memberDecl.name) : void 0;
       if (memberDecl.kind === 304 /* PropertyAssignment */ || memberDecl.kind === 305 /* ShorthandPropertyAssignment */ || isObjectLiteralMethod(memberDecl)) {
+        const isIntraExpressionInferenceSource = intraExpressionInferenceContext && (memberDecl.kind === 304 /* PropertyAssignment */ || memberDecl.kind === 175 /* MethodDeclaration */) && isContextSensitive(memberDecl);
+        if (isIntraExpressionInferenceSource) {
+          pushReverseMappedTypeIntraExpressionInferenceScope(intraExpressionInferenceContext, node);
+        }
         let type = memberDecl.kind === 304 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) : (
           // avoid resolving the left side of the ShorthandPropertyAssignment outside of the destructuring
           // for error recovery purposes. For example, if a user wrote `{ a = 100 }` instead of `{ a: 100 }`.
           // we don't want to say "could not find 'a'".
           memberDecl.kind === 305 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(!inDestructuringPattern && memberDecl.objectAssignmentInitializer ? memberDecl.objectAssignmentInitializer : memberDecl.name, checkMode) : checkObjectLiteralMethod(memberDecl, checkMode)
         );
+        if (isIntraExpressionInferenceSource) {
+          popReverseMappedTypeIntraExpressionInferenceScope(intraExpressionInferenceContext);
+        }
         if (isInJavascript) {
           const jsDocType = getTypeForDeclarationFromJSDocComment(memberDecl);
           if (jsDocType) {
@@ -74091,11 +74095,9 @@ function createTypeChecker(host) {
         prop.links.target = member;
         member = prop;
         allPropertiesTable == null ? void 0 : allPropertiesTable.set(prop.escapedName, prop);
-        if (contextualType && checkMode & 2 /* Inferential */ && !(checkMode & 4 /* SkipContextSensitive */) && (memberDecl.kind === 304 /* PropertyAssignment */ || memberDecl.kind === 175 /* MethodDeclaration */) && isContextSensitive(memberDecl)) {
-          const inferenceContext = getInferenceContext(node);
-          Debug.assert(inferenceContext);
+        if (isIntraExpressionInferenceSource) {
           const inferenceNode = memberDecl.kind === 304 /* PropertyAssignment */ ? memberDecl.initializer : memberDecl;
-          addIntraExpressionInferenceSite(inferenceContext, inferenceNode, type);
+          addIntraExpressionInferenceSite(intraExpressionInferenceContext, inferenceNode, type);
         }
       } else if (memberDecl.kind === 306 /* SpreadAssignment */) {
         if (languageVersion < LanguageFeatureMinimumTarget.ObjectAssign) {

package/lib/lib.es5.d.ts

@@ -1682,15 +1682,6 @@ type NoInfer<T> = intrinsic;
  */
 interface ThisType<T> {}
 
-/**
- * Type instantiated to perform partial inferences from indexed accesses
- */
-type PartialInference<T, Keys extends string> = ({
-    [K in Keys]: {
-        [K1 in K]: T;
-    };
-})[Keys];
-
 /**
  * Stores types to be used with WeakSet, WeakMap, WeakRef, and FinalizationRegistry
  */

package/lib/typescript.js

@@ -21301,15 +21301,16 @@ function getCheckFlags(symbol) {
   return symbol.flags & 33554432 /* Transient */ ? symbol.links.checkFlags : 0;
 }
 function getDeclarationModifierFlagsFromSymbol(s, isWrite = false) {
-  if (s.valueDeclaration) {
+  const checkFlags = getCheckFlags(s);
+  if (!(checkFlags & 8192 /* ReverseMapped */) && s.valueDeclaration) {
     const declaration = isWrite && s.declarations && find(s.declarations, isSetAccessorDeclaration) || s.flags & 32768 /* GetAccessor */ && find(s.declarations, isGetAccessorDeclaration) || s.valueDeclaration;
     const flags = getCombinedModifierFlags(declaration);
     return s.parent && s.parent.flags & 32 /* Class */ ? flags : flags & ~7 /* AccessibilityModifier */;
   }
-  if (getCheckFlags(s) & 6 /* Synthetic */) {
-    const checkFlags = s.links.checkFlags;
-    const accessModifier = checkFlags & 1024 /* ContainsPrivate */ ? 2 /* Private */ : checkFlags & 256 /* ContainsPublic */ ? 1 /* Public */ : 4 /* Protected */;
-    const staticModifier = checkFlags & 2048 /* ContainsStatic */ ? 256 /* Static */ : 0;
+  if (checkFlags & 6 /* Synthetic */) {
+    const checkFlags2 = s.links.checkFlags;
+    const accessModifier = checkFlags2 & 1024 /* ContainsPrivate */ ? 2 /* Private */ : checkFlags2 & 256 /* ContainsPublic */ ? 1 /* Public */ : 4 /* Protected */;
+    const staticModifier = checkFlags2 & 2048 /* ContainsStatic */ ? 256 /* Static */ : 0;
     return accessModifier | staticModifier;
   }
   if (s.flags & 4194304 /* Prototype */) {
@@ -62912,7 +62913,13 @@ function createTypeChecker(host) {
     const modifiers = getMappedTypeModifiers(type.mappedType);
     const readonlyMask = modifiers & 1 /* IncludeReadonly */ ? false : true;
     const optionalMask = modifiers & 4 /* IncludeOptional */ ? 0 : 16777216 /* Optional */;
-    const indexInfos = indexInfo ? [createIndexInfo(stringType, inferReverseMappedType(indexInfo.type, type.mappedType, type.constraintType) || unknownType, readonlyMask && indexInfo.isReadonly)] : emptyArray;
+    const indexInfos = indexInfo ? [createIndexInfo(stringType, inferReverseMappedType(
+      indexInfo.type,
+      type.mappedType,
+      type.constraintType,
+      /*sourceValueDeclaration*/
+      void 0
+    ) || unknownType, readonlyMask && indexInfo.isReadonly)] : emptyArray;
     const members = createSymbolTable();
     const limitedConstraint = getLimitedConstraint(type);
     for (const prop of getPropertiesOfType(type.source)) {
@@ -62925,6 +62932,7 @@ function createTypeChecker(host) {
       const checkFlags = 8192 /* ReverseMapped */ | (readonlyMask && isReadonlySymbol(prop) ? 8 /* Readonly */ : 0);
       const inferredProp = createSymbol(4 /* Property */ | prop.flags & optionalMask, prop.escapedName, checkFlags);
       inferredProp.declarations = prop.declarations;
+      inferredProp.valueDeclaration = prop.valueDeclaration;
       inferredProp.links.nameType = getSymbolLinks(prop).nameType;
       inferredProp.links.propertyType = getTypeOfSymbol(prop);
       if (type.constraintType.type.flags & 8388608 /* IndexedAccess */ && type.constraintType.type.objectType.flags & 262144 /* TypeParameter */ && type.constraintType.type.indexType.flags & 262144 /* TypeParameter */) {
@@ -72735,7 +72743,10 @@ function createTypeChecker(host) {
       map(context.inferences, (i) => i.typeParameter),
       map(context.inferences, (inference, i) => () => {
         if (!inference.isFixed) {
-          inferFromIntraExpressionSites(context);
+          if (context.intraExpressionInferenceSites) {
+            inferFromIntraExpressionSites(context.inferences, context.intraExpressionInferenceSites);
+            context.intraExpressionInferenceSites = void 0;
+          }
           clearCachedInferences(context.inferences);
           inference.isFixed = true;
         }
@@ -72759,17 +72770,38 @@ function createTypeChecker(host) {
     }
   }
   function addIntraExpressionInferenceSite(context, node, type) {
-    (context.intraExpressionInferenceSites ?? (context.intraExpressionInferenceSites = [])).push({ node, type });
+    const site = { node, type };
+    (context.intraExpressionInferenceSites ?? (context.intraExpressionInferenceSites = [])).push(site);
+    if (context.reverseMappedIntraExpressionInferenceSites) {
+      for (const reverseMappedSites of context.reverseMappedIntraExpressionInferenceSites) {
+        reverseMappedSites.push(site);
+      }
+    }
   }
-  function inferFromIntraExpressionSites(context) {
-    if (context.intraExpressionInferenceSites) {
-      for (const { node, type } of context.intraExpressionInferenceSites) {
-        const contextualType = node.kind === 175 /* MethodDeclaration */ ? getContextualTypeForObjectLiteralMethod(node, 2 /* NoConstraints */) : getContextualType2(node, 2 /* NoConstraints */);
-        if (contextualType) {
-          inferTypes(context.inferences, type, contextualType);
+  function pushReverseMappedTypeIntraExpressionInferenceScope(context, node) {
+    (context.reverseMappedIntraExpressionInferenceScopeNodes ?? (context.reverseMappedIntraExpressionInferenceScopeNodes = [])).push(node);
+    (context.reverseMappedIntraExpressionInferenceSites ?? (context.reverseMappedIntraExpressionInferenceSites = [])).push([]);
+  }
+  function popReverseMappedTypeIntraExpressionInferenceScope(context) {
+    context.reverseMappedIntraExpressionInferenceScopeNodes.pop();
+    context.reverseMappedIntraExpressionInferenceSites.pop();
+  }
+  function findReverseMappedTypeIntraExpressionInferenceScope(context, node) {
+    if (context == null ? void 0 : context.reverseMappedIntraExpressionInferenceScopeNodes) {
+      for (let i = context.reverseMappedIntraExpressionInferenceScopeNodes.length - 1; i >= 0; i--) {
+        if (context.reverseMappedIntraExpressionInferenceScopeNodes[i] === node) {
+          return i;
         }
       }
-      context.intraExpressionInferenceSites = void 0;
+    }
+    return -1;
+  }
+  function inferFromIntraExpressionSites(inferences, intraExpressionInferenceSites) {
+    for (const { node, type } of intraExpressionInferenceSites) {
+      const contextualType = node.kind === 175 /* MethodDeclaration */ ? getContextualTypeForObjectLiteralMethod(node, 2 /* NoConstraints */) : getContextualType2(node, 2 /* NoConstraints */);
+      if (contextualType) {
+        inferTypes(inferences, type, contextualType);
+      }
     }
   }
   function createInferenceInfo(typeParameter) {
@@ -72781,8 +72813,7 @@ function createTypeChecker(host) {
       priority: void 0,
       topLevel: true,
       isFixed: false,
-      impliedArity: void 0,
-      indexes: void 0
+      impliedArity: void 0
     };
   }
   function cloneInferenceInfo(inference) {
@@ -72794,8 +72825,7 @@ function createTypeChecker(host) {
       priority: inference.priority,
       topLevel: inference.topLevel,
       isFixed: inference.isFixed,
-      impliedArity: inference.impliedArity,
-      indexes: inference.indexes && inference.indexes.slice()
+      impliedArity: inference.impliedArity
     };
   }
   function cloneInferredPartOfContext(context) {
@@ -72869,22 +72899,31 @@ function createTypeChecker(host) {
     reverseHomomorphicMappedCache.set(cacheKey, type);
     return type;
   }
-  function isPartiallyInferableType(type) {
-    return !(getObjectFlags(type) & 262144 /* NonInferrableType */) || isObjectLiteralType2(type) && some(getPropertiesOfType(type), (prop) => isPartiallyInferableType(getTypeOfSymbol(prop))) || isTupleType(type) && some(getElementTypes(type), isPartiallyInferableType);
-  }
   function createReverseMappedType(source, target, constraint) {
-    if (!(getIndexInfoOfType(source, stringType) || getPropertiesOfType(source).length !== 0 && isPartiallyInferableType(source))) {
+    if (!getIndexInfoOfType(source, stringType) && !getPropertiesOfType(source).length) {
       return void 0;
     }
     if (isArrayType(source)) {
-      const elementType = inferReverseMappedType(getTypeArguments(source)[0], target, constraint);
+      const elementType = inferReverseMappedType(
+        getTypeArguments(source)[0],
+        target,
+        constraint,
+        /*sourceValueDeclaration*/
+        void 0
+      );
       if (!elementType) {
         return void 0;
       }
       return createArrayType(elementType, isReadonlyArrayType(source));
     }
     if (isTupleType(source)) {
-      const elementTypes = map(getElementTypes(source), (t) => inferReverseMappedType(t, target, constraint));
+      const elementTypes = map(getElementTypes(source), (t) => inferReverseMappedType(
+        t,
+        target,
+        constraint,
+        /*sourceValueDeclaration*/
+        void 0
+      ));
       if (!every(elementTypes, (t) => !!t)) {
         return void 0;
       }
@@ -72904,19 +72943,39 @@ function createTypeChecker(host) {
   function getTypeOfReverseMappedSymbol(symbol) {
     const links = getSymbolLinks(symbol);
     if (!links.type) {
-      links.type = inferReverseMappedType(symbol.links.propertyType, symbol.links.mappedType, symbol.links.constraintType) || unknownType;
+      links.type = inferReverseMappedType(symbol.links.propertyType, symbol.links.mappedType, symbol.links.constraintType, symbol.valueDeclaration) || unknownType;
     }
     return links.type;
   }
-  function inferReverseMappedTypeWorker(sourceType, target, constraint) {
+  function inferReverseMappedTypeWorker(sourceType, target, constraint, sourceValueDeclaration) {
     const typeParameter = getIndexedAccessType(constraint.type, getTypeParameterFromMappedType(target));
     const templateType = getTemplateTypeFromMappedType(target);
     const inference = createInferenceInfo(typeParameter);
     inferTypes([inference], sourceType, templateType);
-    return getTypeFromInference(inference) || (inference.indexes ? getIntersectionType(inference.indexes) : unknownType);
+    if (sourceValueDeclaration && getObjectFlags(sourceType) & 262144 /* NonInferrableType */) {
+      const scopeNode = sourceValueDeclaration.parent;
+      const inferenceContext = getInferenceContext(scopeNode);
+      const index = findReverseMappedTypeIntraExpressionInferenceScope(inferenceContext, scopeNode);
+      if (index !== -1) {
+        Debug.assert(inferenceContext);
+        const intraExpressionSites = inferenceContext.reverseMappedIntraExpressionInferenceSites[index];
+        const recordSymbol = getGlobalRecordSymbol();
+        if (intraExpressionSites.length && recordSymbol) {
+          pushContextualType(
+            scopeNode,
+            getTypeAliasInstantiation(recordSymbol, [stringNumberSymbolType, templateType]),
+            /*isCache*/
+            false
+          );
+          inferFromIntraExpressionSites([inference], intraExpressionSites);
+          popContextualType();
+        }
+      }
+    }
+    return getTypeFromInference(inference) || unknownType;
   }
-  function inferReverseMappedType(source, target, constraint) {
-    const cacheKey = source.id + "," + target.id + "," + constraint.id;
+  function inferReverseMappedType(source, target, constraint, sourceValueDeclaration) {
+    const cacheKey = source.id + "," + target.id + "," + constraint.id + (sourceValueDeclaration && getObjectFlags(source) & 262144 /* NonInferrableType */ ? "," + getNodeId(sourceValueDeclaration) : "");
     if (reverseMappedCache.has(cacheKey)) {
       return reverseMappedCache.get(cacheKey) || unknownType;
     }
@@ -72927,7 +72986,7 @@ function createTypeChecker(host) {
     if (isDeeplyNestedType(target, reverseMappedTargetStack, reverseMappedTargetStack.length, 2)) reverseExpandingFlags |= 2 /* Target */;
     let type;
     if (reverseExpandingFlags !== 3 /* Both */) {
-      type = inferReverseMappedTypeWorker(source, target, constraint);
+      type = inferReverseMappedTypeWorker(source, target, constraint, sourceValueDeclaration);
     }
     reverseMappedSourceStack.pop();
     reverseMappedTargetStack.pop();
@@ -73254,24 +73313,6 @@ function createTypeChecker(host) {
       } else if (source.flags & 8388608 /* IndexedAccess */ && target.flags & 8388608 /* IndexedAccess */) {
         inferFromTypes(source.objectType, target.objectType);
         inferFromTypes(source.indexType, target.indexType);
-      } else if (!(priority & 1 /* NakedTypeVariable */) && target.flags & 8388608 /* IndexedAccess */) {
-        if (isFromInferenceBlockedSource(source)) {
-          return;
-        }
-        const inference = getInferenceInfoForType(getActualTypeVariable(target.objectType));
-        if (inference) {
-          if (getObjectFlags(source) & 262144 /* NonInferrableType */ || source === nonInferrableAnyType) {
-            return;
-          }
-          if (!inference.isFixed) {
-            const inferenceTypeSymbol = getGlobalSymbol("PartialInference", 788968 /* Type */, Diagnostics.Cannot_find_global_type_0);
-            const inferenceType = inferenceTypeSymbol && getDeclaredTypeOfSymbol(inferenceTypeSymbol);
-            if (inferenceType && inferenceType !== unknownType) {
-              const mapper = createTypeMapper(getSymbolLinks(inferenceTypeSymbol).typeParameters, [source, target.indexType]);
-              inference.indexes = append(inference.indexes, instantiateType(inferenceType, mapper));
-            }
-          }
-        }
       } else if (source.flags & 268435456 /* StringMapping */ && target.flags & 268435456 /* StringMapping */) {
         if (source.symbol === target.symbol) {
           inferFromTypes(source.type, target.type);
@@ -73465,7 +73506,7 @@ function createTypeChecker(host) {
       }
     }
     function inferToMappedType(source, target, constraintType) {
-      if (constraintType.flags & 1048576 /* Union */ || constraintType.flags & 2097152 /* Intersection */) {
+      if (constraintType.flags & 3145728 /* UnionOrIntersection */) {
         let result = false;
         for (const type of constraintType.types) {
           result = inferToMappedType(source, target, type) || result;
@@ -73775,51 +73816,6 @@ function createTypeChecker(host) {
           const preferCovariantType = inferredCovariantType && (!inferredContravariantType || !(inferredCovariantType.flags & (131072 /* Never */ | 1 /* Any */)) && some(inference.contraCandidates, (t) => isTypeAssignableTo(inferredCovariantType, t)) && every(context.inferences, (other) => other !== inference && getConstraintOfTypeParameter(other.typeParameter) !== inference.typeParameter || every(other.candidates, (t) => isTypeAssignableTo(t, inferredCovariantType))));
           inferredType = preferCovariantType ? inferredCovariantType : inferredContravariantType;
           fallbackType = preferCovariantType ? inferredContravariantType : inferredCovariantType;
-        } else if (inference.indexes) {
-          let aggregateInference = getIntersectionType(inference.indexes);
-          const constraint2 = getConstraintOfTypeParameter(inference.typeParameter);
-          if (constraint2) {
-            const instantiatedConstraint = instantiateType(constraint2, context.nonFixingMapper);
-            if (instantiatedConstraint.flags & 1048576 /* Union */ && !context.compareTypes(aggregateInference, getTypeWithThisArgument(instantiatedConstraint, aggregateInference))) {
-              const discriminantProps = findDiscriminantProperties(getPropertiesOfType(aggregateInference), instantiatedConstraint);
-              if (discriminantProps) {
-                let match;
-                findDiscriminant:
-                  for (const p of discriminantProps) {
-                    const candidatePropType = getTypeOfPropertyOfType(aggregateInference, p.escapedName);
-                    for (const type of instantiatedConstraint.types) {
-                      const propType = getTypeOfPropertyOfType(type, p.escapedName);
-                      if (propType && candidatePropType && checkTypeAssignableTo(
-                        candidatePropType,
-                        propType,
-                        /*errorNode*/
-                        void 0
-                      )) {
-                        if (match && match !== type) {
-                          match = void 0;
-                          break findDiscriminant;
-                        } else {
-                          match = type;
-                        }
-                      }
-                    }
-                  }
-                if (match) {
-                  aggregateInference = getSpreadType(
-                    match,
-                    aggregateInference,
-                    /*symbol*/
-                    void 0,
-                    /*propegatedFlags*/
-                    0,
-                    /*readonly*/
-                    false
-                  );
-                }
-              }
-            }
-          }
-          inferredType = aggregateInference;
         } else if (context.flags & 1 /* NoDefault */) {
           inferredType = silentNeverType;
         } else {
@@ -78674,17 +78670,25 @@ function createTypeChecker(host) {
         checkComputedPropertyName(elem.name);
       }
     }
+    const intraExpressionInferenceContext = contextualType && checkMode & 2 /* Inferential */ && !(checkMode & 4 /* SkipContextSensitive */) ? getInferenceContext(node) : void 0;
     let offset = 0;
     for (const memberDecl of node.properties) {
       let member = getSymbolOfDeclaration(memberDecl);
       const computedNameType = memberDecl.name && memberDecl.name.kind === 168 /* ComputedPropertyName */ ? checkComputedPropertyName(memberDecl.name) : void 0;
       if (memberDecl.kind === 304 /* PropertyAssignment */ || memberDecl.kind === 305 /* ShorthandPropertyAssignment */ || isObjectLiteralMethod(memberDecl)) {
+        const isIntraExpressionInferenceSource = intraExpressionInferenceContext && (memberDecl.kind === 304 /* PropertyAssignment */ || memberDecl.kind === 175 /* MethodDeclaration */) && isContextSensitive(memberDecl);
+        if (isIntraExpressionInferenceSource) {
+          pushReverseMappedTypeIntraExpressionInferenceScope(intraExpressionInferenceContext, node);
+        }
         let type = memberDecl.kind === 304 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) : (
           // avoid resolving the left side of the ShorthandPropertyAssignment outside of the destructuring
           // for error recovery purposes. For example, if a user wrote `{ a = 100 }` instead of `{ a: 100 }`.
           // we don't want to say "could not find 'a'".
           memberDecl.kind === 305 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(!inDestructuringPattern && memberDecl.objectAssignmentInitializer ? memberDecl.objectAssignmentInitializer : memberDecl.name, checkMode) : checkObjectLiteralMethod(memberDecl, checkMode)
         );
+        if (isIntraExpressionInferenceSource) {
+          popReverseMappedTypeIntraExpressionInferenceScope(intraExpressionInferenceContext);
+        }
         if (isInJavascript) {
           const jsDocType = getTypeForDeclarationFromJSDocComment(memberDecl);
           if (jsDocType) {
@@ -78719,11 +78723,9 @@ function createTypeChecker(host) {
         prop.links.target = member;
         member = prop;
         allPropertiesTable == null ? void 0 : allPropertiesTable.set(prop.escapedName, prop);
-        if (contextualType && checkMode & 2 /* Inferential */ && !(checkMode & 4 /* SkipContextSensitive */) && (memberDecl.kind === 304 /* PropertyAssignment */ || memberDecl.kind === 175 /* MethodDeclaration */) && isContextSensitive(memberDecl)) {
-          const inferenceContext = getInferenceContext(node);
-          Debug.assert(inferenceContext);
+        if (isIntraExpressionInferenceSource) {
           const inferenceNode = memberDecl.kind === 304 /* PropertyAssignment */ ? memberDecl.initializer : memberDecl;
-          addIntraExpressionInferenceSite(inferenceContext, inferenceNode, type);
+          addIntraExpressionInferenceSite(intraExpressionInferenceContext, inferenceNode, type);
         }
       } else if (memberDecl.kind === 306 /* SpreadAssignment */) {
         if (languageVersion < LanguageFeatureMinimumTarget.ObjectAssign) {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "6.0.0-pr-53017-20",
+  "version": "6.0.0-pr-54029-2",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [