-
Notifications
You must be signed in to change notification settings - Fork 12.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Do for unions of many empty-object-spreadables what we did for unions…
… of 2 (#42233) * Do for unions of many empty-object-spreadables what we did for unions of 2 * Accept baseline
- Loading branch information
Showing
15 changed files
with
281 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
tests/baselines/reference/objectSpreadRepeatedComplexity.types
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| //// [spreadIdenticalTypesRemoved.ts] | ||
| interface Animal { | ||
| name: string; | ||
| kind: string; | ||
| age: number; | ||
| location: string; | ||
| owner: object; | ||
| } | ||
|
|
||
| function clonePet(pet: Animal, fullCopy?: boolean) { | ||
| return { | ||
| name: pet.name, | ||
| kind: pet.kind, | ||
| ...(fullCopy && pet), | ||
| } | ||
| } | ||
|
|
||
| interface Animal2 { | ||
| name: string; | ||
| owner?: string; | ||
| } | ||
| function billOwner(pet: Animal2) { | ||
| return { | ||
| ...(pet.owner && pet), | ||
| paid: false | ||
| } | ||
| } | ||
|
|
||
|
|
||
| //// [spreadIdenticalTypesRemoved.js] | ||
| "use strict"; | ||
| var __assign = (this && this.__assign) || function () { | ||
| __assign = Object.assign || function(t) { | ||
| for (var s, i = 1, n = arguments.length; i < n; i++) { | ||
| s = arguments[i]; | ||
| for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) | ||
| t[p] = s[p]; | ||
| } | ||
| return t; | ||
| }; | ||
| return __assign.apply(this, arguments); | ||
| }; | ||
| function clonePet(pet, fullCopy) { | ||
| return __assign({ name: pet.name, kind: pet.kind }, (fullCopy && pet)); | ||
| } | ||
| function billOwner(pet) { | ||
| return __assign(__assign({}, (pet.owner && pet)), { paid: false }); | ||
| } |
71 changes: 71 additions & 0 deletions
71
tests/baselines/reference/spreadIdenticalTypesRemoved.symbols
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| === tests/cases/compiler/spreadIdenticalTypesRemoved.ts === | ||
| interface Animal { | ||
| >Animal : Symbol(Animal, Decl(spreadIdenticalTypesRemoved.ts, 0, 0)) | ||
|
|
||
| name: string; | ||
| >name : Symbol(Animal.name, Decl(spreadIdenticalTypesRemoved.ts, 0, 18)) | ||
|
|
||
| kind: string; | ||
| >kind : Symbol(Animal.kind, Decl(spreadIdenticalTypesRemoved.ts, 1, 17)) | ||
|
|
||
| age: number; | ||
| >age : Symbol(Animal.age, Decl(spreadIdenticalTypesRemoved.ts, 2, 17)) | ||
|
|
||
| location: string; | ||
| >location : Symbol(Animal.location, Decl(spreadIdenticalTypesRemoved.ts, 3, 16)) | ||
|
|
||
| owner: object; | ||
| >owner : Symbol(Animal.owner, Decl(spreadIdenticalTypesRemoved.ts, 4, 21)) | ||
| } | ||
|
|
||
| function clonePet(pet: Animal, fullCopy?: boolean) { | ||
| >clonePet : Symbol(clonePet, Decl(spreadIdenticalTypesRemoved.ts, 6, 1)) | ||
| >pet : Symbol(pet, Decl(spreadIdenticalTypesRemoved.ts, 8, 18)) | ||
| >Animal : Symbol(Animal, Decl(spreadIdenticalTypesRemoved.ts, 0, 0)) | ||
| >fullCopy : Symbol(fullCopy, Decl(spreadIdenticalTypesRemoved.ts, 8, 30)) | ||
|
|
||
| return { | ||
| name: pet.name, | ||
| >name : Symbol(name, Decl(spreadIdenticalTypesRemoved.ts, 9, 12)) | ||
| >pet.name : Symbol(Animal.name, Decl(spreadIdenticalTypesRemoved.ts, 0, 18)) | ||
| >pet : Symbol(pet, Decl(spreadIdenticalTypesRemoved.ts, 8, 18)) | ||
| >name : Symbol(Animal.name, Decl(spreadIdenticalTypesRemoved.ts, 0, 18)) | ||
|
|
||
| kind: pet.kind, | ||
| >kind : Symbol(kind, Decl(spreadIdenticalTypesRemoved.ts, 10, 23)) | ||
| >pet.kind : Symbol(Animal.kind, Decl(spreadIdenticalTypesRemoved.ts, 1, 17)) | ||
| >pet : Symbol(pet, Decl(spreadIdenticalTypesRemoved.ts, 8, 18)) | ||
| >kind : Symbol(Animal.kind, Decl(spreadIdenticalTypesRemoved.ts, 1, 17)) | ||
|
|
||
| ...(fullCopy && pet), | ||
| >fullCopy : Symbol(fullCopy, Decl(spreadIdenticalTypesRemoved.ts, 8, 30)) | ||
| >pet : Symbol(pet, Decl(spreadIdenticalTypesRemoved.ts, 8, 18)) | ||
| } | ||
| } | ||
|
|
||
| interface Animal2 { | ||
| >Animal2 : Symbol(Animal2, Decl(spreadIdenticalTypesRemoved.ts, 14, 1)) | ||
|
|
||
| name: string; | ||
| >name : Symbol(Animal2.name, Decl(spreadIdenticalTypesRemoved.ts, 16, 19)) | ||
|
|
||
| owner?: string; | ||
| >owner : Symbol(Animal2.owner, Decl(spreadIdenticalTypesRemoved.ts, 17, 17)) | ||
| } | ||
| function billOwner(pet: Animal2) { | ||
| >billOwner : Symbol(billOwner, Decl(spreadIdenticalTypesRemoved.ts, 19, 1)) | ||
| >pet : Symbol(pet, Decl(spreadIdenticalTypesRemoved.ts, 20, 19)) | ||
| >Animal2 : Symbol(Animal2, Decl(spreadIdenticalTypesRemoved.ts, 14, 1)) | ||
|
|
||
| return { | ||
| ...(pet.owner && pet), | ||
| >pet.owner : Symbol(Animal2.owner, Decl(spreadIdenticalTypesRemoved.ts, 17, 17)) | ||
| >pet : Symbol(pet, Decl(spreadIdenticalTypesRemoved.ts, 20, 19)) | ||
| >owner : Symbol(Animal2.owner, Decl(spreadIdenticalTypesRemoved.ts, 17, 17)) | ||
| >pet : Symbol(pet, Decl(spreadIdenticalTypesRemoved.ts, 20, 19)) | ||
|
|
||
| paid: false | ||
| >paid : Symbol(paid, Decl(spreadIdenticalTypesRemoved.ts, 22, 30)) | ||
| } | ||
| } | ||
|
|
Oops, something went wrong.