Skip to content

Commit 1ee9e0d

Browse files
jakebaileyjakebailey
committed
Remove circularity, rootDir errors from node modules compiler tests (#62568)
1 parent bc7d426 commit 1ee9e0d

File tree

157 files changed

+4860
-4519
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+4860
-4519
lines changed

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

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
21
index.cjs(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
32
index.cjs(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
4-
node_modules/inner/index.d.mts(2,13): error TS2303: Circular definition of import alias 'cjs'.
5-
node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import alias 'cjs'.
63

74

8-
!!! error TS2209: The project root is ambiguous, but is required to resolve export map entry '.' in file 'package.json'. Supply the `rootDir` compiler option to disambiguate.
95
==== index.js (0 errors) ====
106
// esm format file
117
import * as cjs from "package/cjs";
@@ -58,33 +54,36 @@ node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import
5854
mjsi.cjsSource;
5955
typei.implicitCjsSource;
6056
ts.cjsSource;
61-
==== node_modules/inner/index.d.ts (1 errors) ====
57+
==== node_modules/inner/index.d.ts (0 errors) ====
58+
// cjs format file
59+
export const implicitCjsSource = true;
60+
==== node_modules/inner/test.d.ts (0 errors) ====
6261
// cjs format file
6362
import * as cjs from "inner/a";
64-
~~~
65-
!!! error TS2303: Circular definition of import alias 'cjs'.
6663
import * as mjs from "inner/b";
6764
import * as type from "inner";
6865
import * as ts from "inner/types";
6966
export { cjs };
7067
export { mjs };
7168
export { type };
7269
export { ts };
73-
export const implicitCjsSource = true;
74-
==== node_modules/inner/index.d.mts (1 errors) ====
70+
==== node_modules/inner/index.d.mts (0 errors) ====
71+
// esm format file
72+
export const mjsSource = true;
73+
==== node_modules/inner/test.d.mts (0 errors) ====
7574
// esm format file
7675
import * as cjs from "inner/a";
77-
~~~
78-
!!! error TS2303: Circular definition of import alias 'cjs'.
7976
import * as mjs from "inner/b";
8077
import * as type from "inner";
8178
import * as ts from "inner/types";
8279
export { cjs };
8380
export { mjs };
8481
export { type };
8582
export { ts };
86-
export const mjsSource = true;
8783
==== node_modules/inner/index.d.cts (0 errors) ====
84+
// cjs format file
85+
export const cjsSource = true;
86+
==== node_modules/inner/test.d.cts (0 errors) ====
8887
// cjs format file
8988
import * as cjs from "inner/a";
9089
import * as mjs from "inner/b";
@@ -94,7 +93,6 @@ node_modules/inner/index.d.ts(2,13): error TS2303: Circular definition of import
9493
export { mjs };
9594
export { type };
9695
export { ts };
97-
export const cjsSource = true;
9896
==== package.json (0 errors) ====
9997
{
10098
"name": "package",

‎tests/baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=node16).js‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,37 +50,43 @@ typei.implicitCjsSource;
5050
ts.cjsSource;
5151
//// [index.d.ts]
5252
// cjs format file
53+
export const implicitCjsSource = true;
54+
//// [test.d.ts]
55+
// cjs format file
5356
import * as cjs from "inner/a";
5457
import * as mjs from "inner/b";
5558
import * as type from "inner";
5659
import * as ts from "inner/types";
5760
export { cjs };
5861
export { mjs };
5962
export { type };
60-
export { ts };
61-
export const implicitCjsSource = true;
63+
export { ts };
6264
//// [index.d.mts]
6365
// esm format file
66+
export const mjsSource = true;
67+
//// [test.d.mts]
68+
// esm format file
6469
import * as cjs from "inner/a";
6570
import * as mjs from "inner/b";
6671
import * as type from "inner";
6772
import * as ts from "inner/types";
6873
export { cjs };
6974
export { mjs };
7075
export { type };
71-
export { ts };
72-
export const mjsSource = true;
76+
export { ts };
7377
//// [index.d.cts]
7478
// cjs format file
79+
export const cjsSource = true;
80+
//// [test.d.cts]
81+
// cjs format file
7582
import * as cjs from "inner/a";
7683
import * as mjs from "inner/b";
7784
import * as type from "inner";
7885
import * as ts from "inner/types";
7986
export { cjs };
8087
export { mjs };
8188
export { type };
82-
export { ts };
83-
export const cjsSource = true;
89+
export { ts };
8490
//// [package.json]
8591
{
8692
"name": "package",

‎tests/baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=node16).symbols‎

Lines changed: 63 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,24 @@ import * as ts from "inner/types";
3333
>ts : Symbol(ts, Decl(index.js, 10, 6))
3434

3535
cjsi.mjsSource;
36-
>cjsi.mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 9, 12))
36+
>cjsi.mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 1, 12))
3737
>cjsi : Symbol(cjsi, Decl(index.js, 7, 6))
38-
>mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 9, 12))
38+
>mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 1, 12))
3939

