@@ -216,14 +216,14 @@ export async function emitDts(
216
216
ts . getConfigFileParsingDiagnostics ( tsConfigResult ) ,
217
217
} ) ;
218
218
219
+ const preEmitDiagnostics = ts . getPreEmitDiagnostics ( program ) ;
219
220
const emitResult = program . emit ( ) ;
220
-
221
- const allDiagnostics = ts
222
- . getPreEmitDiagnostics ( program )
223
- . concat ( emitResult . diagnostics ) ;
221
+ const allDiagnostics = preEmitDiagnostics . concat ( emitResult . diagnostics ) ;
222
+ const sortAndDeduplicateDiagnostics =
223
+ ts . sortAndDeduplicateDiagnostics ( allDiagnostics ) ;
224
224
225
225
await handleDiagnosticsAndProcessFiles (
226
- allDiagnostics ,
226
+ sortAndDeduplicateDiagnostics ,
227
227
configPath ,
228
228
bundle ,
229
229
declarationDir ,
@@ -267,18 +267,24 @@ export async function emitDts(
267
267
createProgram,
268
268
} ) ;
269
269
270
- const emitResult = program . emit ( ) ;
271
- const allDiagnostics = [
270
+ const allDiagnostics : ts . Diagnostic [ ] = [ ] ;
271
+ allDiagnostics . push (
272
272
...program . getConfigFileParsingDiagnostics ( ) ,
273
- ...program . getOptionsDiagnostics ( ) ,
274
273
...program . getSyntacticDiagnostics ( ) ,
274
+ ...program . getOptionsDiagnostics ( ) ,
275
+ ...program . getGlobalDiagnostics ( ) ,
275
276
...program . getSemanticDiagnostics ( ) ,
276
277
...program . getDeclarationDiagnostics ( ) ,
277
- ...emitResult . diagnostics ,
278
- ] ;
278
+ ) ;
279
+
280
+ const emitResult = program . emit ( ) ;
281
+ allDiagnostics . push ( ...emitResult . diagnostics ) ;
282
+
283
+ const sortAndDeduplicateDiagnostics =
284
+ ts . sortAndDeduplicateDiagnostics ( allDiagnostics ) ;
279
285
280
286
await handleDiagnosticsAndProcessFiles (
281
- allDiagnostics ,
287
+ sortAndDeduplicateDiagnostics ,
282
288
configPath ,
283
289
bundle ,
284
290
declarationDir ,
0 commit comments