Skip to content

Commit 9a775a4

Browse files
andrewbranchandrewbranch
committed
Require module/moduleResolution to match when either is node16/nodenext
1 parent fbd63e9 commit 9a775a4

File tree

36 files changed

+648
-750
lines changed

36 files changed

+648
-750
lines changed

‎src/compiler/diagnosticMessages.json

+8
Original file line numberDiff line numberDiff line change
@@ -4329,6 +4329,14 @@
43294329
"category": "Error",
43304330
"code": 5108
43314331
},
4332+
"Option 'moduleResolution' must be set to '{0}' (or left unspecified) when option 'module' is set to '{1}'.": {
4333+
"category": "Error",
4334+
"code": 5109
4335+
},
4336+
"Option 'module' must be set to '{0}' when option 'moduleResolution' is set to '{1}'.": {
4337+
"category": "Error",
4338+
"code": 5110
4339+
},
43324340

43334341
"Generates a sourcemap for each corresponding '.d.ts' file.": {
43344342
"category": "Message",

‎src/compiler/program.ts

+16
Original file line numberDiff line numberDiff line change
@@ -4402,6 +4402,22 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
44024402
createOptionValueDiagnostic("moduleResolution", Diagnostics.Option_0_can_only_be_used_when_module_is_set_to_es2015_or_later, "bundler");
44034403
}
44044404

