Skip to content

Fix circular mapped type instantiations for arrays and tuples #27911

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
ahejlsberg merged 8 commits into from
Oct 15, 2018
Merged

Fix circular mapped type instantiations for arrays and tuples #27911

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d069875
Allow discriminant property to contain some non-unit types
ahejlsberg Oct 10, 2018
c110f57
Discriminant must include at least one unit type and no instantiable …
ahejlsberg Oct 10, 2018
7737cd5
Accept new baselines
ahejlsberg Oct 10, 2018
22907bf
Add tests
ahejlsberg Oct 10, 2018
6cdba6d
Accept new baselines
ahejlsberg Oct 10, 2018
709f5f2
Handle circular mapped type instantiations for arrays and tuples
ahejlsberg Oct 15, 2018
0c3221c
Add regression test
ahejlsberg Oct 15, 2018
3930525
Accept new baselines
ahejlsberg Oct 15, 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
Prev Previous commit
Next Next commit
Accept new baselines
  • Loading branch information
@ahejlsberg
ahejlsberg committed Oct 10, 2018
commit 7737cd5f1fe07d47b00b1f5e189a73e060c78c19
10 changes: 4 additions & 6 deletions tests/baselines/reference/objectLiteralNormalization.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts
Types of property 'a' are incompatible.
Type 'string' is not assignable to type 'undefined'.
tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts(18,1): error TS2322: Type '{ a: number; }' is not assignable to type '{ a: number; b: number; } | { a: string; b?: undefined; } | { a?: undefined; b?: undefined; }'.
Type '{ a: number; }' is not assignable to type '{ a?: undefined; b?: undefined; }'.
Types of property 'a' are incompatible.
Type 'number' is not assignable to type 'undefined'.
Type '{ a: number; }' is not assignable to type '{ a: number; b: number; }'.
Property 'b' is missing in type '{ a: number; }'.


==== tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts (5 errors) ====
Expand Down Expand Up @@ -52,9 +51,8 @@ tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts
a2 = { a: 1 }; // Error
~~
!!! error TS2322: Type '{ a: number; }' is not assignable to type '{ a: number; b: number; } | { a: string; b?: undefined; } | { a?: undefined; b?: undefined; }'.
!!! error TS2322: Type '{ a: number; }' is not assignable to type '{ a?: undefined; b?: undefined; }'.
!!! error TS2322: Types of property 'a' are incompatible.
!!! error TS2322: Type 'number' is not assignable to type 'undefined'.
!!! error TS2322: Type '{ a: number; }' is not assignable to type '{ a: number; b: number; }'.
Copy link
Copy Markdown
Member

@sandersn sandersn Oct 15, 2018

Choose a reason for hiding this comment

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

any idea why this changes? I don't see any mapped types here.

Copy link
Copy Markdown
Member

@sandersn sandersn Oct 15, 2018

Choose a reason for hiding this comment

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

Never mind, didn't see the change to discriminant types.

!!! error TS2322: Property 'b' is missing in type '{ a: number; }'.

// Object literals containing spreads are not normalized
declare let b1: { a: string, b: string } | { b: string, c: string };
Expand Down