feat: support render chunk hook normalzied output options (#795)

underfin · web-flow · commit 709aca7d522f · 2024-04-08T14:52:34.000Z
diff --git a/packages/rolldown/src/options/input-options-adapter.ts b/packages/rolldown/src/options/input-options-adapter.ts
@@ -3,16 +3,18 @@ import { BindingInputOptions } from '../binding'
 import nodePath from 'node:path'
 import { bindingifyPlugin } from '../plugin/bindingify-plugin'
 import { InputOptions, RolldownNormalizedInputOptions } from './input-options'
+import { NormalizedOutputOptions } from './output-options'
 
 export function createInputOptionsAdapter(
   options: RolldownNormalizedInputOptions,
   inputOptions: InputOptions,
+  outputOptions: NormalizedOutputOptions,
 ): BindingInputOptions {
   return {
     input: normalizeInput(options.input),
     plugins: options.plugins.map((plugin) =>
       // @ts-expect-error
-      bindingifyPlugin(plugin, options),
+      bindingifyPlugin(plugin, options, outputOptions),
     ),
     cwd: inputOptions.cwd ?? process.cwd(),
     external: inputOptions.external ? options.external : undefined,
diff --git a/packages/rolldown/src/options/output-options.ts b/packages/rolldown/src/options/output-options.ts
@@ -13,6 +13,8 @@ export interface OutputOptions {
   chunkFileNames?: string
 }
 
+export type NormalizedOutputOptions = BindingOutputOptions
+
 function normalizeFormat(
   format: OutputOptions['format'],
 ): BindingOutputOptions['format'] {
diff --git a/packages/rolldown/src/plugin/bindingify-build-hooks.ts b/packages/rolldown/src/plugin/bindingify-build-hooks.ts
@@ -6,6 +6,7 @@ import { RolldownNormalizedInputOptions } from '../options/input-options'
 import { isEmptySourcemapFiled } from '../utils'
 import path from 'path'
 import { SourceMapInputObject } from '../types/sourcemap'
+import { NormalizedOutputOptions } from '../options/output-options'
 
 export function bindingifyBuildStart(
   options: RolldownNormalizedInputOptions,
@@ -150,6 +151,7 @@ export function bindingifyLoad(
 }
 
 export function bindingifyRenderChunk(
+  outputOptions: NormalizedOutputOptions,
   hook?: Plugin['renderChunk'],
 ): BindingPluginOptions['renderChunk'] {
   if (!hook) {
@@ -158,7 +160,7 @@ export function bindingifyRenderChunk(
   const [handler, _optionsIgnoredSofar] = normalizeHook(hook)
 
   return async (code, chunk) => {
-    const ret = await handler.call(null, code, chunk)
+    const ret = await handler.call(null, code, chunk, outputOptions)
 
     if (ret == null) {
       return
diff --git a/packages/rolldown/src/plugin/bindingify-plugin.ts b/packages/rolldown/src/plugin/bindingify-plugin.ts
@@ -15,11 +15,13 @@ import {
 
 import type { Plugin } from './index'
 import { RolldownNormalizedInputOptions } from '../options/input-options'
+import { NormalizedOutputOptions } from '../options/output-options'
 
 // Note: because napi not catch error, so we need to catch error and print error to debugger in adapter.
 export function bindingifyPlugin(
   plugin: Plugin,
   options: RolldownNormalizedInputOptions,
+  outputOptions: NormalizedOutputOptions,
 ): BindingPluginOptions {
   return {
     name: plugin.name ?? 'unknown',
@@ -28,7 +30,7 @@ export function bindingifyPlugin(
     buildEnd: bindingifyBuildEnd(plugin.buildEnd),
     transform: bindingifyTransform(plugin.transform),
     load: bindingifyLoad(plugin.load),
-    renderChunk: bindingifyRenderChunk(plugin.renderChunk),
+    renderChunk: bindingifyRenderChunk(outputOptions, plugin.renderChunk),
     generateBundle: bindingifyGenerateBundle(plugin.generateBundle),
     writeBundle: bindingifyWriteBundle(plugin.writeBundle),
   }
diff --git a/packages/rolldown/src/plugin/index.ts b/packages/rolldown/src/plugin/index.ts
@@ -7,6 +7,7 @@ import {
 import { RolldownNormalizedInputOptions } from '../options/input-options'
 import { AnyFn, AnyObj, NullValue } from '../types/utils'
 import { SourceMapInput } from '../types/sourcemap'
+import { NormalizedOutputOptions } from '../options/output-options'
 
 type MaybePromise<T> = T | Promise<T>
 
@@ -79,6 +80,7 @@ export interface Plugin {
       this: null,
       code: string,
       chunk: RenderedChunk,
+      outputOptions: NormalizedOutputOptions,
     ) => MaybePromise<
       | NullValue
       | string
diff --git a/packages/rolldown/src/utils/create-bundler.ts b/packages/rolldown/src/utils/create-bundler.ts
@@ -15,10 +15,12 @@ export async function createBundler(
 ): Promise<Bundler> {
   // Convert `InputOptions` to `NormalizedInputOptions`.
   const normalizedInputOptions = await normalizeInputOptions(inputOptions)
+  const normalizedOutputOptions = normalizeOutputOptions(outputOptions)
   // Convert `NormalizedInputOptions` to `BindingInputOptions`
   const bindingInputOptions = createInputOptionsAdapter(
     normalizedInputOptions,
     inputOptions,
+    normalizedOutputOptions,
   )
-  return new Bundler(bindingInputOptions, normalizeOutputOptions(outputOptions))
+  return new Bundler(bindingInputOptions, normalizedOutputOptions)
 }
diff --git a/packages/rollup-tests/src/failed-tests.json b/packages/rollup-tests/src/failed-tests.json
@@ -720,7 +720,6 @@
   "rollup@sourcemaps@names-transformed-render-chunk: names are recovered if transforms are used@generates es",
   "rollup@sourcemaps@names: names are recovered (https://github.com/rollup/rollup/issues/101)@generates es",
   "rollup@sourcemaps@reified-namespace: generates correct sourcemap with reified namespace (#668)@generates es",
-  "rollup@sourcemaps@render-chunk-babili: generates valid sourcemap when source could not be determined@generates es",
   "rollup@sourcemaps@single-length-segments: handles single-length sourcemap segments@generates es",
   "rollup@sourcemaps@sourcemap-base-url-without-trailing-slash: add a trailing slash automatically if it is missing@generates es",
   "rollup@sourcemaps@sourcemap-base-url: adds a sourcemap base url@generates es",
diff --git a/packages/rollup-tests/src/ignored-tests.js b/packages/rollup-tests/src/ignored-tests.js
@@ -26,6 +26,9 @@ const ignoreTests = [
   // Ignore skipIfWindows test avoid test status error
   'rollup@function@preserve-symlink: follows symlinks',
   'rollup@function@symlink: follows symlinks',
+  // The rolldown output chunk including `module comment` caused line offset, the rollup provider the fake sourcemap can't remapping.
+  // cSpell:disable
+  "rollup@sourcemaps@render-chunk-babili: generates valid sourcemap when source could not be determined@generates es",
 ]
 
 module.exports = {
diff --git a/packages/rollup-tests/src/status.json b/packages/rollup-tests/src/status.json
@@ -1,6 +1,6 @@
 {
   "failed": 0,
-  "skipFailed": 675,
+  "skipFailed": 674,
   "skipped": 0,
   "passed": 244
 }
diff --git a/packages/rollup-tests/src/status.md b/packages/rollup-tests/src/status.md
@@ -1,6 +1,6 @@
 |  | number |
 |----| ---- |
 | failed | 0|
-| skipFailed | 675|
+| skipFailed | 674|
 | skipped | 0|
 | passed | 244|

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ export interface OutputOptions {`
`13`	`13`	`chunkFileNames?: string`
`14`	`14`	`}`
`15`	`15`
	`16`	`+export type NormalizedOutputOptions = BindingOutputOptions`
	`17`	`+`
`16`	`18`	`function normalizeFormat(`
`17`	`19`	`format: OutputOptions['format'],`
`18`	`20`	`): BindingOutputOptions['format'] {`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,12 @@ export async function createBundler(`
`15`	`15`	`): Promise<Bundler> {`
`16`	`16`	// Convert `InputOptions` to `NormalizedInputOptions`.
`17`	`17`	`const normalizedInputOptions = await normalizeInputOptions(inputOptions)`
	`18`	`+ const normalizedOutputOptions = normalizeOutputOptions(outputOptions)`
`18`	`19`	// Convert `NormalizedInputOptions` to `BindingInputOptions`
`19`	`20`	`const bindingInputOptions = createInputOptionsAdapter(`
`20`	`21`	`normalizedInputOptions,`
`21`	`22`	`inputOptions,`
	`23`	`+ normalizedOutputOptions,`
`22`	`24`	`)`
`23`		`- return new Bundler(bindingInputOptions, normalizeOutputOptions(outputOptions))`
	`25`	`+ return new Bundler(bindingInputOptions, normalizedOutputOptions)`
`24`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,9 @@ const ignoreTests = [`
`26`	`26`	`// Ignore skipIfWindows test avoid test status error`
`27`	`27`	`'rollup@function@preserve-symlink: follows symlinks',`
`28`	`28`	`'rollup@function@symlink: follows symlinks',`
	`29`	+ // The rolldown output chunk including `module comment` caused line offset, the rollup provider the fake sourcemap can't remapping.
	`30`	`+ // cSpell:disable`
	`31`	`+ "rollup@sourcemaps@render-chunk-babili: generates valid sourcemap when source could not be determined@generates es",`
`29`	`32`	`]`
`30`	`33`
`31`	`34`	`module.exports = {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"failed": 0,`
`3`		`- "skipFailed": 675,`
	`3`	`+ "skipFailed": 674,`
`4`	`4`	`"skipped": 0,`
`5`	`5`	`"passed": 244`
`6`	`6`	`}`