From e579c09c2c4431178fde5313a3ed5546c651b722 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Mon, 16 May 2016 09:59:16 -0700 Subject: [PATCH] Improve test: nested object literal with intersection --- .../reference/intersectionTypeMembers.js | 20 ++++++--- .../reference/intersectionTypeMembers.symbols | 34 ++++++++++---- .../reference/intersectionTypeMembers.types | 45 ++++++++++++++----- .../intersection/intersectionTypeMembers.ts | 12 +++-- 4 files changed, 82 insertions(+), 29 deletions(-) diff --git a/tests/baselines/reference/intersectionTypeMembers.js b/tests/baselines/reference/intersectionTypeMembers.js index 3dfe9bfe8b8..59968b007db 100644 --- a/tests/baselines/reference/intersectionTypeMembers.js +++ b/tests/baselines/reference/intersectionTypeMembers.js @@ -28,15 +28,19 @@ var s = f("hello"); var n = f(42); interface D { - nested: {d: string;}; + nested: { doublyNested: { d: string; }, different: { e: number } }; } interface E { - nested: { e: string; }; + nested: { doublyNested: { f: string; }, other: {g: number } }; } const de: D & E = { nested: { - d: 'yes', - e: 'no' + doublyNested: { + d: 'yes', + f: 'no' + }, + different: { e: 12 }, + other: { g: 101 } } } @@ -57,7 +61,11 @@ var s = f("hello"); var n = f(42); var de = { nested: { - d: 'yes', - e: 'no' + doublyNested: { + d: 'yes', + f: 'no' + }, + different: { e: 12 }, + other: { g: 101 } } }; diff --git a/tests/baselines/reference/intersectionTypeMembers.symbols b/tests/baselines/reference/intersectionTypeMembers.symbols index 3d81df03230..be47b2960db 100644 --- a/tests/baselines/reference/intersectionTypeMembers.symbols +++ b/tests/baselines/reference/intersectionTypeMembers.symbols @@ -101,16 +101,22 @@ var n = f(42); interface D { >D : Symbol(D, Decl(intersectionTypeMembers.ts, 26, 14)) - nested: {d: string;}; + nested: { doublyNested: { d: string; }, different: { e: number } }; >nested : Symbol(D.nested, Decl(intersectionTypeMembers.ts, 28, 13)) ->d : Symbol(d, Decl(intersectionTypeMembers.ts, 29, 13)) +>doublyNested : Symbol(doublyNested, Decl(intersectionTypeMembers.ts, 29, 13)) +>d : Symbol(d, Decl(intersectionTypeMembers.ts, 29, 29)) +>different : Symbol(different, Decl(intersectionTypeMembers.ts, 29, 43)) +>e : Symbol(e, Decl(intersectionTypeMembers.ts, 29, 56)) } interface E { >E : Symbol(E, Decl(intersectionTypeMembers.ts, 30, 1)) - nested: { e: string; }; + nested: { doublyNested: { f: string; }, other: {g: number } }; >nested : Symbol(E.nested, Decl(intersectionTypeMembers.ts, 31, 13)) ->e : Symbol(e, Decl(intersectionTypeMembers.ts, 32, 13)) +>doublyNested : Symbol(doublyNested, Decl(intersectionTypeMembers.ts, 32, 13)) +>f : Symbol(f, Decl(intersectionTypeMembers.ts, 32, 29)) +>other : Symbol(other, Decl(intersectionTypeMembers.ts, 32, 43)) +>g : Symbol(g, Decl(intersectionTypeMembers.ts, 32, 52)) } const de: D & E = { >de : Symbol(de, Decl(intersectionTypeMembers.ts, 34, 5)) @@ -120,11 +126,23 @@ const de: D & E = { nested: { >nested : Symbol(nested, Decl(intersectionTypeMembers.ts, 34, 19)) - d: 'yes', ->d : Symbol(d, Decl(intersectionTypeMembers.ts, 35, 13)) + doublyNested: { +>doublyNested : Symbol(doublyNested, Decl(intersectionTypeMembers.ts, 35, 13)) - e: 'no' ->e : Symbol(e, Decl(intersectionTypeMembers.ts, 36, 17)) + d: 'yes', +>d : Symbol(d, Decl(intersectionTypeMembers.ts, 36, 23)) + + f: 'no' +>f : Symbol(f, Decl(intersectionTypeMembers.ts, 37, 21)) + + }, + different: { e: 12 }, +>different : Symbol(different, Decl(intersectionTypeMembers.ts, 39, 10)) +>e : Symbol(e, Decl(intersectionTypeMembers.ts, 40, 20)) + + other: { g: 101 } +>other : Symbol(other, Decl(intersectionTypeMembers.ts, 40, 29)) +>g : Symbol(g, Decl(intersectionTypeMembers.ts, 41, 16)) } } diff --git a/tests/baselines/reference/intersectionTypeMembers.types b/tests/baselines/reference/intersectionTypeMembers.types index 0d1b82a9b5b..2c4fbcc5fc1 100644 --- a/tests/baselines/reference/intersectionTypeMembers.types +++ b/tests/baselines/reference/intersectionTypeMembers.types @@ -117,34 +117,57 @@ var n = f(42); interface D { >D : D - nested: {d: string;}; ->nested : { d: string; } + nested: { doublyNested: { d: string; }, different: { e: number } }; +>nested : { doublyNested: { d: string; }; different: { e: number; }; } +>doublyNested : { d: string; } >d : string +>different : { e: number; } +>e : number } interface E { >E : E - nested: { e: string; }; ->nested : { e: string; } ->e : string + nested: { doublyNested: { f: string; }, other: {g: number } }; +>nested : { doublyNested: { f: string; }; other: { g: number; }; } +>doublyNested : { f: string; } +>f : string +>other : { g: number; } +>g : number } const de: D & E = { >de : D & E >D : D >E : E ->{ nested: { d: 'yes', e: 'no' }} : { nested: { d: string; e: string; }; } +>{ nested: { doublyNested: { d: 'yes', f: 'no' }, different: { e: 12 }, other: { g: 101 } }} : { nested: { doublyNested: { d: string; f: string; }; different: { e: number; }; other: { g: number; }; }; } nested: { ->nested : { d: string; e: string; } ->{ d: 'yes', e: 'no' } : { d: string; e: string; } +>nested : { doublyNested: { d: string; f: string; }; different: { e: number; }; other: { g: number; }; } +>{ doublyNested: { d: 'yes', f: 'no' }, different: { e: 12 }, other: { g: 101 } } : { doublyNested: { d: string; f: string; }; different: { e: number; }; other: { g: number; }; } - d: 'yes', + doublyNested: { +>doublyNested : { d: string; f: string; } +>{ d: 'yes', f: 'no' } : { d: string; f: string; } + + d: 'yes', >d : string >'yes' : string - e: 'no' ->e : string + f: 'no' +>f : string >'no' : string + + }, + different: { e: 12 }, +>different : { e: number; } +>{ e: 12 } : { e: number; } +>e : number +>12 : number + + other: { g: 101 } +>other : { g: number; } +>{ g: 101 } : { g: number; } +>g : number +>101 : number } } diff --git a/tests/cases/conformance/types/intersection/intersectionTypeMembers.ts b/tests/cases/conformance/types/intersection/intersectionTypeMembers.ts index 5a81efbb32a..a350c657f61 100644 --- a/tests/cases/conformance/types/intersection/intersectionTypeMembers.ts +++ b/tests/cases/conformance/types/intersection/intersectionTypeMembers.ts @@ -27,14 +27,18 @@ var s = f("hello"); var n = f(42); interface D { - nested: {d: string;}; + nested: { doublyNested: { d: string; }, different: { e: number } }; } interface E { - nested: { e: string; }; + nested: { doublyNested: { f: string; }, other: {g: number } }; } const de: D & E = { nested: { - d: 'yes', - e: 'no' + doublyNested: { + d: 'yes', + f: 'no' + }, + different: { e: 12 }, + other: { g: 101 } } }