Skip to content
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.

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

only emit /// types reference for a symbol in d.ts file if all declarations of a symbol come from type reference directives #11872

Merged
merged 2 commits into from
Oct 27, 2016
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
4 changes: 4 additions & 0 deletions src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19505,6 +19505,10 @@ namespace ts {
if (typeReferenceDirective) {
(typeReferenceDirectives || (typeReferenceDirectives = [])).push(typeReferenceDirective);
}
else {
// found at least one entry that does not originate from type reference directive
return undefined;
}
}
}
return typeReferenceDirectives;
Expand Down
40 changes: 40 additions & 0 deletions tests/baselines/reference/declarationFilesWithTypeReferences1.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
//// [tests/cases/compiler/declarationFilesWithTypeReferences1.ts] ////

//// [index.d.ts]

interface Error {
stack2: string;
}

//// [app.ts]

function foo(): Error {
return undefined;
}

//// [app.js]
function foo() {
return undefined;
}


//// [app.d.ts]
declare function foo(): Error;


//// [DtsFileErrors]


error TS2688: Cannot find type definition file for 'node'.


!!! error TS2688: Cannot find type definition file for 'node'.
==== /node_modules/@types/node/index.d.ts (0 errors) ====

interface Error {
stack2: string;
}

==== /app.d.ts (0 errors) ====
declare function foo(): Error;

Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
=== /node_modules/@types/node/index.d.ts ===

interface Error {
>Error : Symbol(Error, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(index.d.ts, 0, 0))

stack2: string;
>stack2 : Symbol(Error.stack2, Decl(index.d.ts, 1, 17))
}

=== /app.ts ===

