JavaScriptPlugins
diff --git a/‎src/compiler/checker.ts‎
Lines changed: 7 additions & 11 deletions b/‎src/compiler/checker.ts‎
Lines changed: 7 additions & 11 deletions
diff --git a/‎src/compiler/core.ts‎
Lines changed: 1 addition & 1 deletion b/‎src/compiler/core.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/baselines/reference/additionOperatorWithConstrainedTypeParameter.js‎
Lines changed: 0 additions & 27 deletions b/‎tests/baselines/reference/additionOperatorWithConstrainedTypeParameter.js‎
Lines changed: 0 additions & 27 deletions
diff --git a/‎tests/baselines/reference/additionOperatorWithConstrainedTypeParameter.symbols‎
Lines changed: 0 additions & 54 deletions b/‎tests/baselines/reference/additionOperatorWithConstrainedTypeParameter.symbols‎
Lines changed: 0 additions & 54 deletions
diff --git a/‎tests/baselines/reference/additionOperatorWithConstrainedTypeParameter.types‎
Lines changed: 0 additions & 64 deletions b/‎tests/baselines/reference/additionOperatorWithConstrainedTypeParameter.types‎
Lines changed: 0 additions & 64 deletions
diff --git a/‎tests/baselines/reference/nonPrimitiveConstraintOfIndexAccessType.errors.txt‎
Lines changed: 0 additions & 67 deletions b/‎tests/baselines/reference/nonPrimitiveConstraintOfIndexAccessType.errors.txt‎
Lines changed: 0 additions & 67 deletions
diff --git a/‎tests/baselines/reference/nonPrimitiveConstraintOfIndexAccessType.js‎
Lines changed: 0 additions & 67 deletions b/‎tests/baselines/reference/nonPrimitiveConstraintOfIndexAccessType.js‎
Lines changed: 0 additions & 67 deletions
diff --git a/‎tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithConstrainedTypeParameter.ts‎
Lines changed: 0 additions & 11 deletions b/‎tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithConstrainedTypeParameter.ts‎
Lines changed: 0 additions & 11 deletions
diff --git a/‎tests/cases/conformance/types/nonPrimitive/nonPrimitiveConstraintOfIndexAccessType.ts‎
Lines changed: 0 additions & 32 deletions b/‎tests/cases/conformance/types/nonPrimitive/nonPrimitiveConstraintOfIndexAccessType.ts‎
Lines changed: 0 additions & 32 deletions
@@ -5911,13 +5911,7 @@ namespace ts {
                 return transformed;
             }
             const baseObjectType = getBaseConstraintOfType(type.objectType);
-            const keepTypeParameterForMappedType = baseObjectType && getObjectFlags(baseObjectType) & ObjectFlags.Mapped && type.indexType.flags & TypeFlags.TypeParameter;
-            const baseIndexType = !keepTypeParameterForMappedType && getBaseConstraintOfType(type.indexType);
-            if (baseObjectType && baseIndexType === stringType && !getIndexInfoOfType(baseObjectType, IndexKind.String)) {
-                // getIndexedAccessType returns `any` for X[string] where X doesn't have an index signature.
-                // instead, return undefined so that the indexed access check fails
-                return undefined;
-            }
+            const baseIndexType = getBaseConstraintOfType(type.indexType);
             return baseObjectType || baseIndexType ? getIndexedAccessType(baseObjectType || type.objectType, baseIndexType || type.indexType) : undefined;
         }
 
@@ -5967,9 +5961,8 @@ namespace ts {
             function computeBaseConstraint(t: Type): Type {
                 if (t.flags & TypeFlags.TypeParameter) {
                     const constraint = getConstraintFromTypeParameter(<TypeParameter>t);
-                    return (t as TypeParameter).isThisType || !constraint ?
-                        constraint :
-                        getBaseConstraint(constraint);
+                    return (<TypeParameter>t).isThisType ? constraint :
+                        constraint ? getBaseConstraint(constraint) : undefined;
                 }
                 if (t.flags & TypeFlags.UnionOrIntersection) {
                     const types = (<UnionOrIntersectionType>t).types;
@@ -5997,6 +5990,9 @@ namespace ts {
                     const baseIndexedAccess = baseObjectType && baseIndexType ? getIndexedAccessType(baseObjectType, baseIndexType) : undefined;
                     return baseIndexedAccess && baseIndexedAccess !== unknownType ? getBaseConstraint(baseIndexedAccess) : undefined;
                 }
+                if (isGenericMappedType(t)) {
+                    return emptyObjectType;
+                }
                 return t;
             }
         }
@@ -9293,7 +9289,7 @@ namespace ts {
                 }
                 else if (target.flags & TypeFlags.IndexedAccess) {
                     // A type S is related to a type T[K] if S is related to A[K], where K is string-like and
-                    // A is the apparent type of T.
+                    // A is the apparent type of S.
                     const constraint = getConstraintOfType(<IndexedAccessType>target);
                     if (constraint) {
                         if (result = isRelatedTo(source, constraint, reportErrors)) {
 
@@ -718,7 +718,7 @@ namespace ts {
     export function sum<T extends Record<K, number>, K extends string>(array: T[], prop: K): number {
         let result = 0;
         for (const v of array) {
-            // TODO: Remove the following type assertion once the fix for #17069 is merged
+            // Note: we need the following type assertion because of GH #17069
             result += v[prop] as number;
         }
         return result;
Original file line number	Diff line number	Diff line change
`@@ -718,7 +718,7 @@ namespace ts {`
`718`	`718`	`export function sum<T extends Record<K, number>, K extends string>(array: T[], prop: K): number {`
`719`	`719`	`let result = 0;`
`720`	`720`	`for (const v of array) {`
`721`		`- // TODO: Remove the following type assertion once the fix for #17069 is merged`
	`721`	`+ // Note: we need the following type assertion because of GH #17069`
`722`	`722`	`result += v[prop] as number;`
`723`	`723`	`}`
`724`	`724`	`return result;`