@typescript-deploys/pr-build 5.2.0-pr-52493-8 → 5.2.0-pr-53647-17

package/lib/tsc.js

@@ -13287,8 +13287,8 @@ function isInExpressionContext(node) {
       return forStatement.initializer === node && forStatement.initializer.kind !== 261 /* VariableDeclarationList */ || forStatement.condition === node || forStatement.incrementor === node;
     case 249 /* ForInStatement */:
     case 250 /* ForOfStatement */:
-      const forInOrOfStatement = parent;
-      return forInOrOfStatement.initializer === node && forInOrOfStatement.initializer.kind !== 261 /* VariableDeclarationList */ || forInOrOfStatement.expression === node;
+      const forInStatement = parent;
+      return forInStatement.initializer === node && forInStatement.initializer.kind !== 261 /* VariableDeclarationList */ || forInStatement.expression === node;
     case 216 /* TypeAssertionExpression */:
     case 234 /* AsExpression */:
       return node === parent.expression;
@@ -13949,23 +13949,20 @@ function getTypeParameterFromJsDoc(node) {
   const { typeParameters } = node.parent.parent.parent;
   return typeParameters && find(typeParameters, (p) => p.name.escapedText === name);
 }
-function getAssignmentTarget(node) {
+function getAssignmentTargetKind(node) {
   let parent = node.parent;
   while (true) {
     switch (parent.kind) {
       case 226 /* BinaryExpression */:
-        const binaryExpression = parent;
-        const binaryOperator = binaryExpression.operatorToken.kind;
-        return isAssignmentOperator(binaryOperator) && binaryExpression.left === node ? binaryExpression : void 0;
+        const binaryOperator = parent.operatorToken.kind;
+        return isAssignmentOperator(binaryOperator) && parent.left === node ? binaryOperator === 64 /* EqualsToken */ || isLogicalOrCoalescingAssignmentOperator(binaryOperator) ? 1 /* Definite */ : 2 /* Compound */ : 0 /* None */;
       case 224 /* PrefixUnaryExpression */:
       case 225 /* PostfixUnaryExpression */:
-        const unaryExpression = parent;
-        const unaryOperator = unaryExpression.operator;
-        return unaryOperator === 46 /* PlusPlusToken */ || unaryOperator === 47 /* MinusMinusToken */ ? unaryExpression : void 0;
+        const unaryOperator = parent.operator;
+        return unaryOperator === 46 /* PlusPlusToken */ || unaryOperator === 47 /* MinusMinusToken */ ? 2 /* Compound */ : 0 /* None */;
       case 249 /* ForInStatement */:
       case 250 /* ForOfStatement */:
-        const forInOrOfStatement = parent;
-        return forInOrOfStatement.initializer === node ? forInOrOfStatement : void 0;
+        return parent.initializer === node ? 1 /* Definite */ : 0 /* None */;
       case 217 /* ParenthesizedExpression */:
       case 209 /* ArrayLiteralExpression */:
       case 230 /* SpreadElement */:
@@ -13977,53 +13974,24 @@ function getAssignmentTarget(node) {
         break;
       case 304 /* ShorthandPropertyAssignment */:
         if (parent.name !== node) {
-          return void 0;
+          return 0 /* None */;
         }
         node = parent.parent;
         break;
       case 303 /* PropertyAssignment */:
         if (parent.name === node) {
-          return void 0;
+          return 0 /* None */;
         }
         node = parent.parent;
         break;
       default:
-        return void 0;
+        return 0 /* None */;
     }
     parent = node.parent;
   }
 }
-function getAssignmentTargetKind(node) {
-  const target = getAssignmentTarget(node);
-  if (!target) {
-    return 0 /* None */;
-  }
-  switch (target.kind) {
-    case 226 /* BinaryExpression */:
-      const binaryOperator = target.operatorToken.kind;
-      return binaryOperator === 64 /* EqualsToken */ || isLogicalOrCoalescingAssignmentOperator(binaryOperator) ? 1 /* Definite */ : 2 /* Compound */;
-    case 224 /* PrefixUnaryExpression */:
-    case 225 /* PostfixUnaryExpression */:
-      return 2 /* Compound */;
-    case 249 /* ForInStatement */:
-    case 250 /* ForOfStatement */:
-      return 1 /* Definite */;
-  }
-}
 function isAssignmentTarget(node) {
-  return !!getAssignmentTarget(node);
-}
-function isCompoundLikeAssignment(assignment) {
-  const right = skipParentheses(assignment.right);
-  return right.kind === 226 /* BinaryExpression */ && isShiftOperatorOrHigher(right.operatorToken.kind);
-}
-function isInCompoundLikeAssignment(node) {
-  const target = getAssignmentTarget(node);
-  return !!target && isAssignmentExpression(
-    target,
-    /*excludeCompoundAssignment*/
-    true
-  ) && isCompoundLikeAssignment(target);
+  return getAssignmentTargetKind(node) !== 0 /* None */;
 }
 function isNodeWithPossibleHoistedDeclaration(node) {
   switch (node.kind) {
@@ -43778,7 +43746,7 @@ function createTypeChecker(host) {
   };
   var amalgamatedDuplicates;
   var reverseMappedCache = /* @__PURE__ */ new Map();
-  var inInferTypeForHomomorphicMappedType = false;
+  var homomorphicMappedTypeInferenceStack = [];
   var ambientModulesCache;
   var patternAmbientModules;
   var patternAmbientModuleAugmentations;
@@ -62132,7 +62100,7 @@ function createTypeChecker(host) {
         }
       }
     }
-    const filtered = contains(include, 0 /* False */) ? getUnionType(types.filter((_, i) => include[i])) : target;
+    const filtered = contains(include, 0 /* False */) ? getUnionType(types.filter((_, i) => include[i]), 0 /* None */) : target;
     return filtered.flags & 131072 /* Never */ ? target : filtered;
   }
   function isWeakType(type) {
@@ -63166,17 +63134,18 @@ function createTypeChecker(host) {
     );
   }
   function inferTypeForHomomorphicMappedType(source, target, constraint) {
-    if (inInferTypeForHomomorphicMappedType) {
-      return void 0;
+    const cacheKey = source.id + "," + target.id + "," + constraint.id;
+    if (reverseMappedCache.has(cacheKey)) {
+      return reverseMappedCache.get(cacheKey);
     }
-    const key = source.id + "," + target.id + "," + constraint.id;
-    if (reverseMappedCache.has(key)) {
-      return reverseMappedCache.get(key);
+    const recursionKey = source.id + "," + (target.target || target).id;
+    if (contains(homomorphicMappedTypeInferenceStack, recursionKey)) {
+      return void 0;
     }
-    inInferTypeForHomomorphicMappedType = true;
+    homomorphicMappedTypeInferenceStack.push(recursionKey);
     const type = createReverseMappedType(source, target, constraint);
-    inInferTypeForHomomorphicMappedType = false;
-    reverseMappedCache.set(key, type);
+    homomorphicMappedTypeInferenceStack.pop();
+    reverseMappedCache.set(cacheKey, type);
     return type;
   }
   function isPartiallyInferableType(type) {
@@ -65203,11 +65172,10 @@ function createTypeChecker(host) {
           const assignedType = getWidenedLiteralType(getInitialOrAssignedType(flow));
           return isTypeAssignableTo(assignedType, declaredType) ? assignedType : anyArrayType;
         }
-        const t = isInCompoundLikeAssignment(node) ? getBaseTypeOfLiteralType(declaredType) : declaredType;
-        if (t.flags & 1048576 /* Union */) {
-          return getAssignmentReducedType(t, getInitialOrAssignedType(flow));
+        if (declaredType.flags & 1048576 /* Union */) {
+          return getAssignmentReducedType(declaredType, getInitialOrAssignedType(flow));
         }
-        return t;
+        return declaredType;
       }
       if (containsMatchingReference(reference, node)) {
         if (!isReachableFlowNode(flow)) {
@@ -66336,7 +66304,7 @@ function createTypeChecker(host) {
     const isAlias = localOrExportSymbol.flags & 2097152 /* Alias */;
     if (localOrExportSymbol.flags & 3 /* Variable */) {
       if (assignmentKind === 1 /* Definite */) {
-        return isInCompoundLikeAssignment(node) ? getBaseTypeOfLiteralType(type) : type;
+        return type;
       }
     } else if (isAlias) {
       declaration = getDeclarationOfAliasSymbol(symbol);

package/lib/tsserver.js

@@ -1414,7 +1414,6 @@ __export(server_exports, {
   isImportTypeNode: () => isImportTypeNode,
   isImportableFile: () => isImportableFile,
   isInComment: () => isInComment,
-  isInCompoundLikeAssignment: () => isInCompoundLikeAssignment,
   isInExpressionContext: () => isInExpressionContext,
   isInJSDoc: () => isInJSDoc,
   isInJSFile: () => isInJSFile,
@@ -1707,7 +1706,6 @@ __export(server_exports, {
   isSetAccessor: () => isSetAccessor,
   isSetAccessorDeclaration: () => isSetAccessorDeclaration,
   isShebangTrivia: () => isShebangTrivia,
-  isShiftOperatorOrHigher: () => isShiftOperatorOrHigher,
   isShorthandAmbientModuleSymbol: () => isShorthandAmbientModuleSymbol,
   isShorthandPropertyAssignment: () => isShorthandPropertyAssignment,
   isSignedNumericLiteral: () => isSignedNumericLiteral,
@@ -17127,8 +17125,8 @@ function isInExpressionContext(node) {
       return forStatement.initializer === node && forStatement.initializer.kind !== 261 /* VariableDeclarationList */ || forStatement.condition === node || forStatement.incrementor === node;
     case 249 /* ForInStatement */:
     case 250 /* ForOfStatement */:
-      const forInOrOfStatement = parent2;
-      return forInOrOfStatement.initializer === node && forInOrOfStatement.initializer.kind !== 261 /* VariableDeclarationList */ || forInOrOfStatement.expression === node;
+      const forInStatement = parent2;
+      return forInStatement.initializer === node && forInStatement.initializer.kind !== 261 /* VariableDeclarationList */ || forInStatement.expression === node;
     case 216 /* TypeAssertionExpression */:
     case 234 /* AsExpression */:
       return node === parent2.expression;
@@ -17824,23 +17822,20 @@ var AssignmentKind = /* @__PURE__ */ ((AssignmentKind2) => {
   AssignmentKind2[AssignmentKind2["Compound"] = 2] = "Compound";
   return AssignmentKind2;
 })(AssignmentKind || {});
-function getAssignmentTarget(node) {
+function getAssignmentTargetKind(node) {
   let parent2 = node.parent;
   while (true) {
     switch (parent2.kind) {
       case 226 /* BinaryExpression */:
-        const binaryExpression = parent2;
-        const binaryOperator = binaryExpression.operatorToken.kind;
-        return isAssignmentOperator(binaryOperator) && binaryExpression.left === node ? binaryExpression : void 0;
+        const binaryOperator = parent2.operatorToken.kind;
+        return isAssignmentOperator(binaryOperator) && parent2.left === node ? binaryOperator === 64 /* EqualsToken */ || isLogicalOrCoalescingAssignmentOperator(binaryOperator) ? 1 /* Definite */ : 2 /* Compound */ : 0 /* None */;
       case 224 /* PrefixUnaryExpression */:
       case 225 /* PostfixUnaryExpression */:
-        const unaryExpression = parent2;
-        const unaryOperator = unaryExpression.operator;
-        return unaryOperator === 46 /* PlusPlusToken */ || unaryOperator === 47 /* MinusMinusToken */ ? unaryExpression : void 0;
+        const unaryOperator = parent2.operator;
+        return unaryOperator === 46 /* PlusPlusToken */ || unaryOperator === 47 /* MinusMinusToken */ ? 2 /* Compound */ : 0 /* None */;
       case 249 /* ForInStatement */:
       case 250 /* ForOfStatement */:
-        const forInOrOfStatement = parent2;
-        return forInOrOfStatement.initializer === node ? forInOrOfStatement : void 0;
+        return parent2.initializer === node ? 1 /* Definite */ : 0 /* None */;
       case 217 /* ParenthesizedExpression */:
       case 209 /* ArrayLiteralExpression */:
       case 230 /* SpreadElement */:
@@ -17852,53 +17847,24 @@ function getAssignmentTarget(node) {
         break;
       case 304 /* ShorthandPropertyAssignment */:
         if (parent2.name !== node) {
-          return void 0;
+          return 0 /* None */;
         }
         node = parent2.parent;
         break;
       case 303 /* PropertyAssignment */:
         if (parent2.name === node) {
-          return void 0;
+          return 0 /* None */;
         }
         node = parent2.parent;
         break;
       default:
-        return void 0;
+        return 0 /* None */;
     }
     parent2 = node.parent;
   }
 }
-function getAssignmentTargetKind(node) {
-  const target = getAssignmentTarget(node);
-  if (!target) {
-    return 0 /* None */;
-  }
-  switch (target.kind) {
-    case 226 /* BinaryExpression */:
-      const binaryOperator = target.operatorToken.kind;
-      return binaryOperator === 64 /* EqualsToken */ || isLogicalOrCoalescingAssignmentOperator(binaryOperator) ? 1 /* Definite */ : 2 /* Compound */;
-    case 224 /* PrefixUnaryExpression */:
-    case 225 /* PostfixUnaryExpression */:
-      return 2 /* Compound */;
-    case 249 /* ForInStatement */:
-    case 250 /* ForOfStatement */:
-      return 1 /* Definite */;
-  }
-}
 function isAssignmentTarget(node) {
-  return !!getAssignmentTarget(node);
-}
-function isCompoundLikeAssignment(assignment) {
-  const right = skipParentheses(assignment.right);
-  return right.kind === 226 /* BinaryExpression */ && isShiftOperatorOrHigher(right.operatorToken.kind);
-}
-function isInCompoundLikeAssignment(node) {
-  const target = getAssignmentTarget(node);
-  return !!target && isAssignmentExpression(
-    target,
-    /*excludeCompoundAssignment*/
-    true
-  ) && isCompoundLikeAssignment(target);
+  return getAssignmentTargetKind(node) !== 0 /* None */;
 }
 function isNodeWithPossibleHoistedDeclaration(node) {
   switch (node.kind) {
@@ -48456,7 +48422,7 @@ function createTypeChecker(host) {
   };
   var amalgamatedDuplicates;
   var reverseMappedCache = /* @__PURE__ */ new Map();
-  var inInferTypeForHomomorphicMappedType = false;
+  var homomorphicMappedTypeInferenceStack = [];
   var ambientModulesCache;
   var patternAmbientModules;
   var patternAmbientModuleAugmentations;
@@ -66810,7 +66776,7 @@ function createTypeChecker(host) {
         }
       }
     }
-    const filtered = contains(include, 0 /* False */) ? getUnionType(types.filter((_, i) => include[i])) : target;
+    const filtered = contains(include, 0 /* False */) ? getUnionType(types.filter((_, i) => include[i]), 0 /* None */) : target;
     return filtered.flags & 131072 /* Never */ ? target : filtered;
   }
   function isWeakType(type) {
@@ -67844,17 +67810,18 @@ function createTypeChecker(host) {
     );
   }
   function inferTypeForHomomorphicMappedType(source, target, constraint) {
-    if (inInferTypeForHomomorphicMappedType) {
-      return void 0;
+    const cacheKey = source.id + "," + target.id + "," + constraint.id;
+    if (reverseMappedCache.has(cacheKey)) {
+      return reverseMappedCache.get(cacheKey);
     }
-    const key = source.id + "," + target.id + "," + constraint.id;
-    if (reverseMappedCache.has(key)) {
-      return reverseMappedCache.get(key);
+    const recursionKey = source.id + "," + (target.target || target).id;
+    if (contains(homomorphicMappedTypeInferenceStack, recursionKey)) {
+      return void 0;
     }
-    inInferTypeForHomomorphicMappedType = true;
+    homomorphicMappedTypeInferenceStack.push(recursionKey);
     const type = createReverseMappedType(source, target, constraint);
-    inInferTypeForHomomorphicMappedType = false;
-    reverseMappedCache.set(key, type);
+    homomorphicMappedTypeInferenceStack.pop();
+    reverseMappedCache.set(cacheKey, type);
     return type;
   }
   function isPartiallyInferableType(type) {
@@ -69881,11 +69848,10 @@ function createTypeChecker(host) {
           const assignedType = getWidenedLiteralType(getInitialOrAssignedType(flow));
           return isTypeAssignableTo(assignedType, declaredType) ? assignedType : anyArrayType;
         }
-        const t = isInCompoundLikeAssignment(node) ? getBaseTypeOfLiteralType(declaredType) : declaredType;
-        if (t.flags & 1048576 /* Union */) {
-          return getAssignmentReducedType(t, getInitialOrAssignedType(flow));
+        if (declaredType.flags & 1048576 /* Union */) {
+          return getAssignmentReducedType(declaredType, getInitialOrAssignedType(flow));
         }
-        return t;
+        return declaredType;
       }
       if (containsMatchingReference(reference, node)) {
         if (!isReachableFlowNode(flow)) {
@@ -71014,7 +70980,7 @@ function createTypeChecker(host) {
     const isAlias = localOrExportSymbol.flags & 2097152 /* Alias */;
     if (localOrExportSymbol.flags & 3 /* Variable */) {
       if (assignmentKind === 1 /* Definite */) {
-        return isInCompoundLikeAssignment(node) ? getBaseTypeOfLiteralType(type) : type;
+        return type;
       }
     } else if (isAlias) {
       declaration = getDeclarationOfAliasSymbol(symbol);
@@ -173025,7 +172991,6 @@ __export(ts_exports2, {
   isImportTypeNode: () => isImportTypeNode,
   isImportableFile: () => isImportableFile,
   isInComment: () => isInComment,
-  isInCompoundLikeAssignment: () => isInCompoundLikeAssignment,
   isInExpressionContext: () => isInExpressionContext,
   isInJSDoc: () => isInJSDoc,
   isInJSFile: () => isInJSFile,
@@ -173318,7 +173283,6 @@ __export(ts_exports2, {
   isSetAccessor: () => isSetAccessor,
   isSetAccessorDeclaration: () => isSetAccessorDeclaration,
   isShebangTrivia: () => isShebangTrivia,
-  isShiftOperatorOrHigher: () => isShiftOperatorOrHigher,
   isShorthandAmbientModuleSymbol: () => isShorthandAmbientModuleSymbol,
   isShorthandPropertyAssignment: () => isShorthandPropertyAssignment,
   isSignedNumericLiteral: () => isSignedNumericLiteral,
@@ -187540,7 +187504,6 @@ start(initializeNodeSystem(), require("os").platform());
   isImportTypeNode,
   isImportableFile,
   isInComment,
-  isInCompoundLikeAssignment,
   isInExpressionContext,
   isInJSDoc,
   isInJSFile,
@@ -187833,7 +187796,6 @@ start(initializeNodeSystem(), require("os").platform());
   isSetAccessor,
   isSetAccessorDeclaration,
   isShebangTrivia,
-  isShiftOperatorOrHigher,
   isShorthandAmbientModuleSymbol,
   isShorthandPropertyAssignment,
   isSignedNumericLiteral,

package/lib/tsserverlibrary.js

@@ -14905,8 +14905,8 @@ ${lanes.join("\n")}
         return forStatement.initializer === node && forStatement.initializer.kind !== 261 /* VariableDeclarationList */ || forStatement.condition === node || forStatement.incrementor === node;
       case 249 /* ForInStatement */:
       case 250 /* ForOfStatement */:
-        const forInOrOfStatement = parent2;
-        return forInOrOfStatement.initializer === node && forInOrOfStatement.initializer.kind !== 261 /* VariableDeclarationList */ || forInOrOfStatement.expression === node;
+        const forInStatement = parent2;
+        return forInStatement.initializer === node && forInStatement.initializer.kind !== 261 /* VariableDeclarationList */ || forInStatement.expression === node;
       case 216 /* TypeAssertionExpression */:
       case 234 /* AsExpression */:
         return node === parent2.expression;
@@ -15596,23 +15596,20 @@ ${lanes.join("\n")}
   function hasTypeArguments(node) {
     return !!node.typeArguments;
   }
-  function getAssignmentTarget(node) {
+  function getAssignmentTargetKind(node) {
     let parent2 = node.parent;
     while (true) {
       switch (parent2.kind) {
         case 226 /* BinaryExpression */:
-          const binaryExpression = parent2;
-          const binaryOperator = binaryExpression.operatorToken.kind;
-          return isAssignmentOperator(binaryOperator) && binaryExpression.left === node ? binaryExpression : void 0;
+          const binaryOperator = parent2.operatorToken.kind;
+          return isAssignmentOperator(binaryOperator) && parent2.left === node ? binaryOperator === 64 /* EqualsToken */ || isLogicalOrCoalescingAssignmentOperator(binaryOperator) ? 1 /* Definite */ : 2 /* Compound */ : 0 /* None */;
         case 224 /* PrefixUnaryExpression */:
         case 225 /* PostfixUnaryExpression */:
-          const unaryExpression = parent2;
-          const unaryOperator = unaryExpression.operator;
-          return unaryOperator === 46 /* PlusPlusToken */ || unaryOperator === 47 /* MinusMinusToken */ ? unaryExpression : void 0;
+          const unaryOperator = parent2.operator;
+          return unaryOperator === 46 /* PlusPlusToken */ || unaryOperator === 47 /* MinusMinusToken */ ? 2 /* Compound */ : 0 /* None */;
         case 249 /* ForInStatement */:
         case 250 /* ForOfStatement */:
-          const forInOrOfStatement = parent2;
-          return forInOrOfStatement.initializer === node ? forInOrOfStatement : void 0;
+          return parent2.initializer === node ? 1 /* Definite */ : 0 /* None */;
         case 217 /* ParenthesizedExpression */:
         case 209 /* ArrayLiteralExpression */:
         case 230 /* SpreadElement */:
@@ -15624,53 +15621,24 @@ ${lanes.join("\n")}
           break;
         case 304 /* ShorthandPropertyAssignment */:
           if (parent2.name !== node) {
-            return void 0;
+            return 0 /* None */;
           }
           node = parent2.parent;
           break;
         case 303 /* PropertyAssignment */:
           if (parent2.name === node) {
-            return void 0;
+            return 0 /* None */;
           }
           node = parent2.parent;
           break;
         default:
-          return void 0;
+          return 0 /* None */;
       }
       parent2 = node.parent;
     }
   }
-  function getAssignmentTargetKind(node) {
-    const target = getAssignmentTarget(node);
-    if (!target) {
-      return 0 /* None */;
-    }
-    switch (target.kind) {
-      case 226 /* BinaryExpression */:
-        const binaryOperator = target.operatorToken.kind;
-        return binaryOperator === 64 /* EqualsToken */ || isLogicalOrCoalescingAssignmentOperator(binaryOperator) ? 1 /* Definite */ : 2 /* Compound */;
-      case 224 /* PrefixUnaryExpression */:
-      case 225 /* PostfixUnaryExpression */:
-        return 2 /* Compound */;
-      case 249 /* ForInStatement */:
-      case 250 /* ForOfStatement */:
-        return 1 /* Definite */;
-    }
-  }
   function isAssignmentTarget(node) {
-    return !!getAssignmentTarget(node);
-  }
-  function isCompoundLikeAssignment(assignment) {
-    const right = skipParentheses(assignment.right);
-    return right.kind === 226 /* BinaryExpression */ && isShiftOperatorOrHigher(right.operatorToken.kind);
-  }
-  function isInCompoundLikeAssignment(node) {
-    const target = getAssignmentTarget(node);
-    return !!target && isAssignmentExpression(
-      target,
-      /*excludeCompoundAssignment*/
-      true
-    ) && isCompoundLikeAssignment(target);
+    return getAssignmentTargetKind(node) !== 0 /* None */;
   }
   function isNodeWithPossibleHoistedDeclaration(node) {
     switch (node.kind) {
@@ -46221,7 +46189,7 @@ ${lanes.join("\n")}
     };
     var amalgamatedDuplicates;
     var reverseMappedCache = /* @__PURE__ */ new Map();
-    var inInferTypeForHomomorphicMappedType = false;
+    var homomorphicMappedTypeInferenceStack = [];
     var ambientModulesCache;
     var patternAmbientModules;
     var patternAmbientModuleAugmentations;
@@ -64575,7 +64543,7 @@ ${lanes.join("\n")}
           }
         }
       }
-      const filtered = contains(include, 0 /* False */) ? getUnionType(types.filter((_, i) => include[i])) : target;
+      const filtered = contains(include, 0 /* False */) ? getUnionType(types.filter((_, i) => include[i]), 0 /* None */) : target;
       return filtered.flags & 131072 /* Never */ ? target : filtered;
     }
     function isWeakType(type) {
@@ -65609,17 +65577,18 @@ ${lanes.join("\n")}
       );
     }
     function inferTypeForHomomorphicMappedType(source, target, constraint) {
-      if (inInferTypeForHomomorphicMappedType) {
-        return void 0;
+      const cacheKey = source.id + "," + target.id + "," + constraint.id;
+      if (reverseMappedCache.has(cacheKey)) {
+        return reverseMappedCache.get(cacheKey);
       }
-      const key = source.id + "," + target.id + "," + constraint.id;
-      if (reverseMappedCache.has(key)) {
-        return reverseMappedCache.get(key);
+      const recursionKey = source.id + "," + (target.target || target).id;
+      if (contains(homomorphicMappedTypeInferenceStack, recursionKey)) {
+        return void 0;
       }
-      inInferTypeForHomomorphicMappedType = true;
+      homomorphicMappedTypeInferenceStack.push(recursionKey);
       const type = createReverseMappedType(source, target, constraint);
-      inInferTypeForHomomorphicMappedType = false;
-      reverseMappedCache.set(key, type);
+      homomorphicMappedTypeInferenceStack.pop();
+      reverseMappedCache.set(cacheKey, type);
       return type;
     }
     function isPartiallyInferableType(type) {
@@ -67646,11 +67615,10 @@ ${lanes.join("\n")}
             const assignedType = getWidenedLiteralType(getInitialOrAssignedType(flow));
             return isTypeAssignableTo(assignedType, declaredType) ? assignedType : anyArrayType;
           }
-          const t = isInCompoundLikeAssignment(node) ? getBaseTypeOfLiteralType(declaredType) : declaredType;
-          if (t.flags & 1048576 /* Union */) {
-            return getAssignmentReducedType(t, getInitialOrAssignedType(flow));
+          if (declaredType.flags & 1048576 /* Union */) {
+            return getAssignmentReducedType(declaredType, getInitialOrAssignedType(flow));
           }
-          return t;
+          return declaredType;
         }
         if (containsMatchingReference(reference, node)) {
           if (!isReachableFlowNode(flow)) {
@@ -68779,7 +68747,7 @@ ${lanes.join("\n")}
       const isAlias = localOrExportSymbol.flags & 2097152 /* Alias */;
       if (localOrExportSymbol.flags & 3 /* Variable */) {
         if (assignmentKind === 1 /* Definite */) {
-          return isInCompoundLikeAssignment(node) ? getBaseTypeOfLiteralType(type) : type;
+          return type;
         }
       } else if (isAlias) {
         declaration = getDeclarationOfAliasSymbol(symbol);
@@ -184163,7 +184131,6 @@ ${e.message}`;
     isImportTypeNode: () => isImportTypeNode,
     isImportableFile: () => isImportableFile,
     isInComment: () => isInComment,
-    isInCompoundLikeAssignment: () => isInCompoundLikeAssignment,
     isInExpressionContext: () => isInExpressionContext,
     isInJSDoc: () => isInJSDoc,
     isInJSFile: () => isInJSFile,
@@ -184456,7 +184423,6 @@ ${e.message}`;
     isSetAccessor: () => isSetAccessor,
     isSetAccessorDeclaration: () => isSetAccessorDeclaration,
     isShebangTrivia: () => isShebangTrivia,
-    isShiftOperatorOrHigher: () => isShiftOperatorOrHigher,
     isShorthandAmbientModuleSymbol: () => isShorthandAmbientModuleSymbol,
     isShorthandPropertyAssignment: () => isShorthandPropertyAssignment,
     isSignedNumericLiteral: () => isSignedNumericLiteral,
@@ -186568,7 +186534,6 @@ ${e.message}`;
     isImportTypeNode: () => isImportTypeNode,
     isImportableFile: () => isImportableFile,
     isInComment: () => isInComment,
-    isInCompoundLikeAssignment: () => isInCompoundLikeAssignment,
     isInExpressionContext: () => isInExpressionContext,
     isInJSDoc: () => isInJSDoc,
     isInJSFile: () => isInJSFile,
@@ -186861,7 +186826,6 @@ ${e.message}`;
     isSetAccessor: () => isSetAccessor,
     isSetAccessorDeclaration: () => isSetAccessorDeclaration,
     isShebangTrivia: () => isShebangTrivia,
-    isShiftOperatorOrHigher: () => isShiftOperatorOrHigher,
     isShorthandAmbientModuleSymbol: () => isShorthandAmbientModuleSymbol,
     isShorthandPropertyAssignment: () => isShorthandPropertyAssignment,
     isSignedNumericLiteral: () => isSignedNumericLiteral,

package/lib/typescript.js

@@ -14905,8 +14905,8 @@ ${lanes.join("\n")}
         return forStatement.initializer === node && forStatement.initializer.kind !== 261 /* VariableDeclarationList */ || forStatement.condition === node || forStatement.incrementor === node;
       case 249 /* ForInStatement */:
       case 250 /* ForOfStatement */:
-        const forInOrOfStatement = parent2;
-        return forInOrOfStatement.initializer === node && forInOrOfStatement.initializer.kind !== 261 /* VariableDeclarationList */ || forInOrOfStatement.expression === node;
+        const forInStatement = parent2;
+        return forInStatement.initializer === node && forInStatement.initializer.kind !== 261 /* VariableDeclarationList */ || forInStatement.expression === node;
       case 216 /* TypeAssertionExpression */:
       case 234 /* AsExpression */:
         return node === parent2.expression;
@@ -15596,23 +15596,20 @@ ${lanes.join("\n")}
   function hasTypeArguments(node) {
     return !!node.typeArguments;
   }
-  function getAssignmentTarget(node) {
+  function getAssignmentTargetKind(node) {
     let parent2 = node.parent;
     while (true) {
       switch (parent2.kind) {
         case 226 /* BinaryExpression */:
-          const binaryExpression = parent2;
-          const binaryOperator = binaryExpression.operatorToken.kind;
-          return isAssignmentOperator(binaryOperator) && binaryExpression.left === node ? binaryExpression : void 0;
+          const binaryOperator = parent2.operatorToken.kind;
+          return isAssignmentOperator(binaryOperator) && parent2.left === node ? binaryOperator === 64 /* EqualsToken */ || isLogicalOrCoalescingAssignmentOperator(binaryOperator) ? 1 /* Definite */ : 2 /* Compound */ : 0 /* None */;
         case 224 /* PrefixUnaryExpression */:
         case 225 /* PostfixUnaryExpression */:
-          const unaryExpression = parent2;
-          const unaryOperator = unaryExpression.operator;
-          return unaryOperator === 46 /* PlusPlusToken */ || unaryOperator === 47 /* MinusMinusToken */ ? unaryExpression : void 0;
+          const unaryOperator = parent2.operator;
+          return unaryOperator === 46 /* PlusPlusToken */ || unaryOperator === 47 /* MinusMinusToken */ ? 2 /* Compound */ : 0 /* None */;
         case 249 /* ForInStatement */:
         case 250 /* ForOfStatement */:
-          const forInOrOfStatement = parent2;
-          return forInOrOfStatement.initializer === node ? forInOrOfStatement : void 0;
+          return parent2.initializer === node ? 1 /* Definite */ : 0 /* None */;
         case 217 /* ParenthesizedExpression */:
         case 209 /* ArrayLiteralExpression */:
         case 230 /* SpreadElement */:
@@ -15624,53 +15621,24 @@ ${lanes.join("\n")}
           break;
         case 304 /* ShorthandPropertyAssignment */:
           if (parent2.name !== node) {
-            return void 0;
+            return 0 /* None */;
           }
           node = parent2.parent;
           break;
         case 303 /* PropertyAssignment */:
           if (parent2.name === node) {
-            return void 0;
+            return 0 /* None */;
           }
           node = parent2.parent;
           break;
         default:
-          return void 0;
+          return 0 /* None */;
       }
       parent2 = node.parent;
     }
   }
-  function getAssignmentTargetKind(node) {
-    const target = getAssignmentTarget(node);
-    if (!target) {
-      return 0 /* None */;
-    }
-    switch (target.kind) {
-      case 226 /* BinaryExpression */:
-        const binaryOperator = target.operatorToken.kind;
-        return binaryOperator === 64 /* EqualsToken */ || isLogicalOrCoalescingAssignmentOperator(binaryOperator) ? 1 /* Definite */ : 2 /* Compound */;
-      case 224 /* PrefixUnaryExpression */:
-      case 225 /* PostfixUnaryExpression */:
-        return 2 /* Compound */;
-      case 249 /* ForInStatement */:
-      case 250 /* ForOfStatement */:
-        return 1 /* Definite */;
-    }
-  }
   function isAssignmentTarget(node) {
-    return !!getAssignmentTarget(node);
-  }
-  function isCompoundLikeAssignment(assignment) {
-    const right = skipParentheses(assignment.right);
-    return right.kind === 226 /* BinaryExpression */ && isShiftOperatorOrHigher(right.operatorToken.kind);
-  }
-  function isInCompoundLikeAssignment(node) {
-    const target = getAssignmentTarget(node);
-    return !!target && isAssignmentExpression(
-      target,
-      /*excludeCompoundAssignment*/
-      true
-    ) && isCompoundLikeAssignment(target);
+    return getAssignmentTargetKind(node) !== 0 /* None */;
   }
   function isNodeWithPossibleHoistedDeclaration(node) {
     switch (node.kind) {
@@ -46221,7 +46189,7 @@ ${lanes.join("\n")}
     };
     var amalgamatedDuplicates;
     var reverseMappedCache = /* @__PURE__ */ new Map();
-    var inInferTypeForHomomorphicMappedType = false;
+    var homomorphicMappedTypeInferenceStack = [];
     var ambientModulesCache;
     var patternAmbientModules;
     var patternAmbientModuleAugmentations;
@@ -64575,7 +64543,7 @@ ${lanes.join("\n")}
           }
         }
       }
-      const filtered = contains(include, 0 /* False */) ? getUnionType(types.filter((_, i) => include[i])) : target;
+      const filtered = contains(include, 0 /* False */) ? getUnionType(types.filter((_, i) => include[i]), 0 /* None */) : target;
       return filtered.flags & 131072 /* Never */ ? target : filtered;
     }
     function isWeakType(type) {
@@ -65609,17 +65577,18 @@ ${lanes.join("\n")}
       );
     }
     function inferTypeForHomomorphicMappedType(source, target, constraint) {
-      if (inInferTypeForHomomorphicMappedType) {
-        return void 0;
+      const cacheKey = source.id + "," + target.id + "," + constraint.id;
+      if (reverseMappedCache.has(cacheKey)) {
+        return reverseMappedCache.get(cacheKey);
       }
-      const key = source.id + "," + target.id + "," + constraint.id;
-      if (reverseMappedCache.has(key)) {
-        return reverseMappedCache.get(key);
+      const recursionKey = source.id + "," + (target.target || target).id;
+      if (contains(homomorphicMappedTypeInferenceStack, recursionKey)) {
+        return void 0;
       }
-      inInferTypeForHomomorphicMappedType = true;
+      homomorphicMappedTypeInferenceStack.push(recursionKey);
       const type = createReverseMappedType(source, target, constraint);
-      inInferTypeForHomomorphicMappedType = false;
-      reverseMappedCache.set(key, type);
+      homomorphicMappedTypeInferenceStack.pop();
+      reverseMappedCache.set(cacheKey, type);
       return type;
     }
     function isPartiallyInferableType(type) {
@@ -67646,11 +67615,10 @@ ${lanes.join("\n")}
             const assignedType = getWidenedLiteralType(getInitialOrAssignedType(flow));
             return isTypeAssignableTo(assignedType, declaredType) ? assignedType : anyArrayType;
           }
-          const t = isInCompoundLikeAssignment(node) ? getBaseTypeOfLiteralType(declaredType) : declaredType;
-          if (t.flags & 1048576 /* Union */) {
-            return getAssignmentReducedType(t, getInitialOrAssignedType(flow));
+          if (declaredType.flags & 1048576 /* Union */) {
+            return getAssignmentReducedType(declaredType, getInitialOrAssignedType(flow));
           }
-          return t;
+          return declaredType;
         }
         if (containsMatchingReference(reference, node)) {
           if (!isReachableFlowNode(flow)) {
@@ -68779,7 +68747,7 @@ ${lanes.join("\n")}
       const isAlias = localOrExportSymbol.flags & 2097152 /* Alias */;
       if (localOrExportSymbol.flags & 3 /* Variable */) {
         if (assignmentKind === 1 /* Definite */) {
-          return isInCompoundLikeAssignment(node) ? getBaseTypeOfLiteralType(type) : type;
+          return type;
         }
       } else if (isAlias) {
         declaration = getDeclarationOfAliasSymbol(symbol);
@@ -172785,7 +172753,6 @@ ${options.prefix}` : "\n" : options.prefix
     isImportTypeNode: () => isImportTypeNode,
     isImportableFile: () => isImportableFile,
     isInComment: () => isInComment,
-    isInCompoundLikeAssignment: () => isInCompoundLikeAssignment,
     isInExpressionContext: () => isInExpressionContext,
     isInJSDoc: () => isInJSDoc,
     isInJSFile: () => isInJSFile,
@@ -173078,7 +173045,6 @@ ${options.prefix}` : "\n" : options.prefix
     isSetAccessor: () => isSetAccessor,
     isSetAccessorDeclaration: () => isSetAccessorDeclaration,
     isShebangTrivia: () => isShebangTrivia,
-    isShiftOperatorOrHigher: () => isShiftOperatorOrHigher,
     isShorthandAmbientModuleSymbol: () => isShorthandAmbientModuleSymbol,
     isShorthandPropertyAssignment: () => isShorthandPropertyAssignment,
     isSignedNumericLiteral: () => isSignedNumericLiteral,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.2.0-pr-52493-8",
+  "version": "5.2.0-pr-53647-17",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -115,5 +115,5 @@
     "node": "20.1.0",
     "npm": "8.19.4"
   },
-  "gitHead": "d2eb04a9bf92fb96607b2a314bc382456fee514d"
+  "gitHead": "e7c204e85a9d50cebdfc1716b45a9069ae4f0a27"
 }