function foo(): Error {
>foo : Symbol(foo, Decl(app.ts, 0, 0))
>Error : Symbol(Error, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(index.d.ts, 0, 0))

return undefined;
>undefined : Symbol(undefined)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
=== /node_modules/@types/node/index.d.ts ===

interface Error {
>Error : Error

stack2: string;
>stack2 : string
}

=== /app.ts ===

function foo(): Error {
>foo : () => Error
>Error : Error

return undefined;
>undefined : undefined
}
42 changes: 42 additions & 0 deletions tests/baselines/reference/declarationFilesWithTypeReferences2.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
//// [tests/cases/compiler/declarationFilesWithTypeReferences2.ts] ////

//// [index.d.ts]

interface Error2 {
stack2: string;
}

//// [app.ts]

function foo(): Error2 {
return undefined;
}

//// [app.js]
function foo() {
return undefined;
}


//// [app.d.ts]
/// <reference types="node" />
declare function foo(): Error2;


//// [DtsFileErrors]


error TS2688: Cannot find type definition file for 'node'.


!!! error TS2688: Cannot find type definition file for 'node'.
==== /node_modules/@types/node/index.d.ts (0 errors) ====

interface Error2 {
stack2: string;
}

==== /app.d.ts (0 errors) ====
/// <reference types="node" />
declare function foo(): Error2;

Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
=== /node_modules/@types/node/index.d.ts ===

interface Error2 {
>Error2 : Symbol(Error2, Decl(index.d.ts, 0, 0))

stack2: string;
>stack2 : Symbol(Error2.stack2, Decl(index.d.ts, 1, 18))
}

=== /app.ts ===

function foo(): Error2 {
>foo : Symbol(foo, Decl(app.ts, 0, 0))
>Error2 : Symbol(Error2, Decl(index.d.ts, 0, 0))

return undefined;
>undefined : Symbol(undefined)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
=== /node_modules/@types/node/index.d.ts ===

interface Error2 {
>Error2 : Error2

stack2: string;
>stack2 : string
}

=== /app.ts ===

function foo(): Error2 {
>foo : () => Error2
>Error2 : Error2

return undefined;
>undefined : undefined
}
24 changes: 24 additions & 0 deletions tests/baselines/reference/declarationFilesWithTypeReferences3.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
//// [tests/cases/compiler/declarationFilesWithTypeReferences3.ts] ////

//// [index.d.ts]

interface Error2 {
stack2: string;
}

//// [app.ts]
/// <reference types="node"/>
function foo(): Error2 {
return undefined;
}

//// [app.js]
/// <reference types="node"/>
function foo() {
return undefined;
}


//// [app.d.ts]
/// <reference types="node" />
declare function foo(): Error2;
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
=== /a/node_modules/@types/node/index.d.ts ===

interface Error2 {
>Error2 : Symbol(Error2, Decl(index.d.ts, 0, 0))

stack2: string;
>stack2 : Symbol(Error2.stack2, Decl(index.d.ts, 1, 18))
}

=== /a/app.ts ===
/// <reference types="node"/>
function foo(): Error2 {
>foo : Symbol(foo, Decl(app.ts, 0, 0))
>Error2 : Symbol(Error2, Decl(index.d.ts, 0, 0))

return undefined;
>undefined : Symbol(undefined)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
=== /a/node_modules/@types/node/index.d.ts ===

interface Error2 {
>Error2 : Error2

stack2: string;
>stack2 : string
}

=== /a/app.ts ===
/// <reference types="node"/>
function foo(): Error2 {
>foo : () => Error2
>Error2 : Error2

return undefined;
>undefined : undefined
}
23 changes: 23 additions & 0 deletions tests/baselines/reference/declarationFilesWithTypeReferences4.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//// [tests/cases/compiler/declarationFilesWithTypeReferences4.ts] ////

//// [index.d.ts]

interface Error {
stack2: string;
}

//// [app.ts]
/// <reference types="node"/>
function foo(): Error {
return undefined;
}

//// [app.js]
/// <reference types="node"/>
function foo() {
return undefined;
}


//// [app.d.ts]
declare function foo(): Error;
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
=== /a/node_modules/@types/node/index.d.ts ===

interface Error {
>Error : Symbol(Error, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(index.d.ts, 0, 0))

stack2: string;
>stack2 : Symbol(Error.stack2, Decl(index.d.ts, 1, 17))
}

=== /a/app.ts ===
/// <reference types="node"/>
function foo(): Error {
>foo : Symbol(foo, Decl(app.ts, 0, 0))
>Error : Symbol(Error, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(index.d.ts, 0, 0))

return undefined;
>undefined : Symbol(undefined)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
=== /a/node_modules/@types/node/index.d.ts ===

interface Error {
>Error : Error

stack2: string;
>stack2 : string
}

=== /a/app.ts ===
/// <reference types="node"/>
function foo(): Error {
>foo : () => Error
>Error : Error

return undefined;
>undefined : undefined
}
14 changes: 14 additions & 0 deletions tests/cases/compiler/declarationFilesWithTypeReferences1.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// @types: node
// @declaration: true
// @currentDirectory: /

// @filename: /node_modules/@types/node/index.d.ts
interface Error {
stack2: string;
}

// @filename: /app.ts

function foo(): Error {
return undefined;
}
14 changes: 14 additions & 0 deletions tests/cases/compiler/declarationFilesWithTypeReferences2.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// @types: node
// @declaration: true
// @currentDirectory: /

// @filename: /node_modules/@types/node/index.d.ts
interface Error2 {
stack2: string;
}

// @filename: /app.ts

function foo(): Error2 {
return undefined;
}
12 changes: 12 additions & 0 deletions tests/cases/compiler/declarationFilesWithTypeReferences3.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// @declaration: true

// @filename: /a/node_modules/@types/node/index.d.ts
interface Error2 {
stack2: string;
}

// @filename: /a/app.ts
/// <reference types="node"/>
function foo(): Error2 {
return undefined;
}
12 changes: 12 additions & 0 deletions tests/cases/compiler/declarationFilesWithTypeReferences4.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// @declaration: true

// @filename: /a/node_modules/@types/node/index.d.ts
interface Error {
stack2: string;
}

// @filename: /a/app.ts
/// <reference types="node"/>
function foo(): Error {
return undefined;
}