@typescript-deploys/pr-build 6.0.0-pr-62789-2 → 6.0.0-pr-56300-12

package/lib/_tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "6.0";
-var version = `${versionMajorMinor}.0-insiders.20251124`;
+var version = `${versionMajorMinor}.0-insiders.20251129`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -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);
@@ -68274,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) || 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;
     }
@@ -68297,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();
@@ -69142,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;
@@ -79809,8 +79837,7 @@ function createTypeChecker(host) {
     }
   }
   function isNotWithinNullishCoalesceExpression(node) {
-    const parent = walkUpOuterExpressions(node);
-    return !isBinaryExpression(parent) || parent.operatorToken.kind !== 61 /* QuestionQuestionToken */;
+    return !isBinaryExpression(node.parent) || node.parent.operatorToken.kind !== 61 /* QuestionQuestionToken */;
   }
   function getSyntacticNullishnessSemantics(node) {
     node = skipOuterExpressions(node);

package/lib/typescript.js

@@ -2286,7 +2286,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "6.0";
-var version = `${versionMajorMinor}.0-insiders.20251124`;
+var version = `${versionMajorMinor}.0-insiders.20251129`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -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);
@@ -72902,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) || 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;
     }
@@ -72925,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();
@@ -73770,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;
@@ -84437,8 +84465,7 @@ function createTypeChecker(host) {
     }
   }
   function isNotWithinNullishCoalesceExpression(node) {
-    const parent2 = walkUpOuterExpressions(node);
-    return !isBinaryExpression(parent2) || parent2.operatorToken.kind !== 61 /* QuestionQuestionToken */;
+    return !isBinaryExpression(node.parent) || node.parent.operatorToken.kind !== 61 /* QuestionQuestionToken */;
   }
   function getSyntacticNullishnessSemantics(node) {
     node = skipOuterExpressions(node);

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