@typescript-deploys/pr-build 5.4.0-pr-55842-40 → 5.4.0-pr-57122-21

package/lib/tsc.js

@@ -55315,11 +55315,15 @@ function createTypeChecker(host) {
     return type.resolvedApparentType || (type.resolvedApparentType = getResolvedApparentTypeOfMappedType(type));
   }
   function getResolvedApparentTypeOfMappedType(type) {
-    const typeVariable = getHomomorphicTypeVariable(type);
-    if (typeVariable && !type.declaration.nameType) {
-      const constraint = getConstraintOfTypeParameter(typeVariable);
-      if (constraint && everyType(constraint, isArrayOrTupleType)) {
-        return instantiateType(type, prependTypeMapping(typeVariable, constraint, type.mapper));
+    const target = type.target ?? type;
+    const typeVariable = getHomomorphicTypeVariable(target);
+    if (typeVariable && !target.declaration.nameType) {
+      const constraint = getConstraintTypeFromMappedType(type);
+      if (constraint.flags & 4194304 /* Index */) {
+        const baseConstraint = getBaseConstraintOfType(constraint.type);
+        if (baseConstraint && everyType(baseConstraint, isArrayOrTupleType)) {
+          return instantiateType(target, prependTypeMapping(typeVariable, baseConstraint, type.mapper));
+        }
       }
     }
     return type;
@@ -57358,7 +57362,7 @@ function createTypeChecker(host) {
     return target.objectFlags & 8 /* Tuple */ ? createNormalizedTupleType(target, typeArguments) : createTypeReference(target, typeArguments);
   }
   function createNormalizedTupleType(target, elementTypes) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (!(target.combinedFlags & 14 /* NonRequired */)) {
       return createTypeReference(target, elementTypes);
     }
@@ -57378,8 +57382,10 @@ function createTypeChecker(host) {
       const type = elementTypes[i];
       const flags = target.elementFlags[i];
       if (flags & 8 /* Variadic */) {
-        if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
-          addElement(type, 8 /* Variadic */, (_a = target.labeledElementDeclarations) == null ? void 0 : _a[i]);
+        if (type.flags & 1 /* Any */) {
+          addElement(type, 4 /* Rest */, (_a = target.labeledElementDeclarations) == null ? void 0 : _a[i]);
+        } else if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
+          addElement(type, 8 /* Variadic */, (_b = target.labeledElementDeclarations) == null ? void 0 : _b[i]);
         } else if (isTupleType(type)) {
           const elements = getElementTypes(type);
           if (elements.length + expandedTypes.length >= 1e4) {
@@ -57394,10 +57400,10 @@ function createTypeChecker(host) {
             return addElement(t, type.target.elementFlags[n], (_a2 = type.target.labeledElementDeclarations) == null ? void 0 : _a2[n]);
           });
         } else {
-          addElement(isArrayLikeType(type) && getIndexTypeOfType(type, numberType) || errorType, 4 /* Rest */, (_b = target.labeledElementDeclarations) == null ? void 0 : _b[i]);
+          addElement(isArrayLikeType(type) && getIndexTypeOfType(type, numberType) || errorType, 4 /* Rest */, (_c = target.labeledElementDeclarations) == null ? void 0 : _c[i]);
         }
       } else {
-        addElement(type, flags, (_c = target.labeledElementDeclarations) == null ? void 0 : _c[i]);
+        addElement(type, flags, (_d = target.labeledElementDeclarations) == null ? void 0 : _d[i]);
       }
     }
     for (let i = 0; i < lastRequiredIndex; i++) {
@@ -58408,9 +58414,6 @@ function createTypeChecker(host) {
       if (objectType.flags & (1 /* Any */ | 131072 /* Never */)) {
         return objectType;
       }
-      if (indexType === neverType || indexType === implicitNeverType) {
-        return neverType;
-      }
       const indexInfo = getApplicableIndexInfo(objectType, indexType) || getIndexInfoOfType(objectType, stringType);
       if (indexInfo) {
         if (accessFlags & 2 /* NoIndexSignatures */ && indexInfo.keyType !== numberType) {
@@ -58434,6 +58437,9 @@ function createTypeChecker(host) {
         }
         return indexInfo.type;
       }
+      if (indexType.flags & 131072 /* Never */) {
+        return neverType;
+      }
       if (isJSLiteralType(objectType)) {
         return anyType;
       }
@@ -58692,7 +58698,7 @@ function createTypeChecker(host) {
       return wildcardType;
     }
     objectType = getReducedType(objectType);
-    if (isStringIndexSignatureOnlyType(objectType) && !(indexType.flags & 98304 /* Nullable */) && !(indexType.flags & 131072 /* Never */) && isTypeAssignableToKind(indexType, 4 /* String */ | 8 /* Number */)) {
+    if (isStringIndexSignatureOnlyType(objectType) && !(indexType.flags & 98304 /* Nullable */) && isTypeAssignableToKind(indexType, 4 /* String */ | 8 /* Number */)) {
       indexType = stringType;
     }
     if (compilerOptions.noUncheckedIndexedAccess && accessFlags & 32 /* ExpressionPosition */)
@@ -58761,10 +58767,6 @@ function createTypeChecker(host) {
     }
     return type;
   }
-  function maybeCloneTypeParameter(p) {
-    const constraint = getConstraintOfTypeParameter(p);
-    return constraint && (isGenericObjectType(constraint) || isGenericIndexType(constraint)) ? cloneTypeParameter(p) : p;
-  }
   function isSimpleTupleType(node) {
     return isTupleTypeNode(node) && length(node.elements) > 0 && !some(node.elements, (e) => isOptionalTypeNode(e) || isRestTypeNode(e) || isNamedTupleMember(e) && !!(e.questionToken || e.dotDotDotToken));
   }
@@ -58794,27 +58796,19 @@ function createTypeChecker(host) {
       const checkTypeDeferred = isDeferredType(checkType, checkTuples);
       let combinedMapper;
       if (root.inferTypeParameters) {
-        const freshParams = sameMap(root.inferTypeParameters, maybeCloneTypeParameter);
-        const freshMapper = freshParams !== root.inferTypeParameters ? createTypeMapper(root.inferTypeParameters, freshParams) : void 0;
         const context = createInferenceContext(
-          freshParams,
+          root.inferTypeParameters,
           /*signature*/
           void 0,
           0 /* None */
         );
-        if (freshMapper) {
-          const freshCombinedMapper = combineTypeMappers(mapper, freshMapper);
-          for (let i = 0; i < freshParams.length; i++) {
-            if (freshParams[i] !== root.inferTypeParameters[i]) {
-              freshParams[i].mapper = freshCombinedMapper;
-            }
-          }
+        if (mapper) {
+          context.nonFixingMapper = combineTypeMappers(context.nonFixingMapper, mapper);
         }
         if (!checkTypeDeferred) {
-          inferTypes(context.inferences, checkType, instantiateType(extendsType, freshMapper), 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
+          inferTypes(context.inferences, checkType, extendsType, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
         }
-        const innerMapper = combineTypeMappers(freshMapper, context.mapper);
-        combinedMapper = mapper ? combineTypeMappers(innerMapper, mapper) : innerMapper;
+        combinedMapper = mapper ? combineTypeMappers(context.mapper, mapper) : context.mapper;
       }
       const inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
       if (!checkTypeDeferred && !isDeferredType(inferredExtendsType, checkTuples)) {
@@ -60666,8 +60660,8 @@ function createTypeChecker(host) {
     const paramCount = sourceRestType || targetRestType ? Math.min(sourceCount, targetCount) : Math.max(sourceCount, targetCount);
     const restIndex = sourceRestType || targetRestType ? paramCount - 1 : -1;
     for (let i = 0; i < paramCount; i++) {
-      const sourceType = i === restIndex ? getRestTypeAtPosition(source, i) : tryGetTypeAtPosition(source, i);
-      const targetType = i === restIndex ? getRestTypeAtPosition(target, i) : tryGetTypeAtPosition(target, i);
+      const sourceType = i === restIndex ? getRestOrAnyTypeAtPosition(source, i) : tryGetTypeAtPosition(source, i);
+      const targetType = i === restIndex ? getRestOrAnyTypeAtPosition(target, i) : tryGetTypeAtPosition(target, i);
       if (sourceType && targetType) {
         const sourceSig = checkMode & 3 /* Callback */ || isInstantiatedGenericParameter(source, i) ? void 0 : getSingleCallSignature(getNonNullableType(sourceType));
         const targetSig = checkMode & 3 /* Callback */ || isInstantiatedGenericParameter(target, i) ? void 0 : getSingleCallSignature(getNonNullableType(targetType));
@@ -73670,6 +73664,11 @@ function createTypeChecker(host) {
     }
     return createTupleType(types, flags, readonly, names);
   }
+  function getRestOrAnyTypeAtPosition(source, pos) {
+    const restType = getRestTypeAtPosition(source, pos);
+    const elementType = restType && getElementTypeOfArrayType(restType);
+    return elementType && isTypeAny(elementType) ? anyType : restType;
+  }
   function getParameterCount(signature) {
     const length2 = signature.parameters.length;
     if (signatureHasRestParameter(signature)) {
@@ -73726,7 +73725,7 @@ function createTypeChecker(host) {
     if (signatureHasRestParameter(signature)) {
       const restType = getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]);
       if (!isTupleType(restType)) {
-        return restType;
+        return isTypeAny(restType) ? anyArrayType : restType;
       }
       if (restType.target.hasRestElement) {
         return sliceTupleType(restType, restType.target.fixedLength);

package/lib/tsserver.js

@@ -60059,11 +60059,15 @@ function createTypeChecker(host) {
     return type.resolvedApparentType || (type.resolvedApparentType = getResolvedApparentTypeOfMappedType(type));
   }
   function getResolvedApparentTypeOfMappedType(type) {
-    const typeVariable = getHomomorphicTypeVariable(type);
-    if (typeVariable && !type.declaration.nameType) {
-      const constraint = getConstraintOfTypeParameter(typeVariable);
-      if (constraint && everyType(constraint, isArrayOrTupleType)) {
-        return instantiateType(type, prependTypeMapping(typeVariable, constraint, type.mapper));
+    const target = type.target ?? type;
+    const typeVariable = getHomomorphicTypeVariable(target);
+    if (typeVariable && !target.declaration.nameType) {
+      const constraint = getConstraintTypeFromMappedType(type);
+      if (constraint.flags & 4194304 /* Index */) {
+        const baseConstraint = getBaseConstraintOfType(constraint.type);
+        if (baseConstraint && everyType(baseConstraint, isArrayOrTupleType)) {
+          return instantiateType(target, prependTypeMapping(typeVariable, baseConstraint, type.mapper));
+        }
       }
     }
     return type;
@@ -62102,7 +62106,7 @@ function createTypeChecker(host) {
     return target.objectFlags & 8 /* Tuple */ ? createNormalizedTupleType(target, typeArguments) : createTypeReference(target, typeArguments);
   }
   function createNormalizedTupleType(target, elementTypes) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (!(target.combinedFlags & 14 /* NonRequired */)) {
       return createTypeReference(target, elementTypes);
     }
@@ -62122,8 +62126,10 @@ function createTypeChecker(host) {
       const type = elementTypes[i];
       const flags = target.elementFlags[i];
       if (flags & 8 /* Variadic */) {
-        if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
-          addElement(type, 8 /* Variadic */, (_a = target.labeledElementDeclarations) == null ? void 0 : _a[i]);
+        if (type.flags & 1 /* Any */) {
+          addElement(type, 4 /* Rest */, (_a = target.labeledElementDeclarations) == null ? void 0 : _a[i]);
+        } else if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
+          addElement(type, 8 /* Variadic */, (_b = target.labeledElementDeclarations) == null ? void 0 : _b[i]);
         } else if (isTupleType(type)) {
           const elements = getElementTypes(type);
           if (elements.length + expandedTypes.length >= 1e4) {
@@ -62138,10 +62144,10 @@ function createTypeChecker(host) {
             return addElement(t, type.target.elementFlags[n], (_a2 = type.target.labeledElementDeclarations) == null ? void 0 : _a2[n]);
           });
         } else {
-          addElement(isArrayLikeType(type) && getIndexTypeOfType(type, numberType) || errorType, 4 /* Rest */, (_b = target.labeledElementDeclarations) == null ? void 0 : _b[i]);
+          addElement(isArrayLikeType(type) && getIndexTypeOfType(type, numberType) || errorType, 4 /* Rest */, (_c = target.labeledElementDeclarations) == null ? void 0 : _c[i]);
         }
       } else {
-        addElement(type, flags, (_c = target.labeledElementDeclarations) == null ? void 0 : _c[i]);
+        addElement(type, flags, (_d = target.labeledElementDeclarations) == null ? void 0 : _d[i]);
       }
     }
     for (let i = 0; i < lastRequiredIndex; i++) {
@@ -63152,9 +63158,6 @@ function createTypeChecker(host) {
       if (objectType.flags & (1 /* Any */ | 131072 /* Never */)) {
         return objectType;
       }
-      if (indexType === neverType || indexType === implicitNeverType) {
-        return neverType;
-      }
       const indexInfo = getApplicableIndexInfo(objectType, indexType) || getIndexInfoOfType(objectType, stringType);
       if (indexInfo) {
         if (accessFlags & 2 /* NoIndexSignatures */ && indexInfo.keyType !== numberType) {
@@ -63178,6 +63181,9 @@ function createTypeChecker(host) {
         }
         return indexInfo.type;
       }
+      if (indexType.flags & 131072 /* Never */) {
+        return neverType;
+      }
       if (isJSLiteralType(objectType)) {
         return anyType;
       }
@@ -63436,7 +63442,7 @@ function createTypeChecker(host) {
       return wildcardType;
     }
     objectType = getReducedType(objectType);
-    if (isStringIndexSignatureOnlyType(objectType) && !(indexType.flags & 98304 /* Nullable */) && !(indexType.flags & 131072 /* Never */) && isTypeAssignableToKind(indexType, 4 /* String */ | 8 /* Number */)) {
+    if (isStringIndexSignatureOnlyType(objectType) && !(indexType.flags & 98304 /* Nullable */) && isTypeAssignableToKind(indexType, 4 /* String */ | 8 /* Number */)) {
       indexType = stringType;
     }
     if (compilerOptions.noUncheckedIndexedAccess && accessFlags & 32 /* ExpressionPosition */)
@@ -63505,10 +63511,6 @@ function createTypeChecker(host) {
     }
     return type;
   }
-  function maybeCloneTypeParameter(p) {
-    const constraint = getConstraintOfTypeParameter(p);
-    return constraint && (isGenericObjectType(constraint) || isGenericIndexType(constraint)) ? cloneTypeParameter(p) : p;
-  }
   function isSimpleTupleType(node) {
     return isTupleTypeNode(node) && length(node.elements) > 0 && !some(node.elements, (e) => isOptionalTypeNode(e) || isRestTypeNode(e) || isNamedTupleMember(e) && !!(e.questionToken || e.dotDotDotToken));
   }
@@ -63538,27 +63540,19 @@ function createTypeChecker(host) {
       const checkTypeDeferred = isDeferredType(checkType, checkTuples);
       let combinedMapper;
       if (root.inferTypeParameters) {
-        const freshParams = sameMap(root.inferTypeParameters, maybeCloneTypeParameter);
-        const freshMapper = freshParams !== root.inferTypeParameters ? createTypeMapper(root.inferTypeParameters, freshParams) : void 0;
         const context = createInferenceContext(
-          freshParams,
+          root.inferTypeParameters,
           /*signature*/
           void 0,
           0 /* None */
         );
-        if (freshMapper) {
-          const freshCombinedMapper = combineTypeMappers(mapper, freshMapper);
-          for (let i = 0; i < freshParams.length; i++) {
-            if (freshParams[i] !== root.inferTypeParameters[i]) {
-              freshParams[i].mapper = freshCombinedMapper;
-            }
-          }
+        if (mapper) {
+          context.nonFixingMapper = combineTypeMappers(context.nonFixingMapper, mapper);
         }
         if (!checkTypeDeferred) {
-          inferTypes(context.inferences, checkType, instantiateType(extendsType, freshMapper), 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
+          inferTypes(context.inferences, checkType, extendsType, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
         }
-        const innerMapper = combineTypeMappers(freshMapper, context.mapper);
-        combinedMapper = mapper ? combineTypeMappers(innerMapper, mapper) : innerMapper;
+        combinedMapper = mapper ? combineTypeMappers(context.mapper, mapper) : context.mapper;
       }
       const inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
       if (!checkTypeDeferred && !isDeferredType(inferredExtendsType, checkTuples)) {
@@ -65410,8 +65404,8 @@ function createTypeChecker(host) {
     const paramCount = sourceRestType || targetRestType ? Math.min(sourceCount, targetCount) : Math.max(sourceCount, targetCount);
     const restIndex = sourceRestType || targetRestType ? paramCount - 1 : -1;
     for (let i = 0; i < paramCount; i++) {
-      const sourceType = i === restIndex ? getRestTypeAtPosition(source, i) : tryGetTypeAtPosition(source, i);
-      const targetType = i === restIndex ? getRestTypeAtPosition(target, i) : tryGetTypeAtPosition(target, i);
+      const sourceType = i === restIndex ? getRestOrAnyTypeAtPosition(source, i) : tryGetTypeAtPosition(source, i);
+      const targetType = i === restIndex ? getRestOrAnyTypeAtPosition(target, i) : tryGetTypeAtPosition(target, i);
       if (sourceType && targetType) {
         const sourceSig = checkMode & 3 /* Callback */ || isInstantiatedGenericParameter(source, i) ? void 0 : getSingleCallSignature(getNonNullableType(sourceType));
         const targetSig = checkMode & 3 /* Callback */ || isInstantiatedGenericParameter(target, i) ? void 0 : getSingleCallSignature(getNonNullableType(targetType));
@@ -78414,6 +78408,11 @@ function createTypeChecker(host) {
     }
     return createTupleType(types, flags, readonly, names);
   }
+  function getRestOrAnyTypeAtPosition(source, pos) {
+    const restType = getRestTypeAtPosition(source, pos);
+    const elementType = restType && getElementTypeOfArrayType(restType);
+    return elementType && isTypeAny(elementType) ? anyType : restType;
+  }
   function getParameterCount(signature) {
     const length2 = signature.parameters.length;
     if (signatureHasRestParameter(signature)) {
@@ -78470,7 +78469,7 @@ function createTypeChecker(host) {
     if (signatureHasRestParameter(signature)) {
       const restType = getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]);
       if (!isTupleType(restType)) {
-        return restType;
+        return isTypeAny(restType) ? anyArrayType : restType;
       }
       if (restType.target.hasRestElement) {
         return sliceTupleType(restType, restType.target.fixedLength);
@@ -162293,7 +162292,7 @@ function isClassMemberCompletionKeyword(kind) {
   }
 }
 function isFunctionLikeBodyKeyword(kind) {
-  return kind === 134 /* AsyncKeyword */ || kind === 135 /* AwaitKeyword */ || kind === 130 /* AsKeyword */ || kind === 152 /* SatisfiesKeyword */ || kind === 156 /* TypeKeyword */ || !isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
+  return kind === 134 /* AsyncKeyword */ || kind === 135 /* AwaitKeyword */ || kind === 160 /* UsingKeyword */ || kind === 130 /* AsKeyword */ || kind === 152 /* SatisfiesKeyword */ || kind === 156 /* TypeKeyword */ || !isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
 }
 function keywordForNode(node) {
   return isIdentifier(node) ? identifierToKeywordKind(node) ?? 0 /* Unknown */ : node.kind;

package/lib/typescript.js

@@ -57814,11 +57814,15 @@ ${lanes.join("\n")}
       return type.resolvedApparentType || (type.resolvedApparentType = getResolvedApparentTypeOfMappedType(type));
     }
     function getResolvedApparentTypeOfMappedType(type) {
-      const typeVariable = getHomomorphicTypeVariable(type);
-      if (typeVariable && !type.declaration.nameType) {
-        const constraint = getConstraintOfTypeParameter(typeVariable);
-        if (constraint && everyType(constraint, isArrayOrTupleType)) {
-          return instantiateType(type, prependTypeMapping(typeVariable, constraint, type.mapper));
+      const target = type.target ?? type;
+      const typeVariable = getHomomorphicTypeVariable(target);
+      if (typeVariable && !target.declaration.nameType) {
+        const constraint = getConstraintTypeFromMappedType(type);
+        if (constraint.flags & 4194304 /* Index */) {
+          const baseConstraint = getBaseConstraintOfType(constraint.type);
+          if (baseConstraint && everyType(baseConstraint, isArrayOrTupleType)) {
+            return instantiateType(target, prependTypeMapping(typeVariable, baseConstraint, type.mapper));
+          }
         }
       }
       return type;
@@ -59857,7 +59861,7 @@ ${lanes.join("\n")}
       return target.objectFlags & 8 /* Tuple */ ? createNormalizedTupleType(target, typeArguments) : createTypeReference(target, typeArguments);
     }
     function createNormalizedTupleType(target, elementTypes) {
-      var _a, _b, _c;
+      var _a, _b, _c, _d;
       if (!(target.combinedFlags & 14 /* NonRequired */)) {
         return createTypeReference(target, elementTypes);
       }
@@ -59877,8 +59881,10 @@ ${lanes.join("\n")}
         const type = elementTypes[i];
         const flags = target.elementFlags[i];
         if (flags & 8 /* Variadic */) {
-          if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
-            addElement(type, 8 /* Variadic */, (_a = target.labeledElementDeclarations) == null ? void 0 : _a[i]);
+          if (type.flags & 1 /* Any */) {
+            addElement(type, 4 /* Rest */, (_a = target.labeledElementDeclarations) == null ? void 0 : _a[i]);
+          } else if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
+            addElement(type, 8 /* Variadic */, (_b = target.labeledElementDeclarations) == null ? void 0 : _b[i]);
           } else if (isTupleType(type)) {
             const elements = getElementTypes(type);
             if (elements.length + expandedTypes.length >= 1e4) {
@@ -59893,10 +59899,10 @@ ${lanes.join("\n")}
               return addElement(t, type.target.elementFlags[n], (_a2 = type.target.labeledElementDeclarations) == null ? void 0 : _a2[n]);
             });
           } else {
-            addElement(isArrayLikeType(type) && getIndexTypeOfType(type, numberType) || errorType, 4 /* Rest */, (_b = target.labeledElementDeclarations) == null ? void 0 : _b[i]);
+            addElement(isArrayLikeType(type) && getIndexTypeOfType(type, numberType) || errorType, 4 /* Rest */, (_c = target.labeledElementDeclarations) == null ? void 0 : _c[i]);
           }
         } else {
-          addElement(type, flags, (_c = target.labeledElementDeclarations) == null ? void 0 : _c[i]);
+          addElement(type, flags, (_d = target.labeledElementDeclarations) == null ? void 0 : _d[i]);
         }
       }
       for (let i = 0; i < lastRequiredIndex; i++) {
@@ -60907,9 +60913,6 @@ ${lanes.join("\n")}
         if (objectType.flags & (1 /* Any */ | 131072 /* Never */)) {
           return objectType;
         }
-        if (indexType === neverType || indexType === implicitNeverType) {
-          return neverType;
-        }
         const indexInfo = getApplicableIndexInfo(objectType, indexType) || getIndexInfoOfType(objectType, stringType);
         if (indexInfo) {
           if (accessFlags & 2 /* NoIndexSignatures */ && indexInfo.keyType !== numberType) {
@@ -60933,6 +60936,9 @@ ${lanes.join("\n")}
           }
           return indexInfo.type;
         }
+        if (indexType.flags & 131072 /* Never */) {
+          return neverType;
+        }
         if (isJSLiteralType(objectType)) {
           return anyType;
         }
@@ -61191,7 +61197,7 @@ ${lanes.join("\n")}
         return wildcardType;
       }
       objectType = getReducedType(objectType);
-      if (isStringIndexSignatureOnlyType(objectType) && !(indexType.flags & 98304 /* Nullable */) && !(indexType.flags & 131072 /* Never */) && isTypeAssignableToKind(indexType, 4 /* String */ | 8 /* Number */)) {
+      if (isStringIndexSignatureOnlyType(objectType) && !(indexType.flags & 98304 /* Nullable */) && isTypeAssignableToKind(indexType, 4 /* String */ | 8 /* Number */)) {
         indexType = stringType;
       }
       if (compilerOptions.noUncheckedIndexedAccess && accessFlags & 32 /* ExpressionPosition */)
@@ -61260,10 +61266,6 @@ ${lanes.join("\n")}
       }
       return type;
     }
-    function maybeCloneTypeParameter(p) {
-      const constraint = getConstraintOfTypeParameter(p);
-      return constraint && (isGenericObjectType(constraint) || isGenericIndexType(constraint)) ? cloneTypeParameter(p) : p;
-    }
     function isSimpleTupleType(node) {
       return isTupleTypeNode(node) && length(node.elements) > 0 && !some(node.elements, (e) => isOptionalTypeNode(e) || isRestTypeNode(e) || isNamedTupleMember(e) && !!(e.questionToken || e.dotDotDotToken));
     }
@@ -61293,27 +61295,19 @@ ${lanes.join("\n")}
         const checkTypeDeferred = isDeferredType(checkType, checkTuples);
         let combinedMapper;
         if (root.inferTypeParameters) {
-          const freshParams = sameMap(root.inferTypeParameters, maybeCloneTypeParameter);
-          const freshMapper = freshParams !== root.inferTypeParameters ? createTypeMapper(root.inferTypeParameters, freshParams) : void 0;
           const context = createInferenceContext(
-            freshParams,
+            root.inferTypeParameters,
             /*signature*/
             void 0,
             0 /* None */
           );
-          if (freshMapper) {
-            const freshCombinedMapper = combineTypeMappers(mapper, freshMapper);
-            for (let i = 0; i < freshParams.length; i++) {
-              if (freshParams[i] !== root.inferTypeParameters[i]) {
-                freshParams[i].mapper = freshCombinedMapper;
-              }
-            }
+          if (mapper) {
+            context.nonFixingMapper = combineTypeMappers(context.nonFixingMapper, mapper);
           }
           if (!checkTypeDeferred) {
-            inferTypes(context.inferences, checkType, instantiateType(extendsType, freshMapper), 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
+            inferTypes(context.inferences, checkType, extendsType, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
           }
-          const innerMapper = combineTypeMappers(freshMapper, context.mapper);
-          combinedMapper = mapper ? combineTypeMappers(innerMapper, mapper) : innerMapper;
+          combinedMapper = mapper ? combineTypeMappers(context.mapper, mapper) : context.mapper;
         }
         const inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
         if (!checkTypeDeferred && !isDeferredType(inferredExtendsType, checkTuples)) {
@@ -63165,8 +63159,8 @@ ${lanes.join("\n")}
       const paramCount = sourceRestType || targetRestType ? Math.min(sourceCount, targetCount) : Math.max(sourceCount, targetCount);
       const restIndex = sourceRestType || targetRestType ? paramCount - 1 : -1;
       for (let i = 0; i < paramCount; i++) {
-        const sourceType = i === restIndex ? getRestTypeAtPosition(source, i) : tryGetTypeAtPosition(source, i);
-        const targetType = i === restIndex ? getRestTypeAtPosition(target, i) : tryGetTypeAtPosition(target, i);
+        const sourceType = i === restIndex ? getRestOrAnyTypeAtPosition(source, i) : tryGetTypeAtPosition(source, i);
+        const targetType = i === restIndex ? getRestOrAnyTypeAtPosition(target, i) : tryGetTypeAtPosition(target, i);
         if (sourceType && targetType) {
           const sourceSig = checkMode & 3 /* Callback */ || isInstantiatedGenericParameter(source, i) ? void 0 : getSingleCallSignature(getNonNullableType(sourceType));
           const targetSig = checkMode & 3 /* Callback */ || isInstantiatedGenericParameter(target, i) ? void 0 : getSingleCallSignature(getNonNullableType(targetType));
@@ -76169,6 +76163,11 @@ ${lanes.join("\n")}
       }
       return createTupleType(types, flags, readonly, names);
     }
+    function getRestOrAnyTypeAtPosition(source, pos) {
+      const restType = getRestTypeAtPosition(source, pos);
+      const elementType = restType && getElementTypeOfArrayType(restType);
+      return elementType && isTypeAny(elementType) ? anyType : restType;
+    }
     function getParameterCount(signature) {
       const length2 = signature.parameters.length;
       if (signatureHasRestParameter(signature)) {
@@ -76225,7 +76224,7 @@ ${lanes.join("\n")}
       if (signatureHasRestParameter(signature)) {
         const restType = getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]);
         if (!isTupleType(restType)) {
-          return restType;
+          return isTypeAny(restType) ? anyArrayType : restType;
         }
         if (restType.target.hasRestElement) {
           return sliceTupleType(restType, restType.target.fixedLength);
@@ -161494,7 +161493,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
   }
   function isFunctionLikeBodyKeyword(kind) {
-    return kind === 134 /* AsyncKeyword */ || kind === 135 /* AwaitKeyword */ || kind === 130 /* AsKeyword */ || kind === 152 /* SatisfiesKeyword */ || kind === 156 /* TypeKeyword */ || !isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
+    return kind === 134 /* AsyncKeyword */ || kind === 135 /* AwaitKeyword */ || kind === 160 /* UsingKeyword */ || kind === 130 /* AsKeyword */ || kind === 152 /* SatisfiesKeyword */ || kind === 156 /* TypeKeyword */ || !isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
   }
   function keywordForNode(node) {
     return isIdentifier(node) ? identifierToKeywordKind(node) ?? 0 /* Unknown */ : node.kind;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.4.0-pr-55842-40",
+  "version": "5.4.0-pr-57122-21",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -114,5 +114,5 @@
     "node": "20.1.0",
     "npm": "8.19.4"
   },
-  "gitHead": "96388867c1d18a4e26cb7de47c9bda73d9b4f1ec"
+  "gitHead": "93545ceac9895b9869d310cec38b7cee6eb8e4a8"
 }