@typescript-deploys/pr-build 6.0.0-pr-53017-20 → 6.0.0-pr-56300-12

package/lib/_tsc.js

@@ -58284,7 +58284,7 @@ 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, type.inferenceConstraintType && getIndexedAccessTypeOrUndefined(type.inferenceConstraintType, indexInfo.keyType)) ?? unknownType, readonlyMask && indexInfo.isReadonly)] : emptyArray;
     const members = createSymbolTable();
     const limitedConstraint = getLimitedConstraint(type);
     for (const prop of getPropertiesOfType(type.source)) {
@@ -58308,6 +58308,7 @@ function createTypeChecker(host) {
         inferredProp.links.mappedType = type.mappedType;
         inferredProp.links.constraintType = type.constraintType;
       }
+      inferredProp.links.inferenceConstraintType = type.inferenceConstraintType;
       members.set(prop.escapedName, inferredProp);
     }
     setStructuredTypeMembers(type, members, emptyArray, emptyArray, indexInfos);
@@ -68153,8 +68154,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 +68166,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) {
@@ -68276,19 +68275,20 @@ 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;
+      const reverseConstraint = symbol.links.inferenceConstraintType && getIndexedAccessTypeOrUndefined(symbol.links.inferenceConstraintType, getStringLiteralType(unescapeLeadingUnderscores(symbol.escapedName)));
+      links.type = inferReverseMappedType(symbol.links.propertyType, symbol.links.mappedType, symbol.links.constraintType, reverseConstraint) ?? unknownType;
     }
     return links.type;
   }
-  function inferReverseMappedTypeWorker(sourceType, target, constraint) {
+  function inferReverseMappedTypeWorker(sourceType, target, constraint, reverseMappedConstraint) {
     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);
+    return getTypeFromInference(inference) ?? reverseMappedConstraint ?? unknownType;
   }
-  function inferReverseMappedType(source, target, constraint) {
-    const cacheKey = source.id + "," + target.id + "," + constraint.id;
+  function inferReverseMappedType(source, target, constraint, reverseMappedConstraint) {
+    const cacheKey = source.id + "," + target.id + "," + constraint.id + "," + ((reverseMappedConstraint == null ? void 0 : reverseMappedConstraint.id) ?? "0");
     if (reverseMappedCache.has(cacheKey)) {
       return reverseMappedCache.get(cacheKey) || unknownType;
     }
@@ -68299,7 +68299,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, reverseMappedConstraint);
     }
     reverseMappedSourceStack.pop();
     reverseMappedTargetStack.pop();
@@ -68626,24 +68626,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);
@@ -69147,51 +69129,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 {
@@ -69207,13 +69144,39 @@ function createTypeChecker(host) {
       const constraint = getConstraintOfTypeParameter(inference.typeParameter);
       if (constraint) {
         const instantiatedConstraint = instantiateType(constraint, context.nonFixingMapper);
+        inferredType = cloneWithInferenceConstraintIfNeeded(inferredType, instantiatedConstraint);
+        if (inferredType) {
+          inference.inferredType = inferredType;
+        }
         if (!inferredType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
+          fallbackType = cloneWithInferenceConstraintIfNeeded(fallbackType, instantiatedConstraint);
           inference.inferredType = fallbackType && context.compareTypes(fallbackType, getTypeWithThisArgument(instantiatedConstraint, fallbackType)) ? fallbackType : instantiatedConstraint;
         }
       }
       clearActiveMapperCaches();
     }
     return inference.inferredType;
+    function cloneWithInferenceConstraintIfNeeded(type, inferenceConstraintType) {
+      if (!type || !(type.flags & 524288 /* Object */) || !(type.objectFlags & 1024 /* ReverseMapped */)) {
+        return type;
+      }
+      const reversed = type;
+      const cacheKey = reversed.source.id + "," + reversed.mappedType.id + "," + reversed.constraintType.id + "," + inferenceConstraintType.id;
+      if (reverseHomomorphicMappedCache.has(cacheKey)) {
+        return reverseHomomorphicMappedCache.get(cacheKey);
+      }
+      const clone = createObjectType(
+        1024 /* ReverseMapped */ | 16 /* Anonymous */,
+        /*symbol*/
+        void 0
+      );
+      clone.source = reversed.source;
+      clone.mappedType = reversed.mappedType;
+      clone.constraintType = reversed.constraintType;
+      clone.inferenceConstraintType = inferenceConstraintType;
+      reverseHomomorphicMappedCache.set(cacheKey, clone);
+      return clone;
+    }
   }
   function getDefaultTypeArgumentType(isInJavaScriptFile) {
     return isInJavaScriptFile ? anyType : unknownType;

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

@@ -62912,7 +62912,7 @@ 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, type.inferenceConstraintType && getIndexedAccessTypeOrUndefined(type.inferenceConstraintType, indexInfo.keyType)) ?? unknownType, readonlyMask && indexInfo.isReadonly)] : emptyArray;
     const members = createSymbolTable();
     const limitedConstraint = getLimitedConstraint(type);
     for (const prop of getPropertiesOfType(type.source)) {
@@ -62936,6 +62936,7 @@ function createTypeChecker(host) {
         inferredProp.links.mappedType = type.mappedType;
         inferredProp.links.constraintType = type.constraintType;
       }
+      inferredProp.links.inferenceConstraintType = type.inferenceConstraintType;
       members.set(prop.escapedName, inferredProp);
     }
     setStructuredTypeMembers(type, members, emptyArray, emptyArray, indexInfos);
