fix: apply failOnWarn to rolldown logs

closes #759

Author: sxzz

dts.snapshot.json

@@ -102,7 +102,8 @@
     "Format": "type Format = ModuleFormat",
     "globalLogger": "Logger",
     "InlineConfig": "interface InlineConfig extends UserConfig {\n config?: boolean | string\n configLoader?: 'auto' | 'native' | 'unrun'\n filter?: RegExp | Arrayable<string>\n}",
-    "Logger": "interface Logger {\n level: LogLevel\n info: (...args: any[]) => void\n warn: (...args: any[]) => void\n warnOnce: (...args: any[]) => void\n error: (...args: any[]) => void\n success: (...args: any[]) => void\n clearScreen: (_: LogType) => void\n}",
+    "Logger": "interface Logger {\n level: LogLevel\n options?: LoggerOptions\n info: (...args: any[]) => void\n warn: (...args: any[]) => void\n warnOnce: (...args: any[]) => void\n error: (...args: any[]) => void\n success: (...args: any[]) => void\n clearScreen: (_: LogType) => void\n}",
+    "LoggerOptions": "interface LoggerOptions {\n allowClearScreen?: boolean\n customLogger?: Logger\n console?: Console\n failOnWarn?: boolean\n}",
     "LogLevel": "type LogLevel = LogType | 'silent'",
     "LogType": "type LogType = 'error' | 'warn' | 'info'",
     "MarkPartial": "type MarkPartial<T, K extends keyof T> = Omit<Required<T>, K> & Partial<Pick<T, K>>",

src/features/rolldown.ts

@@ -211,13 +211,14 @@ async function resolveInputOptions(
       plugins,
       moduleTypes: loader,
       logLevel: logger.level === 'error' ? 'silent' : logger.level,
-      onLog: cjsDefault
-        ? (level, log, defaultHandler) => {
-            // suppress mixed export warnings if cjsDefault is enabled
-            if (log.code === 'MIXED_EXPORT') return
-            defaultHandler(level, log)
-          }
-        : undefined,
+      onLog(level, log, defaultHandler) {
+        // suppress mixed export warnings if cjsDefault is enabled
+        if (cjsDefault && log.code === 'MIXED_EXPORT') return
+        if (logger.options?.failOnWarn && level === 'warn') {
+          defaultHandler('error', log)
+        }
+        defaultHandler(level, log)
+      },
       devtools: devtools || undefined,
       checks,
     },

src/utils/logger.ts

@@ -23,6 +23,7 @@ export const LogLevels: Record<LogLevel, number> = {
 
 export interface Logger {
   level: LogLevel
+  options?: LoggerOptions
   info: (...args: any[]) => void
   warn: (...args: any[]) => void
   warnOnce: (...args: any[]) => void
@@ -47,13 +48,18 @@ const warnedMessages = new Set<string>()
 
 export function createLogger(
   level: LogLevel = 'info',
-  {
-    customLogger,
-    console = globalThis.console,
-    failOnWarn = false,
-    allowClearScreen = true,
-  }: LoggerOptions = {},
+  options: LoggerOptions = {},
 ): Logger {
+  const resolvedOptions = {
+    allowClearScreen: true,
+    failOnWarn: false,
+    console: globalThis.console,
+    ...options,
+  }
+  /// keep-sorted
+  const { allowClearScreen, console, customLogger, failOnWarn } =
+    resolvedOptions
+
   if (customLogger) {
     return customLogger
   }
@@ -72,6 +78,7 @@ export function createLogger(
 
   const logger: Logger = {
     level,
+    options: resolvedOptions,
 
     info(...msgs: any[]): void {
       output('info', `${blue`ℹ`} ${format(msgs)}`)

tests/e2e.test.ts

@@ -785,3 +785,19 @@ test('externalize @types/foo', async (context) => {
   expect(fileMap['index.mjs']).toContain('1.0.0')
   expect(fileMap['index.d.mts']).toContain('from "foo"')
 })
+
+test('failOnWarn', async (context) => {
+  const files = {
+    'index.ts': `import 'unresolved'`,
+  }
+
+  await expect(
+    testBuild({
+      context,
+      files,
+      options: {
+        failOnWarn: true,
+      },
+    }),
+  ).rejects.toThrow('Module not found')
+})

tests/utils.ts

@@ -7,7 +7,7 @@ import { glob } from 'tinyglobby'
 import { mergeUserOptions } from '../src/config/options.ts'
 import { build } from '../src/index.ts'
 import type { InlineConfig, TsdownBundle } from '../src/config/index.ts'
-import type { RollupLog } from 'rolldown'
+import type { LogOrStringHandler, RollupLog } from 'rolldown'
 import type { RunnerTask, TestContext } from 'vitest'
 
 const dirname = path.dirname(fileURLToPath(import.meta.url))
@@ -144,17 +144,26 @@ export async function testBuild({
     dts: false,
     logLevel: 'silent',
     tsconfig: false,
+    failOnWarn: false,
     ...userOptions,
     async inputOptions(options, ...args) {
+      const originalOnLog = options.onLog
       options = await mergeUserOptions(
         {
           ...options,
           onLog(level, log, defaultHandler) {
             if (level === 'warn') {
               warnings.push(log)
-              return
             }
-            defaultHandler(level, log)
+            const _defaultHandler: LogOrStringHandler = (level, ...args) => {
+              if (level !== 'error') return
+              defaultHandler(level, ...args)
+            }
+            if (originalOnLog) {
+              originalOnLog(level, log, _defaultHandler)
+            } else {
+              _defaultHandler(level, log)
+            }
           },
           logLevel: 'info',
         },