Skip to content

Fix empty object intersections #28429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 10, 2018
Merged

Fix empty object intersections #28429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55da2b9
Preserve actual empty object type intersection
ahejlsberg Nov 8, 2018
a8c4e6f
Accept new baselines
ahejlsberg Nov 8, 2018
e95ed29
Fix fourslash test
ahejlsberg Nov 8, 2018
627f1ad
Add regression tests
ahejlsberg Nov 9, 2018
187fa20
Accept new baselines
ahejlsberg Nov 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9097,8 +9097,11 @@ namespace ts {
if (flags & TypeFlags.Intersection) {
return addTypesToIntersection(typeSet, includes, (<IntersectionType>type).types);
}
if (getObjectFlags(type) & ObjectFlags.Anonymous && isEmptyObjectType(type)) {
includes |= TypeFlags.EmptyObject;
if (isEmptyAnonymousObjectType(type)) {
if (!(includes & TypeFlags.EmptyObject)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's never a situation where we'd need to preserve multiple different empty types... Right?

includes |= TypeFlags.EmptyObject;
typeSet.push(type);
}
}
else {
includes |= flags & ~TypeFlags.ConstructionFlags;
Expand Down Expand Up @@ -9229,8 +9232,8 @@ namespace ts {
includes & TypeFlags.ESSymbol && includes & TypeFlags.UniqueESSymbol) {
removeRedundantPrimitiveTypes(typeSet, includes);
}
if (includes & TypeFlags.EmptyObject && !(includes & TypeFlags.Object)) {
typeSet.push(emptyObjectType);
if (includes & TypeFlags.EmptyObject && includes & TypeFlags.Object) {
orderedRemoveItemAt(typeSet, findIndex(typeSet, isEmptyAnonymousObjectType));
}
if (typeSet.length === 0) {
return unknownType;
Expand Down Expand Up @@ -11277,6 +11280,10 @@ namespace ts {
false;
}

function isEmptyAnonymousObjectType(type: Type) {
return !!(getObjectFlags(type) & ObjectFlags.Anonymous) && isEmptyObjectType(type);
}

function isEnumTypeRelatedTo(sourceSymbol: Symbol, targetSymbol: Symbol, errorReporter?: ErrorReporter) {
if (sourceSymbol === targetSymbol) {
return true;
Expand Down
101 changes: 87 additions & 14 deletions tests/baselines/reference/intersectionsAndEmptyObjects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,95 @@ let x11: C & D;
let x12: A & B & C & D;
let x13: D & E;
let x14: A & B & C & D & E;

// Repro from #20225

type Dictionary = { [name: string]: string };

const intersectDictionaries = <F1 extends Dictionary, F2 extends Dictionary>(
d1: F1,
d2: F2,
): F1 & F2 => Object.assign({}, d1, d2);

const testDictionary = <T extends Dictionary>(_value: T) => { };

const d1 = {};
testDictionary(d1);
const d2 = intersectDictionaries(d1, d1);
testDictionary(d2);

const d3 = {
s: '',
};
testDictionary(d3);
const d4 = intersectDictionaries(d1, d3);
testDictionary(d4);
const d5 = intersectDictionaries(d3, d1);
testDictionary(d5);
const d6 = intersectDictionaries(d3, d3);
testDictionary(d6);

// Repro from #27044

type choices<IChoiceList extends {
[key: string]: boolean;
}> = IChoiceList & {
shoes:boolean;
food:boolean;
};

type IMyChoiceList = {
car: true
};

type IUnknownChoiceList = {};

var defaultChoices: choices<{}>;
var defaultChoicesAndEmpty: choices<{} & {}>;

var myChoices: choices<IMyChoiceList>;
var myChoicesAndEmpty: choices<IMyChoiceList & {}>;

var unknownChoices: choices<IUnknownChoiceList>;
var unknownChoicesAndEmpty: choices<IUnknownChoiceList & {}>;


//// [intersectionsAndEmptyObjects.js]
// Empty object type literals are removed from intersections types
// that contain other object types
var x01;
var x02;
var x03;
var x04;
var x05;
var x06;
var x07;
var x08;
var x09;
var x10;
var x11;
var x12;
var x13;
var x14;
let x01;
let x02;
let x03;
let x04;
let x05;
let x06;
let x07;
let x08;
let x09;
let x10;
let x11;
let x12;
let x13;
let x14;
const intersectDictionaries = (d1, d2) => Object.assign({}, d1, d2);
const testDictionary = (_value) => { };
const d1 = {};
testDictionary(d1);
const d2 = intersectDictionaries(d1, d1);
testDictionary(d2);
const d3 = {
s: '',
};
testDictionary(d3);
const d4 = intersectDictionaries(d1, d3);
testDictionary(d4);
const d5 = intersectDictionaries(d3, d1);
testDictionary(d5);
const d6 = intersectDictionaries(d3, d3);
testDictionary(d6);
var defaultChoices;
var defaultChoicesAndEmpty;
var myChoices;
var myChoicesAndEmpty;
var unknownChoices;
var unknownChoicesAndEmpty;
154 changes: 154 additions & 0 deletions tests/baselines/reference/intersectionsAndEmptyObjects.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,157 @@ let x14: A & B & C & D & E;
>D : Symbol(D, Decl(intersectionsAndEmptyObjects.ts, 15, 39))
>E : Symbol(E, Decl(intersectionsAndEmptyObjects.ts, 17, 14))

// Repro from #20225

type Dictionary = { [name: string]: string };
>Dictionary : Symbol(Dictionary, Decl(intersectionsAndEmptyObjects.ts, 24, 27))
>name : Symbol(name, Decl(intersectionsAndEmptyObjects.ts, 28, 21))

const intersectDictionaries = <F1 extends Dictionary, F2 extends Dictionary>(
>intersectDictionaries : Symbol(intersectDictionaries, Decl(intersectionsAndEmptyObjects.ts, 30, 5))
>F1 : Symbol(F1, Decl(intersectionsAndEmptyObjects.ts, 30, 31))
>Dictionary : Symbol(Dictionary, Decl(intersectionsAndEmptyObjects.ts, 24, 27))
>F2 : Symbol(F2, Decl(intersectionsAndEmptyObjects.ts, 30, 53))
>Dictionary : Symbol(Dictionary, Decl(intersectionsAndEmptyObjects.ts, 24, 27))

d1: F1,
>d1 : Symbol(d1, Decl(intersectionsAndEmptyObjects.ts, 30, 77))
>F1 : Symbol(F1, Decl(intersectionsAndEmptyObjects.ts, 30, 31))

d2: F2,
>d2 : Symbol(d2, Decl(intersectionsAndEmptyObjects.ts, 31, 9))
>F2 : Symbol(F2, Decl(intersectionsAndEmptyObjects.ts, 30, 53))

): F1 & F2 => Object.assign({}, d1, d2);
>F1 : Symbol(F1, Decl(intersectionsAndEmptyObjects.ts, 30, 31))
>F2 : Symbol(F2, Decl(intersectionsAndEmptyObjects.ts, 30, 53))
>Object.assign : Symbol(ObjectConstructor.assign, Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>assign : Symbol(ObjectConstructor.assign, Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
>d1 : Symbol(d1, Decl(intersectionsAndEmptyObjects.ts, 30, 77))
>d2 : Symbol(d2, Decl(intersectionsAndEmptyObjects.ts, 31, 9))

const testDictionary = <T extends Dictionary>(_value: T) => { };
>testDictionary : Symbol(testDictionary, Decl(intersectionsAndEmptyObjects.ts, 35, 5))
>T : Symbol(T, Decl(intersectionsAndEmptyObjects.ts, 35, 24))
>Dictionary : Symbol(Dictionary, Decl(intersectionsAndEmptyObjects.ts, 24, 27))
>_value : Symbol(_value, Decl(intersectionsAndEmptyObjects.ts, 35, 46))
>T : Symbol(T, Decl(intersectionsAndEmptyObjects.ts, 35, 24))

const d1 = {};
>d1 : Symbol(d1, Decl(intersectionsAndEmptyObjects.ts, 37, 5))

testDictionary(d1);
>testDictionary : Symbol(testDictionary, Decl(intersectionsAndEmptyObjects.ts, 35, 5))
>d1 : Symbol(d1, Decl(intersectionsAndEmptyObjects.ts, 37, 5))

const d2 = intersectDictionaries(d1, d1);
>d2 : Symbol(d2, Decl(intersectionsAndEmptyObjects.ts, 39, 5))
>intersectDictionaries : Symbol(intersectDictionaries, Decl(intersectionsAndEmptyObjects.ts, 30, 5))
>d1 : Symbol(d1, Decl(intersectionsAndEmptyObjects.ts, 37, 5))
>d1 : Symbol(d1, Decl(intersectionsAndEmptyObjects.ts, 37, 5))

testDictionary(d2);
>testDictionary : Symbol(testDictionary, Decl(intersectionsAndEmptyObjects.ts, 35, 5))
>d2 : Symbol(d2, Decl(intersectionsAndEmptyObjects.ts, 39, 5))

const d3 = {
>d3 : Symbol(d3, Decl(intersectionsAndEmptyObjects.ts, 42, 5))

s: '',
>s : Symbol(s, Decl(intersectionsAndEmptyObjects.ts, 42, 12))

};
testDictionary(d3);
>testDictionary : Symbol(testDictionary, Decl(intersectionsAndEmptyObjects.ts, 35, 5))
>d3 : Symbol(d3, Decl(intersectionsAndEmptyObjects.ts, 42, 5))

const d4 = intersectDictionaries(d1, d3);
>d4 : Symbol(d4, Decl(intersectionsAndEmptyObjects.ts, 46, 5))
>intersectDictionaries : Symbol(intersectDictionaries, Decl(intersectionsAndEmptyObjects.ts, 30, 5))
>d1 : Symbol(d1, Decl(intersectionsAndEmptyObjects.ts, 37, 5))
>d3 : Symbol(d3, Decl(intersectionsAndEmptyObjects.ts, 42, 5))

testDictionary(d4);
>testDictionary : Symbol(testDictionary, Decl(intersectionsAndEmptyObjects.ts, 35, 5))
>d4 : Symbol(d4, Decl(intersectionsAndEmptyObjects.ts, 46, 5))

const d5 = intersectDictionaries(d3, d1);
>d5 : Symbol(d5, Decl(intersectionsAndEmptyObjects.ts, 48, 5))
>intersectDictionaries : Symbol(intersectDictionaries, Decl(intersectionsAndEmptyObjects.ts, 30, 5))
>d3 : Symbol(d3, Decl(intersectionsAndEmptyObjects.ts, 42, 5))
>d1 : Symbol(d1, Decl(intersectionsAndEmptyObjects.ts, 37, 5))

testDictionary(d5);
>testDictionary : Symbol(testDictionary, Decl(intersectionsAndEmptyObjects.ts, 35, 5))
>d5 : Symbol(d5, Decl(intersectionsAndEmptyObjects.ts, 48, 5))

const d6 = intersectDictionaries(d3, d3);
>d6 : Symbol(d6, Decl(intersectionsAndEmptyObjects.ts, 50, 5))
>intersectDictionaries : Symbol(intersectDictionaries, Decl(intersectionsAndEmptyObjects.ts, 30, 5))
>d3 : Symbol(d3, Decl(intersectionsAndEmptyObjects.ts, 42, 5))
>d3 : Symbol(d3, Decl(intersectionsAndEmptyObjects.ts, 42, 5))

testDictionary(d6);
>testDictionary : Symbol(testDictionary, Decl(intersectionsAndEmptyObjects.ts, 35, 5))
>d6 : Symbol(d6, Decl(intersectionsAndEmptyObjects.ts, 50, 5))

// Repro from #27044

type choices<IChoiceList extends {
>choices : Symbol(choices, Decl(intersectionsAndEmptyObjects.ts, 51, 19))
>IChoiceList : Symbol(IChoiceList, Decl(intersectionsAndEmptyObjects.ts, 55, 13))

[key: string]: boolean;
>key : Symbol(key, Decl(intersectionsAndEmptyObjects.ts, 56, 5))

}> = IChoiceList & {
>IChoiceList : Symbol(IChoiceList, Decl(intersectionsAndEmptyObjects.ts, 55, 13))

shoes:boolean;
>shoes : Symbol(shoes, Decl(intersectionsAndEmptyObjects.ts, 57, 20))

food:boolean;
>food : Symbol(food, Decl(intersectionsAndEmptyObjects.ts, 58, 18))

};

type IMyChoiceList = {
>IMyChoiceList : Symbol(IMyChoiceList, Decl(intersectionsAndEmptyObjects.ts, 60, 2))

car: true
>car : Symbol(car, Decl(intersectionsAndEmptyObjects.ts, 62, 22))

};

type IUnknownChoiceList = {};
>IUnknownChoiceList : Symbol(IUnknownChoiceList, Decl(intersectionsAndEmptyObjects.ts, 64, 2))

var defaultChoices: choices<{}>;
>defaultChoices : Symbol(defaultChoices, Decl(intersectionsAndEmptyObjects.ts, 68, 3))
>choices : Symbol(choices, Decl(intersectionsAndEmptyObjects.ts, 51, 19))

var defaultChoicesAndEmpty: choices<{} & {}>;
>defaultChoicesAndEmpty : Symbol(defaultChoicesAndEmpty, Decl(intersectionsAndEmptyObjects.ts, 69, 3))
>choices : Symbol(choices, Decl(intersectionsAndEmptyObjects.ts, 51, 19))

var myChoices: choices<IMyChoiceList>;
>myChoices : Symbol(myChoices, Decl(intersectionsAndEmptyObjects.ts, 71, 3))
>choices : Symbol(choices, Decl(intersectionsAndEmptyObjects.ts, 51, 19))
>IMyChoiceList : Symbol(IMyChoiceList, Decl(intersectionsAndEmptyObjects.ts, 60, 2))

var myChoicesAndEmpty: choices<IMyChoiceList & {}>;
>myChoicesAndEmpty : Symbol(myChoicesAndEmpty, Decl(intersectionsAndEmptyObjects.ts, 72, 3))
>choices : Symbol(choices, Decl(intersectionsAndEmptyObjects.ts, 51, 19))
>IMyChoiceList : Symbol(IMyChoiceList, Decl(intersectionsAndEmptyObjects.ts, 60, 2))

var unknownChoices: choices<IUnknownChoiceList>;
>unknownChoices : Symbol(unknownChoices, Decl(intersectionsAndEmptyObjects.ts, 74, 3))
>choices : Symbol(choices, Decl(intersectionsAndEmptyObjects.ts, 51, 19))
>IUnknownChoiceList : Symbol(IUnknownChoiceList, Decl(intersectionsAndEmptyObjects.ts, 64, 2))

var unknownChoicesAndEmpty: choices<IUnknownChoiceList & {}>;
>unknownChoicesAndEmpty : Symbol(unknownChoicesAndEmpty, Decl(intersectionsAndEmptyObjects.ts, 75, 3))
>choices : Symbol(choices, Decl(intersectionsAndEmptyObjects.ts, 51, 19))
>IUnknownChoiceList : Symbol(IUnknownChoiceList, Decl(intersectionsAndEmptyObjects.ts, 64, 2))

Loading