typescript 5.4.0-dev.20231130 → 5.4.0-dev.20231201

package/lib/lib.es2020.string.d.ts

@@ -24,7 +24,7 @@ interface String {
      * containing the results of that search.
      * @param regexp A variable name or string literal containing the regular expression pattern and flags.
      */
-    matchAll(regexp: RegExp): IterableIterator<RegExpMatchArray>;
+    matchAll(regexp: RegExp): IterableIterator<RegExpExecArray>;
 
     /** Converts all alphabetic characters to lowercase, taking into account the host environment's current locale. */
     toLocaleLowerCase(locales?: Intl.LocalesArgument): string;

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20231130`;
+var version = `${versionMajorMinor}.0-dev.20231201`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -3671,6 +3671,7 @@ var TypeFlags = /* @__PURE__ */ ((TypeFlags2) => {
   TypeFlags2[TypeFlags2["IncludesWildcard"] = 8388608 /* IndexedAccess */] = "IncludesWildcard";
   TypeFlags2[TypeFlags2["IncludesEmptyObject"] = 16777216 /* Conditional */] = "IncludesEmptyObject";
   TypeFlags2[TypeFlags2["IncludesInstantiable"] = 33554432 /* Substitution */] = "IncludesInstantiable";
+  TypeFlags2[TypeFlags2["IncludesConstrainedTypeVariable"] = 268435456 /* StringMapping */] = "IncludesConstrainedTypeVariable";
   TypeFlags2[TypeFlags2["NotPrimitiveUnion"] = 36323331] = "NotPrimitiveUnion";
   return TypeFlags2;
 })(TypeFlags || {});
@@ -3717,6 +3718,7 @@ var ObjectFlags = /* @__PURE__ */ ((ObjectFlags3) => {
   ObjectFlags3[ObjectFlags3["IsUnknownLikeUnion"] = 67108864] = "IsUnknownLikeUnion";
   ObjectFlags3[ObjectFlags3["IsNeverIntersectionComputed"] = 16777216] = "IsNeverIntersectionComputed";
   ObjectFlags3[ObjectFlags3["IsNeverIntersection"] = 33554432] = "IsNeverIntersection";
+  ObjectFlags3[ObjectFlags3["IsConstrainedTypeVariable"] = 67108864] = "IsConstrainedTypeVariable";
   return ObjectFlags3;
 })(ObjectFlags || {});
 var SignatureFlags = /* @__PURE__ */ ((SignatureFlags4) => {
@@ -46974,6 +46976,10 @@ function createTypeChecker(host) {
   function getParentOfSymbol(symbol) {
     return getMergedSymbol(symbol.parent && getLateBoundSymbol(symbol.parent));
   }
+  function getFunctionExpressionParentSymbolOrSymbol(symbol) {
+    var _a, _b;
+    return ((_a = symbol.valueDeclaration) == null ? void 0 : _a.kind) === 219 /* ArrowFunction */ || ((_b = symbol.valueDeclaration) == null ? void 0 : _b.kind) === 218 /* FunctionExpression */ ? getSymbolOfNode(symbol.valueDeclaration.parent) || symbol : symbol;
+  }
   function getAlternativeContainingModules(symbol, enclosingDeclaration) {
     const containingFile = getSourceFileOfNode(enclosingDeclaration);
     const id = getNodeId(containingFile);
@@ -52197,11 +52203,14 @@ function createTypeChecker(host) {
       }
     }
     if ((_a = symbol.parent) == null ? void 0 : _a.valueDeclaration) {
-      const typeNode2 = getEffectiveTypeAnnotationNode(symbol.parent.valueDeclaration);
-      if (typeNode2) {
-        const annotationSymbol = getPropertyOfType(getTypeFromTypeNode(typeNode2), symbol.escapedName);
-        if (annotationSymbol) {
-          return getNonMissingTypeOfSymbol(annotationSymbol);
+      const possiblyAnnotatedSymbol = getFunctionExpressionParentSymbolOrSymbol(symbol.parent);
+      if (possiblyAnnotatedSymbol.valueDeclaration) {
+        const typeNode2 = getEffectiveTypeAnnotationNode(possiblyAnnotatedSymbol.valueDeclaration);
+        if (typeNode2) {
+          const annotationSymbol = getPropertyOfType(getTypeFromTypeNode(typeNode2), symbol.escapedName);
+          if (annotationSymbol) {
+            return getNonMissingTypeOfSymbol(annotationSymbol);
+          }
         }
       }
     }
@@ -53501,7 +53510,6 @@ function createTypeChecker(host) {
     return links.resolvedSymbol;
   }
   function getResolvedMembersOrExportsOfSymbol(symbol, resolutionKind) {
-    var _a, _b, _c;
     const links = getSymbolLinks(symbol);
     if (!links[resolutionKind]) {
       const isStatic2 = resolutionKind === "resolvedExports" /* resolvedExports */;
@@ -53520,7 +53528,7 @@ function createTypeChecker(host) {
           }
         }
       }
-      const assignments = (((_a = symbol.valueDeclaration) == null ? void 0 : _a.kind) === 219 /* ArrowFunction */ || ((_b = symbol.valueDeclaration) == null ? void 0 : _b.kind) === 218 /* FunctionExpression */) && ((_c = getSymbolOfNode(symbol.valueDeclaration.parent)) == null ? void 0 : _c.assignmentDeclarationMembers) || symbol.assignmentDeclarationMembers;
+      const assignments = getFunctionExpressionParentSymbolOrSymbol(symbol).assignmentDeclarationMembers;
       if (assignments) {
         const decls = arrayFrom(assignments.values());
         for (const member of decls) {
@@ -53817,6 +53825,15 @@ function createTypeChecker(host) {
     let result;
     for (let i = 0; i < signatureLists.length; i++) {
       const match = i === listIndex ? signature : findMatchingSignature(
+        signatureLists[i],
+        signature,
+        /*partialMatch*/
+        false,
+        /*ignoreThisTypes*/
+        false,
+        /*ignoreReturnTypes*/
+        true
+      ) || findMatchingSignature(
         signatureLists[i],
         signature,
         /*partialMatch*/
@@ -54190,6 +54207,18 @@ function createTypeChecker(host) {
   function replaceIndexedAccess(instantiable, type, replacement) {
     return instantiateType(instantiable, createTypeMapper([type.indexType, type.objectType], [getNumberLiteralType(0), createTupleType([replacement])]));
   }
+  function getLimitedConstraint(type) {
+    const constraint = getConstraintTypeFromMappedType(type.mappedType);
+    if (!(constraint.flags & 1048576 /* Union */ || constraint.flags & 2097152 /* Intersection */)) {
+      return;
+    }
+    const origin = constraint.flags & 1048576 /* Union */ ? constraint.origin : constraint;
+    if (!origin || !(origin.flags & 2097152 /* Intersection */)) {
+      return;
+    }
+    const limitedConstraint = getIntersectionType(origin.types.filter((t) => t !== type.constraintType));
+    return limitedConstraint !== neverType ? limitedConstraint : void 0;
+  }
   function resolveReverseMappedTypeMembers(type) {
     const indexInfo = getIndexInfoOfType(type.source, stringType);
     const modifiers = getMappedTypeModifiers(type.mappedType);
@@ -54197,7 +54226,14 @@ function createTypeChecker(host) {
     const optionalMask = modifiers & 4 /* IncludeOptional */ ? 0 : 16777216 /* Optional */;
     const indexInfos = indexInfo ? [createIndexInfo(stringType, inferReverseMappedType(indexInfo.type, type.mappedType, type.constraintType), readonlyMask && indexInfo.isReadonly)] : emptyArray;
     const members = createSymbolTable();
+    const limitedConstraint = getLimitedConstraint(type);
     for (const prop of getPropertiesOfType(type.source)) {
+      if (limitedConstraint) {
+        const propertyNameType = getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */);
+        if (!isTypeAssignableTo(propertyNameType, limitedConstraint)) {
+          continue;
+        }
+      }
       const checkFlags = 8192 /* ReverseMapped */ | (readonlyMask && isReadonlySymbol(prop) ? 8 /* Readonly */ : 0);
       const inferredProp = createSymbol(4 /* Property */ | prop.flags & optionalMask, prop.escapedName, checkFlags);
       inferredProp.declarations = prop.declarations;
@@ -54278,7 +54314,7 @@ function createTypeChecker(host) {
     const constraintType = getConstraintTypeFromMappedType(type);
     const mappedType = type.target || type;
     const nameType = getNameTypeFromMappedType(mappedType);
-    const shouldLinkPropDeclarations = !nameType || isFilteringMappedType(mappedType);
+    const shouldLinkPropDeclarations = getMappedTypeNameTypeKind(mappedType) !== 2 /* Remapping */;
     const templateType = getTemplateTypeFromMappedType(mappedType);
     const modifiersType = getApparentType(getModifiersTypeFromMappedType(type));
     const templateModifiers = getMappedTypeModifiers(type);
@@ -54420,9 +54456,12 @@ function createTypeChecker(host) {
     }
     return false;
   }
-  function isFilteringMappedType(type) {
+  function getMappedTypeNameTypeKind(type) {
     const nameType = getNameTypeFromMappedType(type);
-    return !!nameType && isTypeAssignableTo(nameType, getTypeParameterFromMappedType(type));
+    if (!nameType) {
+      return 0 /* None */;
+    }
+    return isTypeAssignableTo(nameType, getTypeParameterFromMappedType(type)) ? 1 /* Filtering */ : 2 /* Remapping */;
   }
   function resolveStructuredTypeMembers(type) {
     if (!type.members) {
@@ -56958,6 +56997,8 @@ function createTypeChecker(host) {
       includes |= flags & 473694207 /* IncludesMask */;
       if (flags & 465829888 /* Instantiable */)
         includes |= 33554432 /* IncludesInstantiable */;
+      if (flags & 2097152 /* Intersection */ && getObjectFlags(type) & 67108864 /* IsConstrainedTypeVariable */)
+        includes |= 268435456 /* IncludesConstrainedTypeVariable */;
       if (type === wildcardType)
         includes |= 8388608 /* IncludesWildcard */;
       if (!strictNullChecks && flags & 98304 /* Nullable */) {
@@ -57062,6 +57103,41 @@ function createTypeChecker(host) {
       }
     }
   }
+  function removeConstrainedTypeVariables(types) {
+    const typeVariables = [];
+    for (const type of types) {
+      if (getObjectFlags(type) & 67108864 /* IsConstrainedTypeVariable */) {
+        const index = type.types[0].flags & 8650752 /* TypeVariable */ ? 0 : 1;
+        pushIfUnique(typeVariables, type.types[index]);
+      }
+    }
+    for (const typeVariable of typeVariables) {
+      const primitives = [];
+      for (const type of types) {
+        if (getObjectFlags(type) & 67108864 /* IsConstrainedTypeVariable */) {
+          const index = type.types[0].flags & 8650752 /* TypeVariable */ ? 0 : 1;
+          if (type.types[index] === typeVariable) {
+            insertType(primitives, type.types[1 - index]);
+          }
+        }
+      }
+      const constraint = getBaseConstraintOfType(typeVariable);
+      if (everyType(constraint, (t) => containsType(primitives, t))) {
+        let i = types.length;
+        while (i > 0) {
+          i--;
+          const type = types[i];
+          if (getObjectFlags(type) & 67108864 /* IsConstrainedTypeVariable */) {
+            const index = type.types[0].flags & 8650752 /* TypeVariable */ ? 0 : 1;
+            if (type.types[index] === typeVariable && containsType(primitives, type.types[1 - index])) {
+              orderedRemoveItemAt(types, i);
+            }
+          }
+        }
+        insertType(types, typeVariable);
+      }
+    }
+  }
   function isNamedUnionType(type) {
     return !!(type.flags & 1048576 /* Union */ && (type.aliasSymbol || type.origin));
   }
@@ -57127,6 +57203,9 @@ function createTypeChecker(host) {
       if (includes & 128 /* StringLiteral */ && includes & 134217728 /* TemplateLiteral */) {
         removeStringLiteralsMatchedByTemplateLiterals(typeSet);
       }
+      if (includes & 268435456 /* IncludesConstrainedTypeVariable */) {
+        removeConstrainedTypeVariables(typeSet);
+      }
       if (unionReduction === 2 /* Subtype */) {
         typeSet = removeSubtypes(typeSet, !!(includes & 524288 /* Object */));
         if (!typeSet) {
@@ -57339,9 +57418,9 @@ function createTypeChecker(host) {
     types[index] = getUnionTypeFromSortedList(result, 32768 /* PrimitiveUnion */);
     return true;
   }
-  function createIntersectionType(types, aliasSymbol, aliasTypeArguments) {
+  function createIntersectionType(types, objectFlags, aliasSymbol, aliasTypeArguments) {
     const result = createType(2097152 /* Intersection */);
-    result.objectFlags = getPropagatingFlagsOfTypes(
+    result.objectFlags = objectFlags | getPropagatingFlagsOfTypes(
       types,
       /*excludeKinds*/
       98304 /* Nullable */
@@ -57355,6 +57434,7 @@ function createTypeChecker(host) {
     const typeMembershipMap = /* @__PURE__ */ new Map();
     const includes = addTypesToIntersection(typeMembershipMap, 0, types);
     const typeSet = arrayFrom(typeMembershipMap.values());
+    let objectFlags = 0 /* None */;
     if (includes & 131072 /* Never */) {
       return contains(typeSet, silentNeverType) ? silentNeverType : neverType;
     }
@@ -57383,6 +57463,25 @@ function createTypeChecker(host) {
     if (typeSet.length === 1) {
       return typeSet[0];
     }
+    if (typeSet.length === 2) {
+      const typeVarIndex = typeSet[0].flags & 8650752 /* TypeVariable */ ? 0 : 1;
+      const typeVariable = typeSet[typeVarIndex];
+      const primitiveType = typeSet[1 - typeVarIndex];
+      if (typeVariable.flags & 8650752 /* TypeVariable */ && (primitiveType.flags & (402784252 /* Primitive */ | 67108864 /* NonPrimitive */) || includes & 16777216 /* IncludesEmptyObject */)) {
+        const constraint = getBaseConstraintOfType(typeVariable);
+        if (constraint && everyType(constraint, (t) => !!(t.flags & (402784252 /* Primitive */ | 67108864 /* NonPrimitive */)) || isEmptyAnonymousObjectType(t))) {
+          if (isTypeStrictSubtypeOf(constraint, primitiveType)) {
+            return typeVariable;
+          }
+          if (!(constraint.flags & 1048576 /* Union */ && someType(constraint, (c) => isTypeStrictSubtypeOf(c, primitiveType)))) {
+            if (!isTypeStrictSubtypeOf(primitiveType, constraint)) {
+              return neverType;
+            }
+          }
+          objectFlags = 67108864 /* IsConstrainedTypeVariable */;
+        }
+      }
+    }
     const id = getTypeListId(typeSet) + getAliasId(aliasSymbol, aliasTypeArguments);
     let result = intersectionTypes.get(id);
     if (!result) {
@@ -57405,7 +57504,7 @@ function createTypeChecker(host) {
           result = getUnionType(constituents, 1 /* Literal */, aliasSymbol, aliasTypeArguments, origin);
         }
       } else {
-        result = createIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
+        result = createIntersectionType(typeSet, objectFlags, aliasSymbol, aliasTypeArguments);
       }
       intersectionTypes.set(id, result);
     }
@@ -57562,7 +57661,7 @@ function createTypeChecker(host) {
     );
   }
   function shouldDeferIndexType(type, indexFlags = 0 /* None */) {
-    return !!(type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericTupleType(type) || isGenericMappedType(type) && !hasDistributiveNameType(type) || type.flags & 1048576 /* Union */ && !(indexFlags & 4 /* NoReducibleCheck */) && isGenericReducibleType(type) || type.flags & 2097152 /* Intersection */ && maybeTypeOfKind(type, 465829888 /* Instantiable */) && some(type.types, isEmptyAnonymousObjectType));
+    return !!(type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericTupleType(type) || isGenericMappedType(type) && (!hasDistributiveNameType(type) || getMappedTypeNameTypeKind(type) === 2 /* Remapping */) || type.flags & 1048576 /* Union */ && !(indexFlags & 4 /* NoReducibleCheck */) && isGenericReducibleType(type) || type.flags & 2097152 /* Intersection */ && maybeTypeOfKind(type, 465829888 /* Instantiable */) && some(type.types, isEmptyAnonymousObjectType));
   }
   function getIndexType(type, indexFlags = defaultIndexFlags) {
     type = getReducedType(type);
@@ -58046,7 +58145,7 @@ function createTypeChecker(host) {
       }
     }
     if (isGenericMappedType(objectType)) {
-      if (!getNameTypeFromMappedType(objectType) || isFilteringMappedType(objectType)) {
+      if (getMappedTypeNameTypeKind(objectType) !== 2 /* Remapping */) {
         return type[cache] = mapType(substituteIndexedMappedType(objectType, type.indexType), (t) => getSimplifiedType(t, writing));
       }
     }
@@ -64098,7 +64197,8 @@ function createTypeChecker(host) {
           source = getIntersectionType(sources);
           target = getIntersectionType(targets);
         }
-      } else if (target.flags & (8388608 /* IndexedAccess */ | 33554432 /* Substitution */)) {
+      }
+      if (target.flags & (8388608 /* IndexedAccess */ | 33554432 /* Substitution */)) {
         target = getActualTypeVariable(target);
       }
       if (target.flags & 8650752 /* TypeVariable */) {
@@ -64373,7 +64473,7 @@ function createTypeChecker(host) {
       }
     }
     function inferToMappedType(source, target, constraintType) {
-      if (constraintType.flags & 1048576 /* Union */) {
+      if (constraintType.flags & 1048576 /* Union */ || constraintType.flags & 2097152 /* Intersection */) {
         let result = false;
         for (const type of constraintType.types) {
           result = inferToMappedType(source, target, type) || result;
@@ -71767,7 +71867,7 @@ function createTypeChecker(host) {
       }
       return resolveErrorCall(node);
     }
-    if (checkMode & 8 /* SkipGenericFunctions */ && !node.typeArguments && callSignatures.some(isGenericFunctionReturningFunction)) {
+    if (checkMode & 8 /* SkipGenericFunctions */ && !node.typeArguments && callSignatures.some(isGenericFunctionReturningFunctionOrConstructor)) {
       skippedGenericFunction(node, checkMode);
       return resolvingSignature;
     }
@@ -71777,8 +71877,12 @@ function createTypeChecker(host) {
     }
     return resolveCall(node, callSignatures, candidatesOutArray, checkMode, callChainFlags);
   }
-  function isGenericFunctionReturningFunction(signature) {
-    return !!(signature.typeParameters && isFunctionType(getReturnTypeOfSignature(signature)));
+  function isGenericFunctionReturningFunctionOrConstructor(signature) {
+    if (!signature.typeParameters) {
+      return false;
+    }
+    const returnType = getReturnTypeOfSignature(signature);
+    return isFunctionType(returnType) || isConstructorType(returnType);
   }
   function isUntypedFunctionCall(funcType, apparentFuncType, numCallSignatures, numConstructSignatures) {
     return isTypeAny(funcType) || isTypeAny(apparentFuncType) && !!(funcType.flags & 262144 /* TypeParameter */) || !numCallSignatures && !numConstructSignatures && !(apparentFuncType.flags & 1048576 /* Union */) && !(getReducedType(apparentFuncType).flags & 131072 /* Never */) && isTypeAssignableTo(funcType, globalFunctionType);
@@ -76274,7 +76378,8 @@ function createTypeChecker(host) {
     }
     const objectType = type.objectType;
     const indexType = type.indexType;
-    if (isTypeAssignableTo(indexType, getIndexType(objectType, 0 /* None */))) {
+    const objectIndexType = isGenericMappedType(objectType) && getMappedTypeNameTypeKind(objectType) === 2 /* Remapping */ ? getIndexTypeForMappedType(objectType, 0 /* None */) : getIndexType(objectType, 0 /* None */);
+    if (isTypeAssignableTo(indexType, objectIndexType)) {
       if (accessNode.kind === 212 /* ElementAccessExpression */ && isAssignmentTarget(accessNode) && getObjectFlags(objectType) & 32 /* Mapped */ && getMappedTypeModifiers(objectType) & 1 /* IncludeReadonly */) {
         error(accessNode, Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
       }

package/lib/tsserver.js

@@ -2332,7 +2332,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20231130`;
+var version = `${versionMajorMinor}.0-dev.20231201`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -6686,6 +6686,7 @@ var TypeFlags = /* @__PURE__ */ ((TypeFlags2) => {
   TypeFlags2[TypeFlags2["IncludesWildcard"] = 8388608 /* IndexedAccess */] = "IncludesWildcard";
   TypeFlags2[TypeFlags2["IncludesEmptyObject"] = 16777216 /* Conditional */] = "IncludesEmptyObject";
   TypeFlags2[TypeFlags2["IncludesInstantiable"] = 33554432 /* Substitution */] = "IncludesInstantiable";
+  TypeFlags2[TypeFlags2["IncludesConstrainedTypeVariable"] = 268435456 /* StringMapping */] = "IncludesConstrainedTypeVariable";
   TypeFlags2[TypeFlags2["NotPrimitiveUnion"] = 36323331] = "NotPrimitiveUnion";
   return TypeFlags2;
 })(TypeFlags || {});
@@ -6732,6 +6733,7 @@ var ObjectFlags = /* @__PURE__ */ ((ObjectFlags3) => {
   ObjectFlags3[ObjectFlags3["IsUnknownLikeUnion"] = 67108864] = "IsUnknownLikeUnion";
   ObjectFlags3[ObjectFlags3["IsNeverIntersectionComputed"] = 16777216] = "IsNeverIntersectionComputed";
   ObjectFlags3[ObjectFlags3["IsNeverIntersection"] = 33554432] = "IsNeverIntersection";
+  ObjectFlags3[ObjectFlags3["IsConstrainedTypeVariable"] = 67108864] = "IsConstrainedTypeVariable";
   return ObjectFlags3;
 })(ObjectFlags || {});
 var VarianceFlags = /* @__PURE__ */ ((VarianceFlags2) => {
@@ -51701,6 +51703,10 @@ function createTypeChecker(host) {
   function getParentOfSymbol(symbol) {
     return getMergedSymbol(symbol.parent && getLateBoundSymbol(symbol.parent));
   }
+  function getFunctionExpressionParentSymbolOrSymbol(symbol) {
+    var _a, _b;
+    return ((_a = symbol.valueDeclaration) == null ? void 0 : _a.kind) === 219 /* ArrowFunction */ || ((_b = symbol.valueDeclaration) == null ? void 0 : _b.kind) === 218 /* FunctionExpression */ ? getSymbolOfNode(symbol.valueDeclaration.parent) || symbol : symbol;
+  }
   function getAlternativeContainingModules(symbol, enclosingDeclaration) {
     const containingFile = getSourceFileOfNode(enclosingDeclaration);
     const id = getNodeId(containingFile);
@@ -56924,11 +56930,14 @@ function createTypeChecker(host) {
       }
     }
     if ((_a = symbol.parent) == null ? void 0 : _a.valueDeclaration) {
-      const typeNode2 = getEffectiveTypeAnnotationNode(symbol.parent.valueDeclaration);
-      if (typeNode2) {
-        const annotationSymbol = getPropertyOfType(getTypeFromTypeNode(typeNode2), symbol.escapedName);
-        if (annotationSymbol) {
-          return getNonMissingTypeOfSymbol(annotationSymbol);
+      const possiblyAnnotatedSymbol = getFunctionExpressionParentSymbolOrSymbol(symbol.parent);
+      if (possiblyAnnotatedSymbol.valueDeclaration) {
+        const typeNode2 = getEffectiveTypeAnnotationNode(possiblyAnnotatedSymbol.valueDeclaration);
+        if (typeNode2) {
+          const annotationSymbol = getPropertyOfType(getTypeFromTypeNode(typeNode2), symbol.escapedName);
+          if (annotationSymbol) {
+            return getNonMissingTypeOfSymbol(annotationSymbol);
+          }
         }
       }
     }
@@ -58228,7 +58237,6 @@ function createTypeChecker(host) {
     return links.resolvedSymbol;
   }
   function getResolvedMembersOrExportsOfSymbol(symbol, resolutionKind) {
-    var _a, _b, _c;
     const links = getSymbolLinks(symbol);
     if (!links[resolutionKind]) {
       const isStatic2 = resolutionKind === "resolvedExports" /* resolvedExports */;
@@ -58247,7 +58255,7 @@ function createTypeChecker(host) {
           }
         }
       }
-      const assignments = (((_a = symbol.valueDeclaration) == null ? void 0 : _a.kind) === 219 /* ArrowFunction */ || ((_b = symbol.valueDeclaration) == null ? void 0 : _b.kind) === 218 /* FunctionExpression */) && ((_c = getSymbolOfNode(symbol.valueDeclaration.parent)) == null ? void 0 : _c.assignmentDeclarationMembers) || symbol.assignmentDeclarationMembers;
+      const assignments = getFunctionExpressionParentSymbolOrSymbol(symbol).assignmentDeclarationMembers;
       if (assignments) {
         const decls = arrayFrom(assignments.values());
         for (const member of decls) {
@@ -58544,6 +58552,15 @@ function createTypeChecker(host) {
     let result;
     for (let i = 0; i < signatureLists.length; i++) {
       const match = i === listIndex ? signature : findMatchingSignature(
+        signatureLists[i],
+        signature,
+        /*partialMatch*/
+        false,
+        /*ignoreThisTypes*/
+        false,
+        /*ignoreReturnTypes*/
+        true
+      ) || findMatchingSignature(
         signatureLists[i],
         signature,
         /*partialMatch*/
@@ -58917,6 +58934,18 @@ function createTypeChecker(host) {
   function replaceIndexedAccess(instantiable, type, replacement) {
     return instantiateType(instantiable, createTypeMapper([type.indexType, type.objectType], [getNumberLiteralType(0), createTupleType([replacement])]));
   }
+  function getLimitedConstraint(type) {
+    const constraint = getConstraintTypeFromMappedType(type.mappedType);
+    if (!(constraint.flags & 1048576 /* Union */ || constraint.flags & 2097152 /* Intersection */)) {
+      return;
+    }
+    const origin = constraint.flags & 1048576 /* Union */ ? constraint.origin : constraint;
+    if (!origin || !(origin.flags & 2097152 /* Intersection */)) {
+      return;
+    }
+    const limitedConstraint = getIntersectionType(origin.types.filter((t) => t !== type.constraintType));
+    return limitedConstraint !== neverType ? limitedConstraint : void 0;
+  }
   function resolveReverseMappedTypeMembers(type) {
     const indexInfo = getIndexInfoOfType(type.source, stringType);
     const modifiers = getMappedTypeModifiers(type.mappedType);
@@ -58924,7 +58953,14 @@ function createTypeChecker(host) {
     const optionalMask = modifiers & 4 /* IncludeOptional */ ? 0 : 16777216 /* Optional */;
     const indexInfos = indexInfo ? [createIndexInfo(stringType, inferReverseMappedType(indexInfo.type, type.mappedType, type.constraintType), readonlyMask && indexInfo.isReadonly)] : emptyArray;
     const members = createSymbolTable();
+    const limitedConstraint = getLimitedConstraint(type);
     for (const prop of getPropertiesOfType(type.source)) {
+      if (limitedConstraint) {
+        const propertyNameType = getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */);
+        if (!isTypeAssignableTo(propertyNameType, limitedConstraint)) {
+          continue;
+        }
+      }
       const checkFlags = 8192 /* ReverseMapped */ | (readonlyMask && isReadonlySymbol(prop) ? 8 /* Readonly */ : 0);
       const inferredProp = createSymbol(4 /* Property */ | prop.flags & optionalMask, prop.escapedName, checkFlags);
       inferredProp.declarations = prop.declarations;
@@ -59005,7 +59041,7 @@ function createTypeChecker(host) {
     const constraintType = getConstraintTypeFromMappedType(type);
     const mappedType = type.target || type;
     const nameType = getNameTypeFromMappedType(mappedType);
-    const shouldLinkPropDeclarations = !nameType || isFilteringMappedType(mappedType);
+    const shouldLinkPropDeclarations = getMappedTypeNameTypeKind(mappedType) !== 2 /* Remapping */;
     const templateType = getTemplateTypeFromMappedType(mappedType);
     const modifiersType = getApparentType(getModifiersTypeFromMappedType(type));
     const templateModifiers = getMappedTypeModifiers(type);
@@ -59147,9 +59183,12 @@ function createTypeChecker(host) {
     }
     return false;
   }
-  function isFilteringMappedType(type) {
+  function getMappedTypeNameTypeKind(type) {
     const nameType = getNameTypeFromMappedType(type);
-    return !!nameType && isTypeAssignableTo(nameType, getTypeParameterFromMappedType(type));
+    if (!nameType) {
+      return 0 /* None */;
+    }
+    return isTypeAssignableTo(nameType, getTypeParameterFromMappedType(type)) ? 1 /* Filtering */ : 2 /* Remapping */;
   }
   function resolveStructuredTypeMembers(type) {
     if (!type.members) {
@@ -61685,6 +61724,8 @@ function createTypeChecker(host) {
       includes |= flags & 473694207 /* IncludesMask */;
       if (flags & 465829888 /* Instantiable */)
         includes |= 33554432 /* IncludesInstantiable */;
+      if (flags & 2097152 /* Intersection */ && getObjectFlags(type) & 67108864 /* IsConstrainedTypeVariable */)
+        includes |= 268435456 /* IncludesConstrainedTypeVariable */;
       if (type === wildcardType)
         includes |= 8388608 /* IncludesWildcard */;
       if (!strictNullChecks && flags & 98304 /* Nullable */) {
@@ -61789,6 +61830,41 @@ function createTypeChecker(host) {
       }
     }
   }
+  function removeConstrainedTypeVariables(types) {
+    const typeVariables = [];
+    for (const type of types) {
+      if (getObjectFlags(type) & 67108864 /* IsConstrainedTypeVariable */) {
+        const index = type.types[0].flags & 8650752 /* TypeVariable */ ? 0 : 1;
+        pushIfUnique(typeVariables, type.types[index]);
+      }
+    }
+    for (const typeVariable of typeVariables) {
+      const primitives = [];
+      for (const type of types) {
+        if (getObjectFlags(type) & 67108864 /* IsConstrainedTypeVariable */) {
+          const index = type.types[0].flags & 8650752 /* TypeVariable */ ? 0 : 1;
+          if (type.types[index] === typeVariable) {
+            insertType(primitives, type.types[1 - index]);
+          }
+        }
+      }
+      const constraint = getBaseConstraintOfType(typeVariable);
+      if (everyType(constraint, (t) => containsType(primitives, t))) {
+        let i = types.length;
+        while (i > 0) {
+          i--;
+          const type = types[i];
+          if (getObjectFlags(type) & 67108864 /* IsConstrainedTypeVariable */) {
+            const index = type.types[0].flags & 8650752 /* TypeVariable */ ? 0 : 1;
+            if (type.types[index] === typeVariable && containsType(primitives, type.types[1 - index])) {
+              orderedRemoveItemAt(types, i);
+            }
+          }
+        }
+        insertType(types, typeVariable);
+      }
+    }
+  }
   function isNamedUnionType(type) {
     return !!(type.flags & 1048576 /* Union */ && (type.aliasSymbol || type.origin));
   }
@@ -61854,6 +61930,9 @@ function createTypeChecker(host) {
       if (includes & 128 /* StringLiteral */ && includes & 134217728 /* TemplateLiteral */) {
         removeStringLiteralsMatchedByTemplateLiterals(typeSet);
       }
+      if (includes & 268435456 /* IncludesConstrainedTypeVariable */) {
+        removeConstrainedTypeVariables(typeSet);
+      }
       if (unionReduction === 2 /* Subtype */) {
         typeSet = removeSubtypes(typeSet, !!(includes & 524288 /* Object */));
         if (!typeSet) {
@@ -62066,9 +62145,9 @@ function createTypeChecker(host) {
     types[index] = getUnionTypeFromSortedList(result, 32768 /* PrimitiveUnion */);
     return true;
   }
-  function createIntersectionType(types, aliasSymbol, aliasTypeArguments) {
+  function createIntersectionType(types, objectFlags, aliasSymbol, aliasTypeArguments) {
     const result = createType(2097152 /* Intersection */);
-    result.objectFlags = getPropagatingFlagsOfTypes(
+    result.objectFlags = objectFlags | getPropagatingFlagsOfTypes(
       types,
       /*excludeKinds*/
       98304 /* Nullable */
@@ -62082,6 +62161,7 @@ function createTypeChecker(host) {
     const typeMembershipMap = /* @__PURE__ */ new Map();
     const includes = addTypesToIntersection(typeMembershipMap, 0, types);
     const typeSet = arrayFrom(typeMembershipMap.values());
+    let objectFlags = 0 /* None */;
     if (includes & 131072 /* Never */) {
       return contains(typeSet, silentNeverType) ? silentNeverType : neverType;
     }
@@ -62110,6 +62190,25 @@ function createTypeChecker(host) {
     if (typeSet.length === 1) {
       return typeSet[0];
     }
+    if (typeSet.length === 2) {
+      const typeVarIndex = typeSet[0].flags & 8650752 /* TypeVariable */ ? 0 : 1;
+      const typeVariable = typeSet[typeVarIndex];
+      const primitiveType = typeSet[1 - typeVarIndex];
+      if (typeVariable.flags & 8650752 /* TypeVariable */ && (primitiveType.flags & (402784252 /* Primitive */ | 67108864 /* NonPrimitive */) || includes & 16777216 /* IncludesEmptyObject */)) {
+        const constraint = getBaseConstraintOfType(typeVariable);
+        if (constraint && everyType(constraint, (t) => !!(t.flags & (402784252 /* Primitive */ | 67108864 /* NonPrimitive */)) || isEmptyAnonymousObjectType(t))) {
+          if (isTypeStrictSubtypeOf(constraint, primitiveType)) {
+            return typeVariable;
+          }
+          if (!(constraint.flags & 1048576 /* Union */ && someType(constraint, (c) => isTypeStrictSubtypeOf(c, primitiveType)))) {
+            if (!isTypeStrictSubtypeOf(primitiveType, constraint)) {
+              return neverType;
+            }
+          }
+          objectFlags = 67108864 /* IsConstrainedTypeVariable */;
+        }
+      }
+    }
     const id = getTypeListId(typeSet) + getAliasId(aliasSymbol, aliasTypeArguments);
     let result = intersectionTypes.get(id);
     if (!result) {
@@ -62132,7 +62231,7 @@ function createTypeChecker(host) {
           result = getUnionType(constituents, 1 /* Literal */, aliasSymbol, aliasTypeArguments, origin);
         }
       } else {
-        result = createIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
+        result = createIntersectionType(typeSet, objectFlags, aliasSymbol, aliasTypeArguments);
       }
       intersectionTypes.set(id, result);
     }
@@ -62289,7 +62388,7 @@ function createTypeChecker(host) {
     );
   }
   function shouldDeferIndexType(type, indexFlags = 0 /* None */) {
-    return !!(type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericTupleType(type) || isGenericMappedType(type) && !hasDistributiveNameType(type) || type.flags & 1048576 /* Union */ && !(indexFlags & 4 /* NoReducibleCheck */) && isGenericReducibleType(type) || type.flags & 2097152 /* Intersection */ && maybeTypeOfKind(type, 465829888 /* Instantiable */) && some(type.types, isEmptyAnonymousObjectType));
+    return !!(type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericTupleType(type) || isGenericMappedType(type) && (!hasDistributiveNameType(type) || getMappedTypeNameTypeKind(type) === 2 /* Remapping */) || type.flags & 1048576 /* Union */ && !(indexFlags & 4 /* NoReducibleCheck */) && isGenericReducibleType(type) || type.flags & 2097152 /* Intersection */ && maybeTypeOfKind(type, 465829888 /* Instantiable */) && some(type.types, isEmptyAnonymousObjectType));
   }
   function getIndexType(type, indexFlags = defaultIndexFlags) {
     type = getReducedType(type);
@@ -62773,7 +62872,7 @@ function createTypeChecker(host) {
       }
     }
     if (isGenericMappedType(objectType)) {
-      if (!getNameTypeFromMappedType(objectType) || isFilteringMappedType(objectType)) {
+      if (getMappedTypeNameTypeKind(objectType) !== 2 /* Remapping */) {
         return type[cache] = mapType(substituteIndexedMappedType(objectType, type.indexType), (t) => getSimplifiedType(t, writing));
       }
     }
@@ -68825,7 +68924,8 @@ function createTypeChecker(host) {
           source = getIntersectionType(sources);
           target = getIntersectionType(targets);
         }
-      } else if (target.flags & (8388608 /* IndexedAccess */ | 33554432 /* Substitution */)) {
+      }
+      if (target.flags & (8388608 /* IndexedAccess */ | 33554432 /* Substitution */)) {
         target = getActualTypeVariable(target);
       }
       if (target.flags & 8650752 /* TypeVariable */) {
@@ -69100,7 +69200,7 @@ function createTypeChecker(host) {
       }
     }
     function inferToMappedType(source, target, constraintType) {
-      if (constraintType.flags & 1048576 /* Union */) {
+      if (constraintType.flags & 1048576 /* Union */ || constraintType.flags & 2097152 /* Intersection */) {
         let result = false;
         for (const type of constraintType.types) {
           result = inferToMappedType(source, target, type) || result;
@@ -76494,7 +76594,7 @@ function createTypeChecker(host) {
       }
       return resolveErrorCall(node);
     }
-    if (checkMode & 8 /* SkipGenericFunctions */ && !node.typeArguments && callSignatures.some(isGenericFunctionReturningFunction)) {
+    if (checkMode & 8 /* SkipGenericFunctions */ && !node.typeArguments && callSignatures.some(isGenericFunctionReturningFunctionOrConstructor)) {
       skippedGenericFunction(node, checkMode);
       return resolvingSignature;
     }
@@ -76504,8 +76604,12 @@ function createTypeChecker(host) {
     }
     return resolveCall(node, callSignatures, candidatesOutArray, checkMode, callChainFlags);
   }
-  function isGenericFunctionReturningFunction(signature) {
-    return !!(signature.typeParameters && isFunctionType(getReturnTypeOfSignature(signature)));
+  function isGenericFunctionReturningFunctionOrConstructor(signature) {
+    if (!signature.typeParameters) {
+      return false;
+    }
+    const returnType = getReturnTypeOfSignature(signature);
+    return isFunctionType(returnType) || isConstructorType(returnType);
   }
   function isUntypedFunctionCall(funcType, apparentFuncType, numCallSignatures, numConstructSignatures) {
     return isTypeAny(funcType) || isTypeAny(apparentFuncType) && !!(funcType.flags & 262144 /* TypeParameter */) || !numCallSignatures && !numConstructSignatures && !(apparentFuncType.flags & 1048576 /* Union */) && !(getReducedType(apparentFuncType).flags & 131072 /* Never */) && isTypeAssignableTo(funcType, globalFunctionType);
@@ -81001,7 +81105,8 @@ function createTypeChecker(host) {
     }
     const objectType = type.objectType;
     const indexType = type.indexType;
-    if (isTypeAssignableTo(indexType, getIndexType(objectType, 0 /* None */))) {
+    const objectIndexType = isGenericMappedType(objectType) && getMappedTypeNameTypeKind(objectType) === 2 /* Remapping */ ? getIndexTypeForMappedType(objectType, 0 /* None */) : getIndexType(objectType, 0 /* None */);
+    if (isTypeAssignableTo(indexType, objectIndexType)) {
       if (accessNode.kind === 212 /* ElementAccessExpression */ && isAssignmentTarget(accessNode) && getObjectFlags(objectType) & 32 /* Mapped */ && getMappedTypeModifiers(objectType) & 1 /* IncludeReadonly */) {
         error2(accessNode, Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
       }
@@ -137710,7 +137815,7 @@ function transpileModule(input, transpileOptions) {
         options
       ),
       setExternalModuleIndicator: getSetExternalModuleIndicator(options),
-      jsDocParsingMode: 1 /* ParseNone */
+      jsDocParsingMode: transpileOptions.jsDocParsingMode ?? 1 /* ParseNone */
     }
   );
   if (transpileOptions.moduleName) {

package/lib/typescript.d.ts

@@ -11618,6 +11618,7 @@ declare namespace ts {
         moduleName?: string;
         renamedDependencies?: MapLike<string>;
         transformers?: CustomTransformers;
+        jsDocParsingMode?: JSDocParsingMode;
     }
     interface TranspileOutput {
         outputText: string;

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.4";
-      version = `${versionMajorMinor}.0-dev.20231130`;
+      version = `${versionMajorMinor}.0-dev.20231201`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -4447,6 +4447,7 @@ ${lanes.join("\n")}
         TypeFlags2[TypeFlags2["IncludesWildcard"] = 8388608 /* IndexedAccess */] = "IncludesWildcard";
         TypeFlags2[TypeFlags2["IncludesEmptyObject"] = 16777216 /* Conditional */] = "IncludesEmptyObject";
         TypeFlags2[TypeFlags2["IncludesInstantiable"] = 33554432 /* Substitution */] = "IncludesInstantiable";
+        TypeFlags2[TypeFlags2["IncludesConstrainedTypeVariable"] = 268435456 /* StringMapping */] = "IncludesConstrainedTypeVariable";
         TypeFlags2[TypeFlags2["NotPrimitiveUnion"] = 36323331] = "NotPrimitiveUnion";
         return TypeFlags2;
       })(TypeFlags || {});
@@ -4493,6 +4494,7 @@ ${lanes.join("\n")}
         ObjectFlags3[ObjectFlags3["IsUnknownLikeUnion"] = 67108864] = "IsUnknownLikeUnion";
         ObjectFlags3[ObjectFlags3["IsNeverIntersectionComputed"] = 16777216] = "IsNeverIntersectionComputed";
         ObjectFlags3[ObjectFlags3["IsNeverIntersection"] = 33554432] = "IsNeverIntersection";
+        ObjectFlags3[ObjectFlags3["IsConstrainedTypeVariable"] = 67108864] = "IsConstrainedTypeVariable";
         return ObjectFlags3;
       })(ObjectFlags || {});
       VarianceFlags = /* @__PURE__ */ ((VarianceFlags2) => {
@@ -49464,6 +49466,10 @@ ${lanes.join("\n")}
     function getParentOfSymbol(symbol) {
       return getMergedSymbol(symbol.parent && getLateBoundSymbol(symbol.parent));
     }
+    function getFunctionExpressionParentSymbolOrSymbol(symbol) {
+      var _a, _b;
+      return ((_a = symbol.valueDeclaration) == null ? void 0 : _a.kind) === 219 /* ArrowFunction */ || ((_b = symbol.valueDeclaration) == null ? void 0 : _b.kind) === 218 /* FunctionExpression */ ? getSymbolOfNode(symbol.valueDeclaration.parent) || symbol : symbol;
+    }
     function getAlternativeContainingModules(symbol, enclosingDeclaration) {
       const containingFile = getSourceFileOfNode(enclosingDeclaration);
       const id = getNodeId(containingFile);
@@ -54687,11 +54693,14 @@ ${lanes.join("\n")}
         }
       }
       if ((_a = symbol.parent) == null ? void 0 : _a.valueDeclaration) {
-        const typeNode2 = getEffectiveTypeAnnotationNode(symbol.parent.valueDeclaration);
-        if (typeNode2) {
-          const annotationSymbol = getPropertyOfType(getTypeFromTypeNode(typeNode2), symbol.escapedName);
-          if (annotationSymbol) {
-            return getNonMissingTypeOfSymbol(annotationSymbol);
+        const possiblyAnnotatedSymbol = getFunctionExpressionParentSymbolOrSymbol(symbol.parent);
+        if (possiblyAnnotatedSymbol.valueDeclaration) {
+          const typeNode2 = getEffectiveTypeAnnotationNode(possiblyAnnotatedSymbol.valueDeclaration);
+          if (typeNode2) {
+            const annotationSymbol = getPropertyOfType(getTypeFromTypeNode(typeNode2), symbol.escapedName);
+            if (annotationSymbol) {
+              return getNonMissingTypeOfSymbol(annotationSymbol);
+            }
           }
         }
       }
@@ -55991,7 +56000,6 @@ ${lanes.join("\n")}
       return links.resolvedSymbol;
     }
     function getResolvedMembersOrExportsOfSymbol(symbol, resolutionKind) {
-      var _a, _b, _c;
       const links = getSymbolLinks(symbol);
       if (!links[resolutionKind]) {
         const isStatic2 = resolutionKind === "resolvedExports" /* resolvedExports */;
@@ -56010,7 +56018,7 @@ ${lanes.join("\n")}
             }
           }
         }
-        const assignments = (((_a = symbol.valueDeclaration) == null ? void 0 : _a.kind) === 219 /* ArrowFunction */ || ((_b = symbol.valueDeclaration) == null ? void 0 : _b.kind) === 218 /* FunctionExpression */) && ((_c = getSymbolOfNode(symbol.valueDeclaration.parent)) == null ? void 0 : _c.assignmentDeclarationMembers) || symbol.assignmentDeclarationMembers;
+        const assignments = getFunctionExpressionParentSymbolOrSymbol(symbol).assignmentDeclarationMembers;
         if (assignments) {
           const decls = arrayFrom(assignments.values());
           for (const member of decls) {
@@ -56307,6 +56315,15 @@ ${lanes.join("\n")}
       let result;
       for (let i = 0; i < signatureLists.length; i++) {
         const match = i === listIndex ? signature : findMatchingSignature(
+          signatureLists[i],
+          signature,
+          /*partialMatch*/
+          false,
+          /*ignoreThisTypes*/
+          false,
+          /*ignoreReturnTypes*/
+          true
+        ) || findMatchingSignature(
           signatureLists[i],
           signature,
           /*partialMatch*/
@@ -56680,6 +56697,18 @@ ${lanes.join("\n")}
     function replaceIndexedAccess(instantiable, type, replacement) {
       return instantiateType(instantiable, createTypeMapper([type.indexType, type.objectType], [getNumberLiteralType(0), createTupleType([replacement])]));
     }
+    function getLimitedConstraint(type) {
+      const constraint = getConstraintTypeFromMappedType(type.mappedType);
+      if (!(constraint.flags & 1048576 /* Union */ || constraint.flags & 2097152 /* Intersection */)) {
+        return;
+      }
+      const origin = constraint.flags & 1048576 /* Union */ ? constraint.origin : constraint;
+      if (!origin || !(origin.flags & 2097152 /* Intersection */)) {
+        return;
+      }
+      const limitedConstraint = getIntersectionType(origin.types.filter((t) => t !== type.constraintType));
+      return limitedConstraint !== neverType ? limitedConstraint : void 0;
+    }
     function resolveReverseMappedTypeMembers(type) {
       const indexInfo = getIndexInfoOfType(type.source, stringType);
       const modifiers = getMappedTypeModifiers(type.mappedType);
@@ -56687,7 +56716,14 @@ ${lanes.join("\n")}
       const optionalMask = modifiers & 4 /* IncludeOptional */ ? 0 : 16777216 /* Optional */;
       const indexInfos = indexInfo ? [createIndexInfo(stringType, inferReverseMappedType(indexInfo.type, type.mappedType, type.constraintType), readonlyMask && indexInfo.isReadonly)] : emptyArray;
       const members = createSymbolTable();
+      const limitedConstraint = getLimitedConstraint(type);
       for (const prop of getPropertiesOfType(type.source)) {
+        if (limitedConstraint) {
+          const propertyNameType = getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */);
+          if (!isTypeAssignableTo(propertyNameType, limitedConstraint)) {
+            continue;
+          }
+        }
         const checkFlags = 8192 /* ReverseMapped */ | (readonlyMask && isReadonlySymbol(prop) ? 8 /* Readonly */ : 0);
         const inferredProp = createSymbol(4 /* Property */ | prop.flags & optionalMask, prop.escapedName, checkFlags);
         inferredProp.declarations = prop.declarations;
@@ -56768,7 +56804,7 @@ ${lanes.join("\n")}
       const constraintType = getConstraintTypeFromMappedType(type);
       const mappedType = type.target || type;
       const nameType = getNameTypeFromMappedType(mappedType);
-      const shouldLinkPropDeclarations = !nameType || isFilteringMappedType(mappedType);
+      const shouldLinkPropDeclarations = getMappedTypeNameTypeKind(mappedType) !== 2 /* Remapping */;
       const templateType = getTemplateTypeFromMappedType(mappedType);
       const modifiersType = getApparentType(getModifiersTypeFromMappedType(type));
       const templateModifiers = getMappedTypeModifiers(type);
@@ -56910,9 +56946,12 @@ ${lanes.join("\n")}
       }
       return false;
     }
-    function isFilteringMappedType(type) {
+    function getMappedTypeNameTypeKind(type) {
       const nameType = getNameTypeFromMappedType(type);
-      return !!nameType && isTypeAssignableTo(nameType, getTypeParameterFromMappedType(type));
+      if (!nameType) {
+        return 0 /* None */;
+      }
+      return isTypeAssignableTo(nameType, getTypeParameterFromMappedType(type)) ? 1 /* Filtering */ : 2 /* Remapping */;
     }
     function resolveStructuredTypeMembers(type) {
       if (!type.members) {
@@ -59448,6 +59487,8 @@ ${lanes.join("\n")}
         includes |= flags & 473694207 /* IncludesMask */;
         if (flags & 465829888 /* Instantiable */)
           includes |= 33554432 /* IncludesInstantiable */;
+        if (flags & 2097152 /* Intersection */ && getObjectFlags(type) & 67108864 /* IsConstrainedTypeVariable */)
+          includes |= 268435456 /* IncludesConstrainedTypeVariable */;
         if (type === wildcardType)
           includes |= 8388608 /* IncludesWildcard */;
         if (!strictNullChecks && flags & 98304 /* Nullable */) {
@@ -59552,6 +59593,41 @@ ${lanes.join("\n")}
         }
       }
     }
+    function removeConstrainedTypeVariables(types) {
+      const typeVariables = [];
+      for (const type of types) {
+        if (getObjectFlags(type) & 67108864 /* IsConstrainedTypeVariable */) {
+          const index = type.types[0].flags & 8650752 /* TypeVariable */ ? 0 : 1;
+          pushIfUnique(typeVariables, type.types[index]);
+        }
+      }
+      for (const typeVariable of typeVariables) {
+        const primitives = [];
+        for (const type of types) {
+          if (getObjectFlags(type) & 67108864 /* IsConstrainedTypeVariable */) {
+            const index = type.types[0].flags & 8650752 /* TypeVariable */ ? 0 : 1;
+            if (type.types[index] === typeVariable) {
+              insertType(primitives, type.types[1 - index]);
+            }
+          }
+        }
+        const constraint = getBaseConstraintOfType(typeVariable);
+        if (everyType(constraint, (t) => containsType(primitives, t))) {
+          let i = types.length;
+          while (i > 0) {
+            i--;
+            const type = types[i];
+            if (getObjectFlags(type) & 67108864 /* IsConstrainedTypeVariable */) {
+              const index = type.types[0].flags & 8650752 /* TypeVariable */ ? 0 : 1;
+              if (type.types[index] === typeVariable && containsType(primitives, type.types[1 - index])) {
+                orderedRemoveItemAt(types, i);
+              }
+            }
+          }
+          insertType(types, typeVariable);
+        }
+      }
+    }
     function isNamedUnionType(type) {
       return !!(type.flags & 1048576 /* Union */ && (type.aliasSymbol || type.origin));
     }
@@ -59617,6 +59693,9 @@ ${lanes.join("\n")}
         if (includes & 128 /* StringLiteral */ && includes & 134217728 /* TemplateLiteral */) {
           removeStringLiteralsMatchedByTemplateLiterals(typeSet);
         }
+        if (includes & 268435456 /* IncludesConstrainedTypeVariable */) {
+          removeConstrainedTypeVariables(typeSet);
+        }
         if (unionReduction === 2 /* Subtype */) {
           typeSet = removeSubtypes(typeSet, !!(includes & 524288 /* Object */));
           if (!typeSet) {
@@ -59829,9 +59908,9 @@ ${lanes.join("\n")}
       types[index] = getUnionTypeFromSortedList(result, 32768 /* PrimitiveUnion */);
       return true;
     }
-    function createIntersectionType(types, aliasSymbol, aliasTypeArguments) {
+    function createIntersectionType(types, objectFlags, aliasSymbol, aliasTypeArguments) {
       const result = createType(2097152 /* Intersection */);
-      result.objectFlags = getPropagatingFlagsOfTypes(
+      result.objectFlags = objectFlags | getPropagatingFlagsOfTypes(
         types,
         /*excludeKinds*/
         98304 /* Nullable */
@@ -59845,6 +59924,7 @@ ${lanes.join("\n")}
       const typeMembershipMap = /* @__PURE__ */ new Map();
       const includes = addTypesToIntersection(typeMembershipMap, 0, types);
       const typeSet = arrayFrom(typeMembershipMap.values());
+      let objectFlags = 0 /* None */;
       if (includes & 131072 /* Never */) {
         return contains(typeSet, silentNeverType) ? silentNeverType : neverType;
       }
@@ -59873,6 +59953,25 @@ ${lanes.join("\n")}
       if (typeSet.length === 1) {
         return typeSet[0];
       }
+      if (typeSet.length === 2) {
+        const typeVarIndex = typeSet[0].flags & 8650752 /* TypeVariable */ ? 0 : 1;
+        const typeVariable = typeSet[typeVarIndex];
+        const primitiveType = typeSet[1 - typeVarIndex];
+        if (typeVariable.flags & 8650752 /* TypeVariable */ && (primitiveType.flags & (402784252 /* Primitive */ | 67108864 /* NonPrimitive */) || includes & 16777216 /* IncludesEmptyObject */)) {
+          const constraint = getBaseConstraintOfType(typeVariable);
+          if (constraint && everyType(constraint, (t) => !!(t.flags & (402784252 /* Primitive */ | 67108864 /* NonPrimitive */)) || isEmptyAnonymousObjectType(t))) {
+            if (isTypeStrictSubtypeOf(constraint, primitiveType)) {
+              return typeVariable;
+            }
+            if (!(constraint.flags & 1048576 /* Union */ && someType(constraint, (c) => isTypeStrictSubtypeOf(c, primitiveType)))) {
+              if (!isTypeStrictSubtypeOf(primitiveType, constraint)) {
+                return neverType;
+              }
+            }
+            objectFlags = 67108864 /* IsConstrainedTypeVariable */;
+          }
+        }
+      }
       const id = getTypeListId(typeSet) + getAliasId(aliasSymbol, aliasTypeArguments);
       let result = intersectionTypes.get(id);
       if (!result) {
@@ -59895,7 +59994,7 @@ ${lanes.join("\n")}
             result = getUnionType(constituents, 1 /* Literal */, aliasSymbol, aliasTypeArguments, origin);
           }
         } else {
-          result = createIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
+          result = createIntersectionType(typeSet, objectFlags, aliasSymbol, aliasTypeArguments);
         }
         intersectionTypes.set(id, result);
       }
@@ -60052,7 +60151,7 @@ ${lanes.join("\n")}
       );
     }
     function shouldDeferIndexType(type, indexFlags = 0 /* None */) {
-      return !!(type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericTupleType(type) || isGenericMappedType(type) && !hasDistributiveNameType(type) || type.flags & 1048576 /* Union */ && !(indexFlags & 4 /* NoReducibleCheck */) && isGenericReducibleType(type) || type.flags & 2097152 /* Intersection */ && maybeTypeOfKind(type, 465829888 /* Instantiable */) && some(type.types, isEmptyAnonymousObjectType));
+      return !!(type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericTupleType(type) || isGenericMappedType(type) && (!hasDistributiveNameType(type) || getMappedTypeNameTypeKind(type) === 2 /* Remapping */) || type.flags & 1048576 /* Union */ && !(indexFlags & 4 /* NoReducibleCheck */) && isGenericReducibleType(type) || type.flags & 2097152 /* Intersection */ && maybeTypeOfKind(type, 465829888 /* Instantiable */) && some(type.types, isEmptyAnonymousObjectType));
     }
     function getIndexType(type, indexFlags = defaultIndexFlags) {
       type = getReducedType(type);
@@ -60536,7 +60635,7 @@ ${lanes.join("\n")}
         }
       }
       if (isGenericMappedType(objectType)) {
-        if (!getNameTypeFromMappedType(objectType) || isFilteringMappedType(objectType)) {
+        if (getMappedTypeNameTypeKind(objectType) !== 2 /* Remapping */) {
           return type[cache] = mapType(substituteIndexedMappedType(objectType, type.indexType), (t) => getSimplifiedType(t, writing));
         }
       }
@@ -66588,7 +66687,8 @@ ${lanes.join("\n")}
             source = getIntersectionType(sources);
             target = getIntersectionType(targets);
           }
-        } else if (target.flags & (8388608 /* IndexedAccess */ | 33554432 /* Substitution */)) {
+        }
+        if (target.flags & (8388608 /* IndexedAccess */ | 33554432 /* Substitution */)) {
           target = getActualTypeVariable(target);
         }
         if (target.flags & 8650752 /* TypeVariable */) {
@@ -66863,7 +66963,7 @@ ${lanes.join("\n")}
         }
       }
       function inferToMappedType(source, target, constraintType) {
-        if (constraintType.flags & 1048576 /* Union */) {
+        if (constraintType.flags & 1048576 /* Union */ || constraintType.flags & 2097152 /* Intersection */) {
           let result = false;
           for (const type of constraintType.types) {
             result = inferToMappedType(source, target, type) || result;
@@ -74257,7 +74357,7 @@ ${lanes.join("\n")}
         }
         return resolveErrorCall(node);
       }
-      if (checkMode & 8 /* SkipGenericFunctions */ && !node.typeArguments && callSignatures.some(isGenericFunctionReturningFunction)) {
+      if (checkMode & 8 /* SkipGenericFunctions */ && !node.typeArguments && callSignatures.some(isGenericFunctionReturningFunctionOrConstructor)) {
         skippedGenericFunction(node, checkMode);
         return resolvingSignature;
       }
@@ -74267,8 +74367,12 @@ ${lanes.join("\n")}
       }
       return resolveCall(node, callSignatures, candidatesOutArray, checkMode, callChainFlags);
     }
-    function isGenericFunctionReturningFunction(signature) {
-      return !!(signature.typeParameters && isFunctionType(getReturnTypeOfSignature(signature)));
+    function isGenericFunctionReturningFunctionOrConstructor(signature) {
+      if (!signature.typeParameters) {
+        return false;
+      }
+      const returnType = getReturnTypeOfSignature(signature);
+      return isFunctionType(returnType) || isConstructorType(returnType);
     }
     function isUntypedFunctionCall(funcType, apparentFuncType, numCallSignatures, numConstructSignatures) {
       return isTypeAny(funcType) || isTypeAny(apparentFuncType) && !!(funcType.flags & 262144 /* TypeParameter */) || !numCallSignatures && !numConstructSignatures && !(apparentFuncType.flags & 1048576 /* Union */) && !(getReducedType(apparentFuncType).flags & 131072 /* Never */) && isTypeAssignableTo(funcType, globalFunctionType);
@@ -78764,7 +78868,8 @@ ${lanes.join("\n")}
       }
       const objectType = type.objectType;
       const indexType = type.indexType;
-      if (isTypeAssignableTo(indexType, getIndexType(objectType, 0 /* None */))) {
+      const objectIndexType = isGenericMappedType(objectType) && getMappedTypeNameTypeKind(objectType) === 2 /* Remapping */ ? getIndexTypeForMappedType(objectType, 0 /* None */) : getIndexType(objectType, 0 /* None */);
+      if (isTypeAssignableTo(indexType, objectIndexType)) {
         if (accessNode.kind === 212 /* ElementAccessExpression */ && isAssignmentTarget(accessNode) && getObjectFlags(objectType) & 32 /* Mapped */ && getMappedTypeModifiers(objectType) & 1 /* IncludeReadonly */) {
           error2(accessNode, Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
         }
@@ -136075,7 +136180,7 @@ ${lanes.join("\n")}
           options
         ),
         setExternalModuleIndicator: getSetExternalModuleIndicator(options),
-        jsDocParsingMode: 1 /* ParseNone */
+        jsDocParsingMode: transpileOptions.jsDocParsingMode ?? 1 /* ParseNone */
       }
     );
     if (transpileOptions.moduleName) {

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20231130`;
+var version = `${versionMajorMinor}.0-dev.20231201`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -3105,6 +3105,7 @@ var TypeFlags = /* @__PURE__ */ ((TypeFlags2) => {
   TypeFlags2[TypeFlags2["IncludesWildcard"] = 8388608 /* IndexedAccess */] = "IncludesWildcard";
   TypeFlags2[TypeFlags2["IncludesEmptyObject"] = 16777216 /* Conditional */] = "IncludesEmptyObject";
   TypeFlags2[TypeFlags2["IncludesInstantiable"] = 33554432 /* Substitution */] = "IncludesInstantiable";
+  TypeFlags2[TypeFlags2["IncludesConstrainedTypeVariable"] = 268435456 /* StringMapping */] = "IncludesConstrainedTypeVariable";
   TypeFlags2[TypeFlags2["NotPrimitiveUnion"] = 36323331] = "NotPrimitiveUnion";
   return TypeFlags2;
 })(TypeFlags || {});
@@ -3151,6 +3152,7 @@ var ObjectFlags = /* @__PURE__ */ ((ObjectFlags3) => {
   ObjectFlags3[ObjectFlags3["IsUnknownLikeUnion"] = 67108864] = "IsUnknownLikeUnion";
   ObjectFlags3[ObjectFlags3["IsNeverIntersectionComputed"] = 16777216] = "IsNeverIntersectionComputed";
   ObjectFlags3[ObjectFlags3["IsNeverIntersection"] = 33554432] = "IsNeverIntersection";
+  ObjectFlags3[ObjectFlags3["IsConstrainedTypeVariable"] = 67108864] = "IsConstrainedTypeVariable";
   return ObjectFlags3;
 })(ObjectFlags || {});
 var SignatureFlags = /* @__PURE__ */ ((SignatureFlags4) => {

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.4.0-dev.20231130",
+    "version": "5.4.0-dev.20231201",
     "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": "7216ee0bb821b4b565d54c52dcbf788a3fdf7062"
+    "gitHead": "5bc66177388247d3e270653f94d82a8dabd56d69"
 }