4405+
if (
4406+
(ModuleKind.Node16 <= moduleKind && moduleKind <= ModuleKind.NodeNext) &&
4407+
!(ModuleResolutionKind.Node16 <= moduleResolution && moduleResolution <= ModuleResolutionKind.NodeNext)
4408+
) {
4409+
const moduleKindName = ModuleKind[moduleKind];
4410+
createOptionValueDiagnostic("moduleResolution", Diagnostics.Option_moduleResolution_must_be_set_to_0_or_left_unspecified_when_option_module_is_set_to_1, moduleKindName, moduleKindName);
4411+
}
4412+
else if (
4413+
(ModuleResolutionKind.Node16 <= moduleResolution && moduleResolution <= ModuleResolutionKind.NodeNext) &&
4414+
!(ModuleKind.Node16 <= moduleKind && moduleKind <= ModuleKind.NodeNext)
4415+
) {
4416+
const moduleResolutionName = ModuleResolutionKind[moduleResolution];
4417+
createOptionValueDiagnostic("module", Diagnostics.Option_module_must_be_set_to_0_when_option_moduleResolution_is_set_to_1, moduleResolutionName, moduleResolutionName);
4418+
}
4419+
4420+
44054421
// If the emit is enabled make sure that every output file is unique and not overwriting any of the input files
44064422
if (!options.noEmit && !options.suppressOutputPathCheck) {
44074423
const emitHost = getEmitHost();

‎tests/baselines/reference/allowImportingTsExtensions(moduleresolution=node16).errors.txt

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
12
/c.ts(1,16): error TS2307: Cannot find module './thisfiledoesnotexist.ts' or its corresponding type declarations.
23

34

5+
!!! error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
46
==== /ts.ts (0 errors) ====
57
export {};
68

‎tests/baselines/reference/allowImportingTsExtensions(moduleresolution=nodenext).errors.txt

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
error TS5110: Option 'module' must be set to 'NodeNext' when option 'moduleResolution' is set to 'NodeNext'.
12
/c.ts(1,16): error TS2307: Cannot find module './thisfiledoesnotexist.ts' or its corresponding type declarations.
23

34

5+
!!! error TS5110: Option 'module' must be set to 'NodeNext' when option 'moduleResolution' is set to 'NodeNext'.
46
==== /ts.ts (0 errors) ====
57
export {};
68

‎tests/baselines/reference/allowImportingTypesDtsExtension(allowimportingtsextensions=false,moduleresolution=node16).errors.txt

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
2+
3+
4+
!!! error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
5+
==== /types.d.ts (0 errors) ====
6+
export declare type User = {
7+
name: string;
8+
}
9+
10+
==== /a.ts (0 errors) ====
11+
import type { User } from "./types.d.ts";
12+
export type { User } from "./types.d.ts";
13+
14+
export const user: User = { name: "John" };
15+
16+
export function getUser(): import("./types.d.ts").User {
17+
return user;
18+
}
19+

‎tests/baselines/reference/allowImportingTypesDtsExtension(allowimportingtsextensions=false,moduleresolution=nodenext).errors.txt

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
error TS5110: Option 'module' must be set to 'NodeNext' when option 'moduleResolution' is set to 'NodeNext'.
2+
3+
4+
!!! error TS5110: Option 'module' must be set to 'NodeNext' when option 'moduleResolution' is set to 'NodeNext'.
5+
==== /types.d.ts (0 errors) ====
6+
export declare type User = {
7+
name: string;
8+
}
9+
10+
==== /a.ts (0 errors) ====
11+
import type { User } from "./types.d.ts";
12+
export type { User } from "./types.d.ts";
13+
14+
export const user: User = { name: "John" };
15+
16+
export function getUser(): import("./types.d.ts").User {
17+
return user;
18+
}
19+

‎tests/baselines/reference/allowImportingTypesDtsExtension(allowimportingtsextensions=true,moduleresolution=node16).errors.txt

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
2+
3+
4+
!!! error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
5+
==== /types.d.ts (0 errors) ====
6+
export declare type User = {
7+
name: string;
8+
}
9+
10+
==== /a.ts (0 errors) ====
11+
import type { User } from "./types.d.ts";
12+
export type { User } from "./types.d.ts";
13+
14+
export const user: User = { name: "John" };
15+
16+
export function getUser(): import("./types.d.ts").User {
17+
return user;
18+
}
19+

‎tests/baselines/reference/allowImportingTypesDtsExtension(allowimportingtsextensions=true,moduleresolution=nodenext).errors.txt

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
error TS5110: Option 'module' must be set to 'NodeNext' when option 'moduleResolution' is set to 'NodeNext'.
2+
3+
4+
!!! error TS5110: Option 'module' must be set to 'NodeNext' when option 'moduleResolution' is set to 'NodeNext'.
5+
==== /types.d.ts (0 errors) ====
6+
export declare type User = {
7+
name: string;
8+
}
9+
10+
==== /a.ts (0 errors) ====
11+
import type { User } from "./types.d.ts";
12+
export type { User } from "./types.d.ts";
13+
14+
export const user: User = { name: "John" };
15+
16+
export function getUser(): import("./types.d.ts").User {
17+
return user;
18+
}
19+

‎tests/baselines/reference/conditionalExportsResolutionFallback(moduleresolution=node16).errors.txt

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
2+
3+
4+
!!! error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
5+
==== /node_modules/dep/package.json (0 errors) ====
6+
// This documents bug https://github.com/microsoft/TypeScript/issues/50762.
7+
8+
{
9+
"name": "dep",
10+
"version": "1.0.0",
11+
"exports": {
12+
".": {
13+
"import": "./dist/index.mjs",
14+
"require": "./dist/index.js",
15+
"types": "./dist/index.d.ts",
16+
}
17+
}
18+
}
19+
20+
==== /node_modules/dep/dist/index.d.ts (0 errors) ====
21+
export {};
22+
23+
==== /node_modules/dep/dist/index.mjs (0 errors) ====
24+
export {};
25+
26+
==== /index.mts (0 errors) ====
27+
import {} from "dep";
28+
// Should be an untyped resolution to dep/dist/index.mjs,
29+
// but the first search is only for TS files, and when
30+
// there's no dist/index.d.mts, it continues looking for
31+
// matching conditions and resolves via `types`.

‎tests/baselines/reference/conditionalExportsResolutionFallback(moduleresolution=nodenext).errors.txt

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
error TS5110: Option 'module' must be set to 'NodeNext' when option 'moduleResolution' is set to 'NodeNext'.
2+
3+
4+
!!! error TS5110: Option 'module' must be set to 'NodeNext' when option 'moduleResolution' is set to 'NodeNext'.
5+
==== /node_modules/dep/package.json (0 errors) ====
6+
// This documents bug https://github.com/microsoft/TypeScript/issues/50762.
7+
8+
{
9+
"name": "dep",
10+
"version": "1.0.0",
11+
"exports": {
12+
".": {
13+
"import": "./dist/index.mjs",
14+
"require": "./dist/index.js",
15+
"types": "./dist/index.d.ts",
16+
}
17+
}
18+
}
19+
20+
==== /node_modules/dep/dist/index.d.ts (0 errors) ====
21+
export {};
22+
23+
==== /node_modules/dep/dist/index.mjs (0 errors) ====
24+
export {};
25+
26+
==== /index.mts (0 errors) ====
27+
import {} from "dep";
28+
// Should be an untyped resolution to dep/dist/index.mjs,
29+
// but the first search is only for TS files, and when
30+
// there's no dist/index.d.mts, it continues looking for
31+
// matching conditions and resolves via `types`.

‎tests/baselines/reference/elidedJSImport2(module=commonjs).errors.txt

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
2+
3+
4+
!!! error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
5+
==== tests/cases/compiler/index.js (0 errors) ====
6+
import { Foo } from "./other.js";
7+
import * as other from "./other.js";
8+
import defaultFoo from "./other.js";
9+
10+
const x = new Foo();
11+
const y = other.Foo();
12+
const z = new defaultFoo();
13+
14+
==== tests/cases/compiler/other.d.ts (0 errors) ====
15+
export interface Foo {
16+
bar: number;
17+
}
18+
19+
export default interface Bar {
20+
foo: number;
21+
}
22+
23+
==== tests/cases/compiler/other.js (0 errors) ====
24+
export class Foo {
25+
bar = 2.4;
26+
}
27+
28+
export default class Bar {
29+
foo = 1.2;
30+
}
31+

‎tests/baselines/reference/elidedJSImport2(module=commonjs).types

+9-9
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ import defaultFoo from "./other.js";
99
>defaultFoo : any
1010

1111
const x = new Foo();
12-
>x : error
13-
>new Foo() : error
14-
>Foo : error
12+
>x : any
13+
>new Foo() : any
14+
>Foo : any
1515

1616
const y = other.Foo();
17-
>y : error
18-
>other.Foo() : error
19-
>other.Foo : error
17+
>y : any
18+
>other.Foo() : any
19+
>other.Foo : any
2020
>other : typeof other
2121
>Foo : any
2222

2323
const z = new defaultFoo();
24-
>z : error
25-
>new defaultFoo() : error
26-
>defaultFoo : error
24+
>z : any
25+
>new defaultFoo() : any
26+
>defaultFoo : any
2727

2828
=== tests/cases/compiler/other.d.ts ===
2929
export interface Foo {

‎tests/baselines/reference/elidedJSImport2(module=es2022).errors.txt

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
2+
3+
4+
!!! error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
5+
==== tests/cases/compiler/index.js (0 errors) ====
6+
import { Foo } from "./other.js";
7+
import * as other from "./other.js";
8+
import defaultFoo from "./other.js";
9+
10+
const x = new Foo();
11+
const y = other.Foo();
12+
const z = new defaultFoo();
13+
14+
==== tests/cases/compiler/other.d.ts (0 errors) ====
15+
export interface Foo {
16+
bar: number;
17+
}
18+
19+
export default interface Bar {
20+
foo: number;
21+
}
22+
23+
==== tests/cases/compiler/other.js (0 errors) ====
24+
export class Foo {
25+
bar = 2.4;
26+
}
27+
28+
export default class Bar {
29+
foo = 1.2;
30+
}
31+

‎tests/baselines/reference/elidedJSImport2(module=es2022).types

+9-9
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ import defaultFoo from "./other.js";
99
>defaultFoo : any
1010

1111
const x = new Foo();
12-
>x : error
13-
>new Foo() : error
14-
>Foo : error
12+
>x : any
13+
>new Foo() : any
14+
>Foo : any
1515

1616
const y = other.Foo();
17-
>y : error
18-
>other.Foo() : error
19-
>other.Foo : error
17+
>y : any
18+
>other.Foo() : any
19+
>other.Foo : any
2020
>other : typeof other
2121
>Foo : any
2222

2323
const z = new defaultFoo();
24-
>z : error
25-
>new defaultFoo() : error
26-
>defaultFoo : error
24+
>z : any
25+
>new defaultFoo() : any
26+
>defaultFoo : any
2727

2828
=== tests/cases/compiler/other.d.ts ===
2929
export interface Foo {

‎tests/baselines/reference/emitHelpersWithLocalCollisions(module=node16).errors.txt

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
error TS5109: Option 'moduleResolution' must be set to 'Node16' (or left unspecified) when option 'module' is set to 'Node16'.
2+
3+
4+
!!! error TS5109: Option 'moduleResolution' must be set to 'Node16' (or left unspecified) when option 'module' is set to 'Node16'.
5+
==== tests/cases/compiler/a.ts (0 errors) ====
6+
declare var dec: any, __decorate: any;
7+
@dec export class A {
8+
}
9+
10+
const o = { a: 1 };
11+
const y = { ...o };
12+

‎tests/baselines/reference/emitHelpersWithLocalCollisions(module=nodenext).errors.txt

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
error TS5109: Option 'moduleResolution' must be set to 'NodeNext' (or left unspecified) when option 'module' is set to 'NodeNext'.
2+
3+
4+
!!! error TS5109: Option 'moduleResolution' must be set to 'NodeNext' (or left unspecified) when option 'module' is set to 'NodeNext'.
5+
==== tests/cases/compiler/a.ts (0 errors) ====
6+
declare var dec: any, __decorate: any;
7+
@dec export class A {
8+
}
9+
10+
const o = { a: 1 };
11+
const y = { ...o };
12+

‎tests/baselines/reference/extensionLoadingPriority(moduleresolution=node16).errors.txt

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
2+
3+
4+
!!! error TS5110: Option 'module' must be set to 'Node16' when option 'moduleResolution' is set to 'Node16'.
5+
==== /project/a.js (0 errors) ====
6+
export default "a.js";
7+
8+
==== /project/a.js.js (0 errors) ====
9+
export default "a.js.js";
10+
11+
==== /project/dir/index.ts (0 errors) ====
12+
export default "dir/index.ts";
13+
14+
==== /project/dir.js (0 errors) ====
15+
export default "dir.js";
16+
17+
==== /project/b.ts (0 errors) ====
18+
import a from "./a.js";
19+
import dir from "./dir";
20+

0 commit comments

Comments
 (0)