Revert "Fixed apparent type of homomorphic mapped type with non-homomorphic instantiation (#56727)" and add test (#57092)

Author: gabritto

src/compiler/checker.ts

@@ -2053,7 +2053,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     var noConstraintType = createAnonymousType(/*symbol*/ undefined, emptySymbols, emptyArray, emptyArray, emptyArray);
     var circularConstraintType = createAnonymousType(/*symbol*/ undefined, emptySymbols, emptyArray, emptyArray, emptyArray);
     var resolvingDefaultType = createAnonymousType(/*symbol*/ undefined, emptySymbols, emptyArray, emptyArray, emptyArray);
-    var resolvingApparentMappedType = createAnonymousType(/*symbol*/ undefined, emptySymbols, emptyArray, emptyArray, emptyArray);
 
     var markerSuperType = createTypeParameter();
     var markerSubType = createTypeParameter();
@@ -14539,32 +14538,15 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     }
 
     function getApparentTypeOfMappedType(type: MappedType) {
-        if (type.resolvedApparentType) {
-            if (type.resolvedApparentType === resolvingApparentMappedType) {
-                return type.resolvedApparentType = type;
-            }
-            return type.resolvedApparentType;
-        }
-        type.resolvedApparentType = resolvingApparentMappedType;
-        return type.resolvedApparentType = getResolvedApparentTypeOfMappedType(type);
+        return type.resolvedApparentType || (type.resolvedApparentType = getResolvedApparentTypeOfMappedType(type));
     }
 
     function getResolvedApparentTypeOfMappedType(type: MappedType) {
-        const mappedType = type.target as MappedType || type;
-        const typeVariable = getHomomorphicTypeVariable(mappedType);
-        if (typeVariable && !mappedType.declaration.nameType) {
-            let constraint: Type | undefined;
-            if (!type.target) {
-                constraint = getConstraintOfTypeParameter(typeVariable);
-            }
-            else {
-                const modifiersConstraint = getConstraintOfType(getModifiersTypeFromMappedType(type));
-                if (modifiersConstraint) {
-                    constraint = getApparentType(modifiersConstraint);
-                }
-            }
+        const typeVariable = getHomomorphicTypeVariable(type);
+        if (typeVariable && !type.declaration.nameType) {
+            const constraint = getConstraintOfTypeParameter(typeVariable);
             if (constraint && everyType(constraint, isArrayOrTupleType)) {
-                return instantiateType(mappedType, prependTypeMapping(typeVariable, constraint, mappedType.mapper));
+                return instantiateType(type, prependTypeMapping(typeVariable, constraint, type.mapper));
             }
         }
         return type;

tests/baselines/reference/homomorphicMappedTypeWithNonHomomorphicInstantiationSpreadable1.symbols

@@ -0,0 +1,28 @@
+//// [tests/cases/compiler/nestedHomomorphicMappedTypesWithArrayConstraint1.ts] ////
+
+=== nestedHomomorphicMappedTypesWithArrayConstraint1.ts ===
+// Based on @types/sinon v10
+
+type MatchArguments<T> = {
+>MatchArguments : Symbol(MatchArguments, Decl(nestedHomomorphicMappedTypesWithArrayConstraint1.ts, 0, 0))
+>T : Symbol(T, Decl(nestedHomomorphicMappedTypesWithArrayConstraint1.ts, 2, 20))
+
+    [K in keyof T]: T[K];
+>K : Symbol(K, Decl(nestedHomomorphicMappedTypesWithArrayConstraint1.ts, 3, 5))
+>T : Symbol(T, Decl(nestedHomomorphicMappedTypesWithArrayConstraint1.ts, 2, 20))
+>T : Symbol(T, Decl(nestedHomomorphicMappedTypesWithArrayConstraint1.ts, 2, 20))
+>K : Symbol(K, Decl(nestedHomomorphicMappedTypesWithArrayConstraint1.ts, 3, 5))
+
+};
+
+interface SinonSpyCallApi<TArgs extends any[] = any[]> {
+>SinonSpyCallApi : Symbol(SinonSpyCallApi, Decl(nestedHomomorphicMappedTypesWithArrayConstraint1.ts, 4, 2))
+>TArgs : Symbol(TArgs, Decl(nestedHomomorphicMappedTypesWithArrayConstraint1.ts, 6, 26))
+
+    calledWith(...args: Partial<MatchArguments<TArgs>>): boolean;
+>calledWith : Symbol(SinonSpyCallApi.calledWith, Decl(nestedHomomorphicMappedTypesWithArrayConstraint1.ts, 6, 56))
+>args : Symbol(args, Decl(nestedHomomorphicMappedTypesWithArrayConstraint1.ts, 7, 15))
+>Partial : Symbol(Partial, Decl(lib.es5.d.ts, --, --))
+>MatchArguments : Symbol(MatchArguments, Decl(nestedHomomorphicMappedTypesWithArrayConstraint1.ts, 0, 0))
+>TArgs : Symbol(TArgs, Decl(nestedHomomorphicMappedTypesWithArrayConstraint1.ts, 6, 26))
+}

tests/baselines/reference/homomorphicMappedTypeWithNonHomomorphicInstantiationSpreadable1.types

@@ -0,0 +1,16 @@
+//// [tests/cases/compiler/nestedHomomorphicMappedTypesWithArrayConstraint1.ts] ////
+
+=== nestedHomomorphicMappedTypesWithArrayConstraint1.ts ===
+// Based on @types/sinon v10
+
+type MatchArguments<T> = {
+>MatchArguments : MatchArguments<T>
+
+    [K in keyof T]: T[K];
+};
+
+interface SinonSpyCallApi<TArgs extends any[] = any[]> {
+    calledWith(...args: Partial<MatchArguments<TArgs>>): boolean;
+>calledWith : (...args: Partial<MatchArguments<TArgs>>) => boolean
+>args : Partial<MatchArguments<TArgs>>
+}

tests/baselines/reference/nestedHomomorphicMappedTypesWithArrayConstraint1.symbols

@@ -0,0 +1,12 @@
+// @strict: true
+// @noEmit: true
+
+// Based on @types/sinon v10
+
+type MatchArguments<T> = {
+    [K in keyof T]: T[K];
+};
+
+interface SinonSpyCallApi<TArgs extends any[] = any[]> {
+    calledWith(...args: Partial<MatchArguments<TArgs>>): boolean;
+}