Skip to content

Commit 1148bce

Browse files
AndaristAndarist
committed
Instantiate earlier inferred constraints in conditional types
1 parent c5db0ac commit 1148bce

File tree

5 files changed

+182
-25
lines changed

5 files changed

+182
-25
lines changed

‎src/compiler/checker.ts

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18636,11 +18636,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
1863618636
return type;
1863718637
}
1863818638

18639-
function maybeCloneTypeParameter(p: TypeParameter) {
18640-
const constraint = getConstraintOfTypeParameter(p);
18641-
return constraint && (isGenericObjectType(constraint) || isGenericIndexType(constraint)) ? cloneTypeParameter(p) : p;
18642-
}
18643-
1864418639
function isSimpleTupleType(node: TypeNode): boolean {
1864518640
return isTupleTypeNode(node) && length(node.elements) > 0 &&
1864618641
!some(node.elements, e => isOptionalTypeNode(e) || isRestTypeNode(e) || isNamedTupleMember(e) && !!(e.questionToken || e.dotDotDotToken));
@@ -18683,44 +18678,33 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
1868318678
let combinedMapper: TypeMapper | undefined;
1868418679
if (root.inferTypeParameters) {
1868518680
// When we're looking at making an inference for an infer type, when we get its constraint, it'll automagically be
18686-
// instantiated with the context, so it doesn't need the mapper for the inference contex - however the constraint
18681+
// instantiated with the context, so it doesn't need the mapper for the inference context - however the constraint
1868718682
// may refer to another _root_, _uncloned_ `infer` type parameter [1], or to something mapped by `mapper` [2].
1868818683
// [1] Eg, if we have `Foo<T, U extends T>` and `Foo<number, infer B>` - `B` is constrained to `T`, which, in turn, has been instantiated
1868918684
// as `number`
1869018685
// Conversely, if we have `Foo<infer A, infer B>`, `B` is still constrained to `T` and `T` is instantiated as `A`
1869118686
// [2] Eg, if we have `Foo<T, U extends T>` and `Foo<Q, infer B>` where `Q` is mapped by `mapper` into `number` - `B` is constrained to `T`
1869218687
// which is in turn instantiated as `Q`, which is in turn instantiated as `number`.
1869318688
// So we need to:
18694-
// * Clone the type parameters so their constraints can be instantiated in the context of `mapper` (otherwise theyd only get inference context information)
18695-
// * Set the clones to both map the conditional's enclosing `mapper` and the original params
18696-
// * instantiate the extends type with the clones
18689+
// * combine `context.nonFixingMapper` with `mapper` so their constraints can be instantiated in the context of `mapper` (otherwise they'd only get inference context information)
1869718690
// * incorporate all of the component mappers into the combined mapper for the true and false members
18698-
// This means we have three mappers that need applying:
18691+
// This means we have two mappers that need applying:
1869918692
// * The original `mapper` used to create this conditional
18700-
// * The mapper that maps the old root type parameter to the clone (`freshMapper`)
18701-
// * The mapper that maps the clone to its inference result (`context.mapper`)
18702-
const freshParams = sameMap(root.inferTypeParameters, maybeCloneTypeParameter);
18703-
const freshMapper = freshParams !== root.inferTypeParameters ? createTypeMapper(root.inferTypeParameters, freshParams) : undefined;
18704-
const context = createInferenceContext(freshParams, /*signature*/ undefined, InferenceFlags.None);
18705-
if (freshMapper) {
18706-
const freshCombinedMapper = combineTypeMappers(mapper, freshMapper);
18707-
for (let i = 0; i < freshParams.length; i++) {
18708-
if (freshParams[i] !== root.inferTypeParameters[i]) {
18709-
freshParams[i].mapper = freshCombinedMapper;
18710-
}
18711-
}
18693+
// * The mapper that maps the infer type parameter to its inference result (`context.mapper`)
18694+
const context = createInferenceContext(root.inferTypeParameters, /*signature*/ undefined, InferenceFlags.None);
18695+
if (mapper) {
18696+
context.nonFixingMapper = combineTypeMappers(context.nonFixingMapper, mapper);
1871218697
}
1871318698
if (!checkTypeDeferred) {
1871418699
// We don't want inferences from constraints as they may cause us to eagerly resolve the
1871518700
// conditional type instead of deferring resolution. Also, we always want strict function
1871618701
// types rules (i.e. proper contravariance) for inferences.
18717-
inferTypes(context.inferences, checkType, instantiateType(extendsType, freshMapper), InferencePriority.NoConstraints | InferencePriority.AlwaysStrict);
18702+
inferTypes(context.inferences, checkType, extendsType, InferencePriority.NoConstraints | InferencePriority.AlwaysStrict);
1871818703
}
18719-
const innerMapper = combineTypeMappers(freshMapper, context.mapper);
1872018704
// It's possible for 'infer T' type paramteters to be given uninstantiated constraints when the
1872118705
// those type parameters are used in type references (see getInferredTypeParameterConstraint). For
1872218706
// that reason we need context.mapper to be first in the combined mapper. See #42636 for examples.
18723-
combinedMapper = mapper ? combineTypeMappers(innerMapper, mapper) : innerMapper;
18707+
combinedMapper = mapper ? combineTypeMappers(context.mapper, mapper) : context.mapper;
1872418708
}
1872518709
// Instantiate the extends type including inferences for 'infer T' type parameters
1872618710
const inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;

‎tests/baselines/reference/inferTypeParameterConstraints.js

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,62 @@ type Constrain<T extends C, C> = unknown;
1818
type Foo<A> = A extends Constrain<infer X, A> ? X : never;
1919

2020
type T0 = Foo<string>; // string
21+
22+
// https://github.com/microsoft/TypeScript/issues/57286#issuecomment-1927920336
23+
24+
class BaseClass<V> {
25+
protected fake(): V {
26+
throw new Error("");
27+
}
28+
}
29+
30+
class Klass<V> extends BaseClass<V> {
31+
child = true;
32+
}
33+
34+
type Constructor<V, P extends BaseClass<V>> = new () => P;
35+
type inferTest<V, T> = T extends Constructor<V, infer P> ? P : never;
36+
37+
type U = inferTest<number, Constructor<number, Klass<number>>>;
38+
39+
declare let m: U;
40+
m.child; // ok
2141

2242

2343
//// [inferTypeParameterConstraints.js]
2444
"use strict";
2545
// Repro from #42636
46+
var __extends = (this && this.__extends) || (function () {
47+
var extendStatics = function (d, b) {
48+
extendStatics = Object.setPrototypeOf ||
49+
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
50+
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
51+
return extendStatics(d, b);
52+
};
53+
return function (d, b) {
54+
if (typeof b !== "function" && b !== null)
55+
throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
56+
extendStatics(d, b);
57+
function __() { this.constructor = d; }
58+
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
59+
};
60+
})();
61+
// https://github.com/microsoft/TypeScript/issues/57286#issuecomment-1927920336
62+
var BaseClass = /** @class */ (function () {
63+
function BaseClass() {
64+
}
65+
BaseClass.prototype.fake = function () {
66+
throw new Error("");
67+
};
68+
return BaseClass;
69+
}());
70+
var Klass = /** @class */ (function (_super) {
71+
__extends(Klass, _super);
72+
function Klass() {
73+
var _this = _super !== null && _super.apply(this, arguments) || this;
74+
_this.child = true;
75+
return _this;
76+
}
77+
return Klass;
78+
}(BaseClass));
79+
m.child; // ok

‎tests/baselines/reference/inferTypeParameterConstraints.symbols

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,61 @@ type T0 = Foo<string>; // string
5151
>T0 : Symbol(T0, Decl(inferTypeParameterConstraints.ts, 14, 58))
5252
>Foo : Symbol(Foo, Decl(inferTypeParameterConstraints.ts, 12, 41))
5353

54+
// https://github.com/microsoft/TypeScript/issues/57286#issuecomment-1927920336
55+
56+
class BaseClass<V> {
57+
>BaseClass : Symbol(BaseClass, Decl(inferTypeParameterConstraints.ts, 16, 22))
58+
>V : Symbol(V, Decl(inferTypeParameterConstraints.ts, 20, 16))
59+
60+
protected fake(): V {
61+
>fake : Symbol(BaseClass.fake, Decl(inferTypeParameterConstraints.ts, 20, 20))
62+
>V : Symbol(V, Decl(inferTypeParameterConstraints.ts, 20, 16))
63+
64+
throw new Error("");
65+
>Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
66+
}
67+
}
68+
69+
class Klass<V> extends BaseClass<V> {
70+
>Klass : Symbol(Klass, Decl(inferTypeParameterConstraints.ts, 24, 1))
71+
>V : Symbol(V, Decl(inferTypeParameterConstraints.ts, 26, 12))
72+
>BaseClass : Symbol(BaseClass, Decl(inferTypeParameterConstraints.ts, 16, 22))
73+
>V : Symbol(V, Decl(inferTypeParameterConstraints.ts, 26, 12))
74+
75+
child = true;
76+
>child : Symbol(Klass.child, Decl(inferTypeParameterConstraints.ts, 26, 37))
77+
}
78+
79+
type Constructor<V, P extends BaseClass<V>> = new () => P;
80+
>Constructor : Symbol(Constructor, Decl(inferTypeParameterConstraints.ts, 28, 1))
81+
>V : Symbol(V, Decl(inferTypeParameterConstraints.ts, 30, 17))
82+
>P : Symbol(P, Decl(inferTypeParameterConstraints.ts, 30, 19))
83+
>BaseClass : Symbol(BaseClass, Decl(inferTypeParameterConstraints.ts, 16, 22))
84+
>V : Symbol(V, Decl(inferTypeParameterConstraints.ts, 30, 17))
85+
>P : Symbol(P, Decl(inferTypeParameterConstraints.ts, 30, 19))
86+
87+
type inferTest<V, T> = T extends Constructor<V, infer P> ? P : never;
88+
>inferTest : Symbol(inferTest, Decl(inferTypeParameterConstraints.ts, 30, 58))
89+
>V : Symbol(V, Decl(inferTypeParameterConstraints.ts, 31, 15))
90+
>T : Symbol(T, Decl(inferTypeParameterConstraints.ts, 31, 17))
91+
>T : Symbol(T, Decl(inferTypeParameterConstraints.ts, 31, 17))
92+
>Constructor : Symbol(Constructor, Decl(inferTypeParameterConstraints.ts, 28, 1))
93+
>V : Symbol(V, Decl(inferTypeParameterConstraints.ts, 31, 15))
94+
>P : Symbol(P, Decl(inferTypeParameterConstraints.ts, 31, 53))
95+
>P : Symbol(P, Decl(inferTypeParameterConstraints.ts, 31, 53))
96+
97+
type U = inferTest<number, Constructor<number, Klass<number>>>;
98+
>U : Symbol(U, Decl(inferTypeParameterConstraints.ts, 31, 69))
99+
>inferTest : Symbol(inferTest, Decl(inferTypeParameterConstraints.ts, 30, 58))
100+
>Constructor : Symbol(Constructor, Decl(inferTypeParameterConstraints.ts, 28, 1))
101+
>Klass : Symbol(Klass, Decl(inferTypeParameterConstraints.ts, 24, 1))
102+
103+
declare let m: U;
104+
>m : Symbol(m, Decl(inferTypeParameterConstraints.ts, 35, 11))
105+
>U : Symbol(U, Decl(inferTypeParameterConstraints.ts, 31, 69))
106+
107+
m.child; // ok
108+
>m.child : Symbol(Klass.child, Decl(inferTypeParameterConstraints.ts, 26, 37))
109+
>m : Symbol(m, Decl(inferTypeParameterConstraints.ts, 35, 11))
110+
>child : Symbol(Klass.child, Decl(inferTypeParameterConstraints.ts, 26, 37))
111+

‎tests/baselines/reference/inferTypeParameterConstraints.types

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,44 @@ type Foo<A> = A extends Constrain<infer X, A> ? X : never;
2626
type T0 = Foo<string>; // string
2727
>T0 : string
2828

29+
// https://github.com/microsoft/TypeScript/issues/57286#issuecomment-1927920336
30+
31+
class BaseClass<V> {
32+
>BaseClass : BaseClass<V>
33+
34+
protected fake(): V {
35+
>fake : () => V
36+
37+
throw new Error("");
38+
>new Error("") : Error
39+
>Error : ErrorConstructor
40+
>"" : ""
41+
}
42+
}
43+
44+
class Klass<V> extends BaseClass<V> {
45+
>Klass : Klass<V>
46+
>BaseClass : BaseClass<V>
47+
48+
child = true;
49+
>child : boolean
50+
>true : true
51+
}
52+
53+
type Constructor<V, P extends BaseClass<V>> = new () => P;
54+
>Constructor : Constructor<V, P>
55+
56+
type inferTest<V, T> = T extends Constructor<V, infer P> ? P : never;
57+
>inferTest : inferTest<V, T>
58+
59+
type U = inferTest<number, Constructor<number, Klass<number>>>;
60+
>U : Klass<number>
61+
62+
declare let m: U;
63+
>m : Klass<number>
64+
65+
m.child; // ok
66+
>m.child : boolean
67+
>m : Klass<number>
68+
>child : boolean
69+

‎tests/cases/compiler/inferTypeParameterConstraints.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,23 @@ type Constrain<T extends C, C> = unknown;
1717
type Foo<A> = A extends Constrain<infer X, A> ? X : never;
1818

1919
type T0 = Foo<string>; // string
20+
21+
// https://github.com/microsoft/TypeScript/issues/57286#issuecomment-1927920336
22+
23+
class BaseClass<V> {
24+
protected fake(): V {
25+
throw new Error("");
26+
}
27+
}
28+
29+
class Klass<V> extends BaseClass<V> {
30+
child = true;
31+
}
32+
33+
type Constructor<V, P extends BaseClass<V>> = new () => P;
34+
type inferTest<V, T> = T extends Constructor<V, infer P> ? P : never;
35+
36+
type U = inferTest<number, Constructor<number, Klass<number>>>;
37+
38+
declare let m: U;
39+
m.child; // ok

0 commit comments

Comments
 (0)