Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
7 changes: 5 additions & 2 deletions src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47735,11 +47735,14 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
function addReferencedFilesToTypeDirective(file: SourceFile, key: string, mode: ResolutionMode) {
if (fileToDirective.has(file.path)) return;
fileToDirective.set(file.path, [key, mode]);
for (const { fileName, resolutionMode } of file.referencedFiles) {
for (const { fileName } of file.referencedFiles) {
const resolvedFile = resolveTripleslashReference(fileName, file.fileName);
const referencedFile = host.getSourceFile(resolvedFile);
if (referencedFile) {
addReferencedFilesToTypeDirective(referencedFile, key, resolutionMode || file.impliedNodeFormat);
// The resolution mode of the file reference doesn't actually matter here -
// all we're recording is the fact that the file entered the compilation
// transitively via a type reference directive of {key} with mode {mode}.
addReferencedFilesToTypeDirective(referencedFile, key, mode || file.impliedNodeFormat);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
//// [tests/cases/compiler/dtsEmitTripleSlashAvoidUnnecessaryResolutionMode.ts] ////

//// [package.json]
{
"name": "@types/node",
"version": "1.0.0",
"types": "index.d.ts"
}

//// [globals.d.ts]
declare namespace NodeJS {
interface ReadableStream {}
}

//// [index.d.ts]
/// <reference path="globals.d.ts" />

//// [app.mts]
/// <reference types="node" />
export async function drainStream(stream: NodeJS.ReadableStream): Promise<void> {
}




//// [app.d.mts]
/// <reference types="node" />
export declare function drainStream(stream: NodeJS.ReadableStream): Promise<void>;
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
//// [tests/cases/compiler/dtsEmitTripleSlashAvoidUnnecessaryResolutionMode.ts] ////

=== /app.mts ===
/// <reference types="node" />
export async function drainStream(stream: NodeJS.ReadableStream): Promise<void> {
>drainStream : Symbol(drainStream, Decl(app.mts, 0, 0))
>stream : Symbol(stream, Decl(app.mts, 1, 34))
>NodeJS : Symbol(NodeJS, Decl(globals.d.ts, 0, 0))
>ReadableStream : Symbol(NodeJS.ReadableStream, Decl(globals.d.ts, 0, 26))
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2018.promise.d.ts, --, --))
}

=== /node_modules/@types/node/globals.d.ts ===
declare namespace NodeJS {
>NodeJS : Symbol(NodeJS, Decl(globals.d.ts, 0, 0))

interface ReadableStream {}
>ReadableStream : Symbol(ReadableStream, Decl(globals.d.ts, 0, 26))
}

=== /node_modules/@types/node/index.d.ts ===

/// <reference path="globals.d.ts" />

Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//// [tests/cases/compiler/dtsEmitTripleSlashAvoidUnnecessaryResolutionMode.ts] ////

=== /app.mts ===
/// <reference types="node" />
export async function drainStream(stream: NodeJS.ReadableStream): Promise<void> {
>drainStream : (stream: NodeJS.ReadableStream) => Promise<void>
>stream : NodeJS.ReadableStream
>NodeJS : any
}

=== /node_modules/@types/node/globals.d.ts ===

declare namespace NodeJS {
interface ReadableStream {}
}

=== /node_modules/@types/node/index.d.ts ===

/// <reference path="globals.d.ts" />

Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// @Filename: /tsconfig.json
{
"compilerOptions": {
"module": "nodenext",
"types": [],
"declaration": true,
"emitDeclarationOnly": true,
}
}

// @Filename: /node_modules/@types/node/package.json
{
"name": "@types/node",
"version": "1.0.0",
"types": "index.d.ts"
}

// @Filename: /node_modules/@types/node/globals.d.ts
declare namespace NodeJS {
interface ReadableStream {}
}

// @Filename: /node_modules/@types/node/index.d.ts
/// <reference path="globals.d.ts" />

// @Filename: /app.mts
/// <reference types="node" />
export async function drainStream(stream: NodeJS.ReadableStream): Promise<void> {
}