4040
mjsi.mjsSource;
41-
>mjsi.mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 9, 12))
41+
>mjsi.mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 1, 12))
4242
>mjsi : Symbol(mjsi, Decl(index.js, 8, 6))
43-
>mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 9, 12))
43+
>mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 1, 12))
4444

4545
typei.mjsSource;
46-
>typei.mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 9, 12))
46+
>typei.mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 1, 12))
4747
>typei : Symbol(typei, Decl(index.js, 9, 6))
48-
>mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 9, 12))
48+
>mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 1, 12))
4949

5050
ts.mjsSource;
51-
>ts.mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 9, 12))
51+
>ts.mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 1, 12))
5252
>ts : Symbol(ts, Decl(index.js, 10, 6))
53-
>mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 9, 12))
53+
>mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 1, 12))
5454

5555
=== index.mjs ===
5656
// esm format file
@@ -85,24 +85,24 @@ import * as ts from "inner/types";
8585
>ts : Symbol(ts, Decl(index.mjs, 10, 6))
8686

8787
cjsi.mjsSource;
88-
>cjsi.mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 9, 12))
88+
>cjsi.mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 1, 12))
8989
>cjsi : Symbol(cjsi, Decl(index.mjs, 7, 6))
90-
>mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 9, 12))
90+
>mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 1, 12))
9191

9292
mjsi.mjsSource;
93-
>mjsi.mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 9, 12))
93+
>mjsi.mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 1, 12))
9494
>mjsi : Symbol(mjsi, Decl(index.mjs, 8, 6))
95-
>mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 9, 12))
95+
>mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 1, 12))
9696

9797
typei.mjsSource;
98-
>typei.mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 9, 12))
98+
>typei.mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 1, 12))
9999
>typei : Symbol(typei, Decl(index.mjs, 9, 6))
100-
>mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 9, 12))
100+
>mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 1, 12))
101101

102102
ts.mjsSource;
103-
>ts.mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 9, 12))
103+
>ts.mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 1, 12))
104104
>ts : Symbol(ts, Decl(index.mjs, 10, 6))
105-
>mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 9, 12))
105+
>mjsSource : Symbol(cjsi.mjsSource, Decl(index.d.mts, 1, 12))
106106

107107
=== index.cjs ===
108108
// cjs format file
@@ -137,109 +137,115 @@ import * as ts from "inner/types";
137137
>ts : Symbol(ts, Decl(index.cjs, 10, 6))
138138

139139
cjsi.cjsSource;
140-
>cjsi.cjsSource : Symbol(cjsi.cjsSource, Decl(index.d.cts, 9, 12))
140+
>cjsi.cjsSource : Symbol(cjsi.cjsSource, Decl(index.d.cts, 1, 12))
141141
>cjsi : Symbol(cjsi, Decl(index.cjs, 7, 6))
142-
>cjsSource : Symbol(cjsi.cjsSource, Decl(index.d.cts, 9, 12))
142+
>cjsSource : Symbol(cjsi.cjsSource, Decl(index.d.cts, 1, 12))
143143