@@ -72781,8 +72782,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 +72794,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) {
@@ -72904,19 +72903,20 @@ 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;
+      const reverseConstraint = symbol.links.inferenceConstraintType && getIndexedAccessTypeOrUndefined(symbol.links.inferenceConstraintType, getStringLiteralType(unescapeLeadingUnderscores(symbol.escapedName)));
+      links.type = inferReverseMappedType(symbol.links.propertyType, symbol.links.mappedType, symbol.links.constraintType, reverseConstraint) ?? unknownType;
     }
     return links.type;
   }
-  function inferReverseMappedTypeWorker(sourceType, target, constraint) {
+  function inferReverseMappedTypeWorker(sourceType, target, constraint, reverseMappedConstraint) {
     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);
+    return getTypeFromInference(inference) ?? reverseMappedConstraint ?? unknownType;
   }
-  function inferReverseMappedType(source, target, constraint) {
-    const cacheKey = source.id + "," + target.id + "," + constraint.id;
+  function inferReverseMappedType(source, target, constraint, reverseMappedConstraint) {
+    const cacheKey = source.id + "," + target.id + "," + constraint.id + "," + ((reverseMappedConstraint == null ? void 0 : reverseMappedConstraint.id) ?? "0");
     if (reverseMappedCache.has(cacheKey)) {
       return reverseMappedCache.get(cacheKey) || unknownType;
     }
@@ -72927,7 +72927,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, reverseMappedConstraint);
     }
     reverseMappedSourceStack.pop();
     reverseMappedTargetStack.pop();
@@ -73254,24 +73254,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);
@@ -73775,51 +73757,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 {
@@ -73835,13 +73772,39 @@ function createTypeChecker(host) {
       const constraint = getConstraintOfTypeParameter(inference.typeParameter);
       if (constraint) {
         const instantiatedConstraint = instantiateType(constraint, context.nonFixingMapper);
+        inferredType = cloneWithInferenceConstraintIfNeeded(inferredType, instantiatedConstraint);
+        if (inferredType) {
+          inference.inferredType = inferredType;
+        }
         if (!inferredType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
+          fallbackType = cloneWithInferenceConstraintIfNeeded(fallbackType, instantiatedConstraint);
           inference.inferredType = fallbackType && context.compareTypes(fallbackType, getTypeWithThisArgument(instantiatedConstraint, fallbackType)) ? fallbackType : instantiatedConstraint;
         }
       }
       clearActiveMapperCaches();
     }
     return inference.inferredType;
+    function cloneWithInferenceConstraintIfNeeded(type, inferenceConstraintType) {
+      if (!type || !(type.flags & 524288 /* Object */) || !(type.objectFlags & 1024 /* ReverseMapped */)) {
+        return type;
+      }
+      const reversed = type;
+      const cacheKey = reversed.source.id + "," + reversed.mappedType.id + "," + reversed.constraintType.id + "," + inferenceConstraintType.id;
+      if (reverseHomomorphicMappedCache.has(cacheKey)) {
+        return reverseHomomorphicMappedCache.get(cacheKey);
+      }
+      const clone2 = createObjectType(
+        1024 /* ReverseMapped */ | 16 /* Anonymous */,
+        /*symbol*/
+        void 0
+      );
+      clone2.source = reversed.source;
+      clone2.mappedType = reversed.mappedType;
+      clone2.constraintType = reversed.constraintType;
+      clone2.inferenceConstraintType = inferenceConstraintType;
+      reverseHomomorphicMappedCache.set(cacheKey, clone2);
+      return clone2;
+    }
   }
   function getDefaultTypeArgumentType(isInJavaScriptFile) {
     return isInJavaScriptFile ? anyType : unknownType;

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-56300-12",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [