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

Merge pull request #23806 from Microsoft/objectAndUnconstrainedTypeParameter

Browse Source 
Unconstrained type variable not assignable to 'object'
This commit is contained in:
Anders Hejlsberg 2018-05-01 13:24:16 -07:00 committed by GitHub
commit 3bfbe68b5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 178 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/compiler/checker.ts
View File

@ -10716,19 +10716,18 @@ namespace ts {
return result;
}
}
let constraint = getConstraintForRelation(<TypeParameter>source);
// A type variable with no constraint is not related to the non-primitive object type.
if (constraint || !(target.flags & TypeFlags.NonPrimitive)) {
if (!constraint || constraint.flags & TypeFlags.Any) {
constraint = emptyObjectType;
}
// Report constraint errors only if the constraint is not the empty object type
const reportConstraintErrors = reportErrors && constraint !== emptyObjectType;
if (result = isRelatedTo(constraint, target, reportConstraintErrors)) {
const constraint = getConstraintForRelation(<TypeParameter>source);
if (!constraint || constraint.flags & TypeFlags.Any) {
// A type variable with no constraint is not related to the non-primitive object type.
if (result = isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~TypeFlags.NonPrimitive))) {
errorInfo = saveErrorInfo;
return result;
}
}
else if (result = isRelatedTo(constraint, target, reportErrors)) {
errorInfo = saveErrorInfo;
return result;
}
}
else if (source.flags & TypeFlags.Index) {
if (result = isRelatedTo(keyofConstraintType, target, reportErrors)) {

24
tests/baselines/reference/nonPrimitiveAndTypeVariables.errors.txt Normal file
View File

@ -0,0 +1,24 @@
tests/cases/conformance/types/nonPrimitive/nonPrimitiveAndTypeVariables.ts(10,9): error TS2322: Type 'T' is not assignable to type 'object'.
tests/cases/conformance/types/nonPrimitive/nonPrimitiveAndTypeVariables.ts(11,9): error TS2322: Type 'T' is not assignable to type 'object | U'.
Type 'T' is not assignable to type 'U'.
==== tests/cases/conformance/types/nonPrimitive/nonPrimitiveAndTypeVariables.ts (2 errors) ====
// Repros from #23800
type A<T, V> = { [P in keyof T]: T[P] extends V ? 1 : 0; };
type B<T, V> = { [P in keyof T]: T[P] extends V | object ? 1 : 0; };
let a: A<{ a: 0 | 1 }, 0> = { a: 0 };
let b: B<{ a: 0 | 1 }, 0> = { a: 0 };
function foo<T, U>(x: T) {
let a: object = x; // Error
~
!!! error TS2322: Type 'T' is not assignable to type 'object'.
let b: U | object = x; // Error
~
!!! error TS2322: Type 'T' is not assignable to type 'object | U'.
!!! error TS2322: Type 'T' is not assignable to type 'U'.
}

24
tests/baselines/reference/nonPrimitiveAndTypeVariables.js Normal file
View File

@ -0,0 +1,24 @@
//// [nonPrimitiveAndTypeVariables.ts]
// Repros from #23800
type A<T, V> = { [P in keyof T]: T[P] extends V ? 1 : 0; };
type B<T, V> = { [P in keyof T]: T[P] extends V | object ? 1 : 0; };
let a: A<{ a: 0 | 1 }, 0> = { a: 0 };
let b: B<{ a: 0 | 1 }, 0> = { a: 0 };
function foo<T, U>(x: T) {
let a: object = x; // Error
let b: U | object = x; // Error
}
//// [nonPrimitiveAndTypeVariables.js]
"use strict";
// Repros from #23800
var a = { a: 0 };
var b = { a: 0 };
function foo(x) {
var a = x; // Error
var b = x; // Error
}

52
tests/baselines/reference/nonPrimitiveAndTypeVariables.symbols Normal file
View File

@ -0,0 +1,52 @@
=== tests/cases/conformance/types/nonPrimitive/nonPrimitiveAndTypeVariables.ts ===
// Repros from #23800
type A<T, V> = { [P in keyof T]: T[P] extends V ? 1 : 0; };
>A : Symbol(A, Decl(nonPrimitiveAndTypeVariables.ts, 0, 0))
>T : Symbol(T, Decl(nonPrimitiveAndTypeVariables.ts, 2, 7))
>V : Symbol(V, Decl(nonPrimitiveAndTypeVariables.ts, 2, 9))
>P : Symbol(P, Decl(nonPrimitiveAndTypeVariables.ts, 2, 18))
>T : Symbol(T, Decl(nonPrimitiveAndTypeVariables.ts, 2, 7))
>T : Symbol(T, Decl(nonPrimitiveAndTypeVariables.ts, 2, 7))
>P : Symbol(P, Decl(nonPrimitiveAndTypeVariables.ts, 2, 18))
>V : Symbol(V, Decl(nonPrimitiveAndTypeVariables.ts, 2, 9))
type B<T, V> = { [P in keyof T]: T[P] extends V | object ? 1 : 0; };
>B : Symbol(B, Decl(nonPrimitiveAndTypeVariables.ts, 2, 59))
>T : Symbol(T, Decl(nonPrimitiveAndTypeVariables.ts, 3, 7))
>V : Symbol(V, Decl(nonPrimitiveAndTypeVariables.ts, 3, 9))
>P : Symbol(P, Decl(nonPrimitiveAndTypeVariables.ts, 3, 18))
>T : Symbol(T, Decl(nonPrimitiveAndTypeVariables.ts, 3, 7))
>T : Symbol(T, Decl(nonPrimitiveAndTypeVariables.ts, 3, 7))
>P : Symbol(P, Decl(nonPrimitiveAndTypeVariables.ts, 3, 18))
>V : Symbol(V, Decl(nonPrimitiveAndTypeVariables.ts, 3, 9))
let a: A<{ a: 0 | 1 }, 0> = { a: 0 };
>a : Symbol(a, Decl(nonPrimitiveAndTypeVariables.ts, 5, 3))
>A : Symbol(A, Decl(nonPrimitiveAndTypeVariables.ts, 0, 0))
>a : Symbol(a, Decl(nonPrimitiveAndTypeVariables.ts, 5, 10))
>a : Symbol(a, Decl(nonPrimitiveAndTypeVariables.ts, 5, 29))
let b: B<{ a: 0 | 1 }, 0> = { a: 0 };
>b : Symbol(b, Decl(nonPrimitiveAndTypeVariables.ts, 6, 3))
>B : Symbol(B, Decl(nonPrimitiveAndTypeVariables.ts, 2, 59))
>a : Symbol(a, Decl(nonPrimitiveAndTypeVariables.ts, 6, 10))
>a : Symbol(a, Decl(nonPrimitiveAndTypeVariables.ts, 6, 29))
function foo<T, U>(x: T) {
>foo : Symbol(foo, Decl(nonPrimitiveAndTypeVariables.ts, 6, 37))
>T : Symbol(T, Decl(nonPrimitiveAndTypeVariables.ts, 8, 13))
>U : Symbol(U, Decl(nonPrimitiveAndTypeVariables.ts, 8, 15))
>x : Symbol(x, Decl(nonPrimitiveAndTypeVariables.ts, 8, 19))
>T : Symbol(T, Decl(nonPrimitiveAndTypeVariables.ts, 8, 13))
let a: object = x; // Error
>a : Symbol(a, Decl(nonPrimitiveAndTypeVariables.ts, 9, 7))
>x : Symbol(x, Decl(nonPrimitiveAndTypeVariables.ts, 8, 19))
let b: U | object = x; // Error
>b : Symbol(b, Decl(nonPrimitiveAndTypeVariables.ts, 10, 7))
>U : Symbol(U, Decl(nonPrimitiveAndTypeVariables.ts, 8, 15))
>x : Symbol(x, Decl(nonPrimitiveAndTypeVariables.ts, 8, 19))
}

56
tests/baselines/reference/nonPrimitiveAndTypeVariables.types Normal file
View File

@ -0,0 +1,56 @@
=== tests/cases/conformance/types/nonPrimitive/nonPrimitiveAndTypeVariables.ts ===
// Repros from #23800
type A<T, V> = { [P in keyof T]: T[P] extends V ? 1 : 0; };
>A : A<T, V>
>T : T
>V : V
>P : P
>T : T
>T : T
>P : P
>V : V
type B<T, V> = { [P in keyof T]: T[P] extends V | object ? 1 : 0; };
>B : B<T, V>
>T : T
>V : V
>P : P
>T : T
>T : T
>P : P
>V : V
let a: A<{ a: 0 | 1 }, 0> = { a: 0 };
>a : A<{ a: 0 | 1; }, 0>
>A : A<T, V>
>a : 0 | 1
>{ a: 0 } : { a: 0; }
>a : 0
>0 : 0
let b: B<{ a: 0 | 1 }, 0> = { a: 0 };
>b : B<{ a: 0 | 1; }, 0>
>B : B<T, V>
>a : 0 | 1
>{ a: 0 } : { a: 0; }
>a : 0
>0 : 0
function foo<T, U>(x: T) {
>foo : <T, U>(x: T) => void
>T : T
>U : U
>x : T
>T : T
let a: object = x; // Error
>a : object
>x : T
let b: U | object = x; // Error
>b : object | U
>U : U
>x : T
}

14
tests/cases/conformance/types/nonPrimitive/nonPrimitiveAndTypeVariables.ts Normal file
View File

@ -0,0 +1,14 @@
// @strict: true
// Repros from #23800
type A<T, V> = { [P in keyof T]: T[P] extends V ? 1 : 0; };
type B<T, V> = { [P in keyof T]: T[P] extends V | object ? 1 : 0; };
let a: A<{ a: 0 | 1 }, 0> = { a: 0 };
let b: B<{ a: 0 | 1 }, 0> = { a: 0 };
function foo<T, U>(x: T) {
let a: object = x; // Error
let b: U | object = x; // Error
}