144144
mjsi.cjsSource;
145-
>mjsi.cjsSource : Symbol(cjsi.cjsSource, Decl(index.d.cts, 9, 12))
145+
>mjsi.cjsSource : Symbol(cjsi.cjsSource, Decl(index.d.cts, 1, 12))
146146
>mjsi : Symbol(mjsi, Decl(index.cjs, 8, 6))
147-
>cjsSource : Symbol(cjsi.cjsSource, Decl(index.d.cts, 9, 12))
147+
>cjsSource : Symbol(cjsi.cjsSource, Decl(index.d.cts, 1, 12))
148148

149149
typei.implicitCjsSource;
150-
>typei.implicitCjsSource : Symbol(cjsi.type.implicitCjsSource, Decl(index.d.ts, 9, 12))
150+
>typei.implicitCjsSource : Symbol(typei.implicitCjsSource, Decl(index.d.ts, 1, 12))
151151
>typei : Symbol(typei, Decl(index.cjs, 9, 6))
152-
>implicitCjsSource : Symbol(cjsi.type.implicitCjsSource, Decl(index.d.ts, 9, 12))
152+
>implicitCjsSource : Symbol(typei.implicitCjsSource, Decl(index.d.ts, 1, 12))
153153

154154
ts.cjsSource;
155-
>ts.cjsSource : Symbol(cjsi.cjsSource, Decl(index.d.cts, 9, 12))
155+
>ts.cjsSource : Symbol(cjsi.cjsSource, Decl(index.d.cts, 1, 12))
156156
>ts : Symbol(ts, Decl(index.cjs, 10, 6))
157-
>cjsSource : Symbol(cjsi.cjsSource, Decl(index.d.cts, 9, 12))
157+
>cjsSource : Symbol(cjsi.cjsSource, Decl(index.d.cts, 1, 12))
158158

159159
=== node_modules/inner/index.d.ts ===
160160
// cjs format file
161+
export const implicitCjsSource = true;
162+
>implicitCjsSource : Symbol(implicitCjsSource, Decl(index.d.ts, 1, 12))
163+
164+
=== node_modules/inner/test.d.ts ===
165+
// cjs format file
161166
import * as cjs from "inner/a";
162-
>cjs : Symbol(cjs, Decl(index.d.ts, 1, 6))
167+
>cjs : Symbol(cjs, Decl(test.d.ts, 1, 6))
163168

164169
import * as mjs from "inner/b";
165-
>mjs : Symbol(mjs, Decl(index.d.ts, 2, 6))
170+
>mjs : Symbol(mjs, Decl(test.d.ts, 2, 6))
166171

167172
import * as type from "inner";
168-
>type : Symbol(type, Decl(index.d.ts, 3, 6))
173+
>type : Symbol(type, Decl(test.d.ts, 3, 6))
169174

170175
import * as ts from "inner/types";
171-
>ts : Symbol(ts, Decl(index.d.ts, 4, 6))
176+
>ts : Symbol(ts, Decl(test.d.ts, 4, 6))
172177

173178
export { cjs };
174-
>cjs : Symbol(mjs.type.cjs, Decl(index.d.ts, 5, 8))
179+
>cjs : Symbol(cjs, Decl(test.d.ts, 5, 8))
175180

176181
export { mjs };
177-
>mjs : Symbol(mjs.type.mjs, Decl(index.d.ts, 6, 8))
182+
>mjs : Symbol(mjs, Decl(test.d.ts, 6, 8))
178183

179184
export { type };
180-
>type : Symbol(mjs.type.type, Decl(index.d.ts, 7, 8))
185+
>type : Symbol(type, Decl(test.d.ts, 7, 8))
181186

182187
export { ts };
183-
>ts : Symbol(mjs.type.ts, Decl(index.d.ts, 8, 8))
184-
185-
export const implicitCjsSource = true;
186-
>implicitCjsSource : Symbol(mjs.type.implicitCjsSource, Decl(index.d.ts, 9, 12))
188+
>ts : Symbol(ts, Decl(test.d.ts, 8, 8))
187189

