microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-10 18:04:18 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Avoid rewriting homomorphic mapped types with homomorphic instantiations (#53215)

Browse Source
This commit is contained in:
Mateusz Burzyński
2023-03-21 01:09:42 +01:00
committed by GitHub
parent e9836a4bec
commit f078ab0548
6 changed files with 89 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/compiler/checker.ts
View File

@@ -6633,9 +6633,12 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
return typeToTypeNodeHelper(type, context);
}
function isMappedTypeHomomorphic(type: MappedType) {
return !!getHomomorphicTypeVariable(type);
}
function isHomomorphicMappedTypeWithNonHomomorphicInstantiation(type: MappedType) {
return isMappedTypeWithKeyofConstraintDeclaration(type)
&& !(getModifiersTypeFromMappedType(type).flags & TypeFlags.TypeParameter);
return !!type.target && isMappedTypeHomomorphic(type.target as MappedType) && !isMappedTypeHomomorphic(type);
}
function createMappedTypeNodeFromType(type: MappedType) {

19
tests/baselines/reference/mappedTypeGenericInstantiationPreservesInlineForm.js Normal file
View File

@@ -0,0 +1,19 @@
//// [mappedTypeGenericInstantiationPreservesInlineForm.ts]
// repro from #53109
export const test1 = <T = Record<string, never>>(schema: {
[K in keyof Required<T>]: T[K];
}) => {}
export function test2<T = Record<string, never>>(schema: {
[K in keyof Required<T>]: T[K];
}) {};
//// [mappedTypeGenericInstantiationPreservesInlineForm.d.ts]
export declare const test1: <T = Record<string, never>>(schema: { [K in keyof Required<T>]: T[K]; }) => void;
export declare function test2<T = Record<string, never>>(schema: {
[K in keyof Required<T>]: T[K];
}): void;

33
tests/baselines/reference/mappedTypeGenericInstantiationPreservesInlineForm.symbols Normal file
View File

@@ -0,0 +1,33 @@
=== tests/cases/compiler/mappedTypeGenericInstantiationPreservesInlineForm.ts ===
// repro from #53109
export const test1 = <T = Record<string, never>>(schema: {
>test1 : Symbol(test1, Decl(mappedTypeGenericInstantiationPreservesInlineForm.ts, 2, 12))
>T : Symbol(T, Decl(mappedTypeGenericInstantiationPreservesInlineForm.ts, 2, 22))
>Record : Symbol(Record, Decl(lib.es5.d.ts, --, --))
>schema : Symbol(schema, Decl(mappedTypeGenericInstantiationPreservesInlineForm.ts, 2, 49))
[K in keyof Required<T>]: T[K];
>K : Symbol(K, Decl(mappedTypeGenericInstantiationPreservesInlineForm.ts, 3, 5))
>Required : Symbol(Required, Decl(lib.es5.d.ts, --, --))
>T : Symbol(T, Decl(mappedTypeGenericInstantiationPreservesInlineForm.ts, 2, 22))
>T : Symbol(T, Decl(mappedTypeGenericInstantiationPreservesInlineForm.ts, 2, 22))
>K : Symbol(K, Decl(mappedTypeGenericInstantiationPreservesInlineForm.ts, 3, 5))
}) => {}
export function test2<T = Record<string, never>>(schema: {
>test2 : Symbol(test2, Decl(mappedTypeGenericInstantiationPreservesInlineForm.ts, 4, 8))
>T : Symbol(T, Decl(mappedTypeGenericInstantiationPreservesInlineForm.ts, 6, 22))
>Record : Symbol(Record, Decl(lib.es5.d.ts, --, --))
>schema : Symbol(schema, Decl(mappedTypeGenericInstantiationPreservesInlineForm.ts, 6, 49))
[K in keyof Required<T>]: T[K];
>K : Symbol(K, Decl(mappedTypeGenericInstantiationPreservesInlineForm.ts, 7, 5))
>Required : Symbol(Required, Decl(lib.es5.d.ts, --, --))
>T : Symbol(T, Decl(mappedTypeGenericInstantiationPreservesInlineForm.ts, 6, 22))
>T : Symbol(T, Decl(mappedTypeGenericInstantiationPreservesInlineForm.ts, 6, 22))
>K : Symbol(K, Decl(mappedTypeGenericInstantiationPreservesInlineForm.ts, 7, 5))
}) {};

18
tests/baselines/reference/mappedTypeGenericInstantiationPreservesInlineForm.types Normal file
View File

@@ -0,0 +1,18 @@
=== tests/cases/compiler/mappedTypeGenericInstantiationPreservesInlineForm.ts ===
// repro from #53109
export const test1 = <T = Record<string, never>>(schema: {
>test1 : <T = Record<string, never>>(schema: { [K in keyof Required<T>]: T[K]; }) => void
><T = Record<string, never>>(schema: { [K in keyof Required<T>]: T[K];}) => {} : <T = Record<string, never>>(schema: { [K in keyof Required<T>]: T[K]; }) => void
>schema : { [K in keyof Required<T>]: T[K]; }
[K in keyof Required<T>]: T[K];
}) => {}
export function test2<T = Record<string, never>>(schema: {
>test2 : <T = Record<string, never>>(schema: { [K in keyof Required<T>]: T[K]; }) => void
>schema : { [K in keyof Required<T>]: T[K]; }
[K in keyof Required<T>]: T[K];
}) {};

2
tests/baselines/reference/mappedTypeUnionConstraintInferences.js
View File

@@ -38,7 +38,7 @@ export declare type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
export declare type PartialProperties<T, K extends keyof T> = Partial<Pick<T, K>> & Omit<T, K>;
export declare function doSomething_Actual<T extends {
prop: string;
}>(a: T): PartialProperties<T, "prop"> extends infer T_1 ? { [P in keyof T_1]: PartialProperties<T, "prop">[P]; } : never;
}>(a: T): { [P in keyof PartialProperties<T, "prop">]: PartialProperties<T, "prop">[P]; };
export declare function doSomething_Expected<T extends {
prop: string;
}>(a: T): {

13
tests/cases/compiler/mappedTypeGenericInstantiationPreservesInlineForm.ts Normal file
View File

@@ -0,0 +1,13 @@
// @strict: true
// @declaration: true
// @emitDeclarationOnly: true
// repro from #53109
export const test1 = <T = Record<string, never>>(schema: {
[K in keyof Required<T>]: T[K];
}) => {}
export function test2<T = Record<string, never>>(schema: {
[K in keyof Required<T>]: T[K];
}) {};