feat: don't normalize options on js side - part2

shulaoda · shulaoda · commit 64ca4c4d3eb1 · 2024-11-21T23:07:31.000+08:00
diff --git a/packages/rolldown/src/options/bindingify-output-options.ts b/packages/rolldown/src/options/bindingify-output-options.ts
@@ -35,12 +35,12 @@ export function bindingifyOutputOptions(
     exports,
     hashCharacters,
     sourcemap: bindingifySourcemap(sourcemap),
-    sourcemapIgnoreList,
+    sourcemapIgnoreList: bindingifySourcemapIgnoreList(sourcemapIgnoreList),
     sourcemapPathTransform,
-    banner,
-    footer,
-    intro,
-    outro,
+    banner: bindingifyAddon(banner),
+    footer: bindingifyAddon(footer),
+    intro: bindingifyAddon(intro),
+    outro: bindingifyAddon(outro),
     extend: outputOptions.extend,
     globals,
     esModule,
@@ -59,6 +59,19 @@ export function bindingifyOutputOptions(
   }
 }
 
+type AddonKeys = 'banner' | 'footer' | 'intro' | 'outro'
+
+function bindingifyAddon(
+  configAddon: NormalizedOutputOptions[AddonKeys],
+): BindingOutputOptions[AddonKeys] {
+  return async (chunk) => {
+    if (typeof configAddon === 'function') {
+      return configAddon(chunk)
+    }
+    return configAddon || ''
+  }
+}
+
 function bindingifyFormat(
   format: NormalizedOutputOptions['format'],
 ): BindingOutputOptions['format'] {
@@ -101,3 +114,14 @@ function bindingifySourcemap(
       throw new Error(`unknown sourcemap: ${sourcemap}`)
   }
 }
+
+function bindingifySourcemapIgnoreList(
+  sourcemapIgnoreList: NormalizedOutputOptions['sourcemapIgnoreList'],
+): BindingOutputOptions['sourcemapIgnoreList'] {
+  return typeof sourcemapIgnoreList === 'function'
+    ? sourcemapIgnoreList
+    : sourcemapIgnoreList === false
+      ? () => false
+      : (relativeSourcePath: string, _sourcemapPath: string) =>
+          relativeSourcePath.includes('node_modules')
+}
diff --git a/packages/rolldown/src/options/normalized-output-options.ts b/packages/rolldown/src/options/normalized-output-options.ts
@@ -1,14 +1,5 @@
-import type { SourcemapIgnoreListOption } from '../rollup'
-import type { AddonFunction, OutputOptions } from '../types/output-options'
-import type { RolldownPlugin } from '../plugin'
+import type { OutputOptions } from '../types/output-options'
 
 export type InternalModuleFormat = 'es' | 'cjs' | 'iife' | 'umd'
 
-export interface NormalizedOutputOptions extends OutputOptions {
-  plugins: RolldownPlugin[]
-  sourcemapIgnoreList: SourcemapIgnoreListOption
-  banner: AddonFunction
-  footer: AddonFunction
-  intro: AddonFunction
-  outro: AddonFunction
-}
+export interface NormalizedOutputOptions extends OutputOptions {}
diff --git a/packages/rolldown/src/plugin/plugin-driver.ts b/packages/rolldown/src/plugin/plugin-driver.ts
@@ -2,10 +2,9 @@ import { getLogHandler, normalizeLog } from '../log/logHandler'
 import { LOG_LEVEL_DEBUG, LOG_LEVEL_INFO, LOG_LEVEL_WARN } from '../log/logging'
 import { Plugin, RolldownPluginRec } from './'
 import { error, logPluginError } from '../log/logs'
-import { NormalizedInputOptions } from '../options/normalized-input-options'
 import { RollupError } from '../rollup'
 import { normalizeHook } from '../utils/normalize-hook'
-import { InputOptions, OutputOptions, VERSION } from '..'
+import { InputOptions, OutputOptions, RolldownPlugin, VERSION } from '..'
 import { getLogger, getOnLog } from '../log/logger'
 import { BuiltinPlugin } from './builtin-plugin'
 
@@ -73,15 +72,15 @@ export class PluginDriver {
   }
 
   public callOutputOptionsHook(
-    inputOptions: NormalizedInputOptions,
+    rawPlugins: RolldownPlugin[],
     outputOptions: OutputOptions,
   ): OutputOptions {
-    const plugins = getSortedPlugins(
+    const sortedPlugins = getSortedPlugins(
       'outputOptions',
-      getObjectPlugins(inputOptions.plugins),
+      getObjectPlugins(rawPlugins),
     )
 
-    for (const plugin of plugins) {
+    for (const plugin of sortedPlugins) {
       const options = plugin.outputOptions
       if (options) {
         const { handler } = normalizeHook(options)
diff --git a/packages/rolldown/src/utils/create-bundler.ts b/packages/rolldown/src/utils/create-bundler.ts
@@ -2,7 +2,6 @@ import { bindingifyInputOptions } from '../options/bindingify-input-options'
 import { Bundler } from '../binding'
 import { initializeParallelPlugins } from './initialize-parallel-plugins'
 import { normalizeInputOptions } from './normalize-input-options'
-import { normalizeOutputOptions } from './normalize-output-options'
 import { bindingifyOutputOptions } from '../options/bindingify-output-options'
 import { PluginDriver } from '../plugin/plugin-driver'
 import type { InputOptions } from '../types/input-options'
@@ -27,21 +26,23 @@ export async function createBundler(
 
   try {
     outputOptions = pluginDriver.callOutputOptionsHook(
-      normalizedInputOptions,
+      normalizedInputOptions.plugins,
       outputOptions,
     )
-    const normalizedOutputOptions = normalizeOutputOptions(outputOptions)
 
     // Convert `NormalizedInputOptions` to `BindingInputOptions`
     const bindingInputOptions = bindingifyInputOptions(
       normalizedInputOptions,
-      normalizedOutputOptions,
+      outputOptions,
     )
 
+    // Convert `NormalizedOutputOptions` to `BindingInputOptions`
+    const bindingOutputOptions = bindingifyOutputOptions(outputOptions)
+
     return {
       bundler: new Bundler(
         bindingInputOptions,
-        bindingifyOutputOptions(normalizedOutputOptions),
+        bindingOutputOptions,
         parallelPluginInitResult?.registry,
       ),
       stopWorkers: parallelPluginInitResult?.stopWorkers,
diff --git a/packages/rolldown/src/utils/normalize-output-options.ts b/packages/rolldown/src/utils/normalize-output-options.ts