188190
=== node_modules/inner/index.d.mts ===
189191
// esm format file
192+
export const mjsSource = true;
193+
>mjsSource : Symbol(mjsSource, Decl(index.d.mts, 1, 12))
194+
195+
=== node_modules/inner/test.d.mts ===
196+
// esm format file
190197
import * as cjs from "inner/a";
191-
>cjs : Symbol(cjs, Decl(index.d.mts, 1, 6))
198+
>cjs : Symbol(cjs, Decl(test.d.mts, 1, 6))
192199

193200
import * as mjs from "inner/b";
194-
>mjs : Symbol(mjs, Decl(index.d.mts, 2, 6))
201+
>mjs : Symbol(mjs, Decl(test.d.mts, 2, 6))
195202

196203
import * as type from "inner";
197-
>type : Symbol(type, Decl(index.d.mts, 3, 6))
204+
>type : Symbol(type, Decl(test.d.mts, 3, 6))
198205

199206
import * as ts from "inner/types";
200-
>ts : Symbol(ts, Decl(index.d.mts, 4, 6))
207+
>ts : Symbol(ts, Decl(test.d.mts, 4, 6))
201208

202209
export { cjs };
203-
>cjs : Symbol(mjs.cjs, Decl(index.d.mts, 5, 8))
210+
>cjs : Symbol(cjs, Decl(test.d.mts, 5, 8))
204211

205212
export { mjs };
206-
>mjs : Symbol(mjs.mjs, Decl(index.d.mts, 6, 8))
213+
>mjs : Symbol(mjs, Decl(test.d.mts, 6, 8))
207214

208215
export { type };
209-
>type : Symbol(mjs.type, Decl(index.d.mts, 7, 8))
216+
>type : Symbol(type, Decl(test.d.mts, 7, 8))
210217

211218
export { ts };
212-
>ts : Symbol(mjs.ts, Decl(index.d.mts, 8, 8))
213-
214-
export const mjsSource = true;
215-
>mjsSource : Symbol(mjs.mjsSource, Decl(index.d.mts, 9, 12))
219+
>ts : Symbol(ts, Decl(test.d.mts, 8, 8))
216220

217221
=== node_modules/inner/index.d.cts ===
218222
// cjs format file
223+
export const cjsSource = true;
224+
>cjsSource : Symbol(cjsSource, Decl(index.d.cts, 1, 12))
225+
226+
=== node_modules/inner/test.d.cts ===
227+
// cjs format file
219228
import * as cjs from "inner/a";
220-
>cjs : Symbol(cjs, Decl(index.d.cts, 1, 6))
229+
>cjs : Symbol(cjs, Decl(test.d.cts, 1, 6))
221230

222231
import * as mjs from "inner/b";
223-
>mjs : Symbol(mjs, Decl(index.d.cts, 2, 6))
232+
>mjs : Symbol(mjs, Decl(test.d.cts, 2, 6))
224233

225234
import * as type from "inner";
226-
>type : Symbol(type, Decl(index.d.cts, 3, 6))
235+
>type : Symbol(type, Decl(test.d.cts, 3, 6))
227236

228237
import * as ts from "inner/types";
229-
>ts : Symbol(ts, Decl(index.d.cts, 4, 6))
238+
>ts : Symbol(ts, Decl(test.d.cts, 4, 6))
230239

231240
export { cjs };
232-
>cjs : Symbol(cjs.cjs, Decl(index.d.cts, 5, 8))
241+
>cjs : Symbol(cjs, Decl(test.d.cts, 5, 8))
233242

234243
export { mjs };
235-
>mjs : Symbol(cjs.mjs, Decl(index.d.cts, 6, 8))
244+
>mjs : Symbol(mjs, Decl(test.d.cts, 6, 8))
236245

237246
export { type };
238-
>type : Symbol(cjs.type, Decl(index.d.cts, 7, 8))
247+
>type : Symbol(type, Decl(test.d.cts, 7, 8))
239248

240249
export { ts };
241-
>ts : Symbol(cjs.ts, Decl(index.d.cts, 8, 8))
242-
243-
export const cjsSource = true;
244-
>cjsSource : Symbol(cjs.cjsSource, Decl(index.d.cts, 9, 12))
250+
>ts : Symbol(ts, Decl(test.d.cts, 8, 8))
245251

0 commit comments

Comments
 (0)