fix: pass all params for load & transform hooks

sxzz · sxzz · commit 0b4731208cde · 2025-03-19T20:45:35.000+08:00
diff --git a/src/rolldown/index.ts b/src/rolldown/index.ts
@@ -12,10 +12,7 @@ export function getRolldownPlugin<UserOptions = Record<string, never>, Nested ex
     const rawPlugins = toArray(factory(userOptions!, meta))
 
     const plugins = rawPlugins.map((rawPlugin) => {
-      const plugin = toRollupPlugin(rawPlugin, false) as RolldownPlugin
-      if (rawPlugin.rolldown)
-        Object.assign(plugin, rawPlugin.rolldown)
-
+      const plugin = toRollupPlugin(rawPlugin, 'rolldown') as RolldownPlugin
       return plugin
     })
 
diff --git a/src/rollup/index.ts b/src/rollup/index.ts
@@ -9,34 +9,34 @@ export function getRollupPlugin<UserOptions = Record<string, never>, Nested exte
       framework: 'rollup',
     }
     const rawPlugins = toArray(factory(userOptions!, meta))
-    const plugins = rawPlugins.map(plugin => toRollupPlugin(plugin))
+    const plugins = rawPlugins.map(plugin => toRollupPlugin(plugin, 'rollup'))
     return plugins.length === 1 ? plugins[0] : plugins
   }) as UnpluginInstance<UserOptions, Nested>['rollup']
 }
 
-export function toRollupPlugin(plugin: UnpluginOptions, containRollupOptions = true): RollupPlugin {
+export function toRollupPlugin(plugin: UnpluginOptions, key: 'rollup' | 'rolldown' | 'vite' | 'unloader'): RollupPlugin {
   if (plugin.transform && plugin.transformInclude) {
     const _transform = plugin.transform
-    plugin.transform = function (code, id) {
+    plugin.transform = function (code, id, ...args) {
       if (plugin.transformInclude && !plugin.transformInclude(id))
         return null
 
-      return _transform.call(this, code, id)
+      return _transform.call(this, code, id, ...args)
     }
   }
 
   if (plugin.load && plugin.loadInclude) {
     const _load = plugin.load
-    plugin.load = function (id) {
+    plugin.load = function (id, ...args) {
       if (plugin.loadInclude && !plugin.loadInclude(id))
         return null
 
-      return _load.call(this, id)
+      return _load.call(this, id, ...args)
     }
   }
 
-  if (plugin.rollup && containRollupOptions)
-    Object.assign(plugin, plugin.rollup)
+  if (plugin[key])
+    Object.assign(plugin, plugin[key])
 
   return plugin as RollupPlugin
 }
diff --git a/src/unloader/index.ts b/src/unloader/index.ts
@@ -12,10 +12,7 @@ export function getUnloaderPlugin<UserOptions = Record<string, never>, Nested ex
     const rawPlugins = toArray(factory(userOptions!, meta))
 
     const plugins = rawPlugins.map((rawPlugin) => {
-      const plugin = toRollupPlugin(rawPlugin, false) as UnloaderPlugin
-      if (rawPlugin.unloader)
-        Object.assign(plugin, rawPlugin.unloader)
-
+      const plugin = toRollupPlugin(rawPlugin, 'unloader') as UnloaderPlugin
       return plugin
     })
 
diff --git a/src/vite/index.ts b/src/vite/index.ts
@@ -12,10 +12,7 @@ export function getVitePlugin<UserOptions = Record<string, never>, Nested extend
     const rawPlugins = toArray(factory(userOptions!, meta))
 
     const plugins = rawPlugins.map((rawPlugin) => {
-      const plugin = toRollupPlugin(rawPlugin, false) as VitePlugin
-      if (rawPlugin.vite)
-        Object.assign(plugin, rawPlugin.vite)
-
+      const plugin = toRollupPlugin(rawPlugin, 'vite') as VitePlugin
       return plugin
     })
 
diff --git a/test/unit-tests/id-consistency/id-consistency.test.ts b/test/unit-tests/id-consistency/id-consistency.test.ts
@@ -54,7 +54,12 @@ function checkHookCalls(
   const ids = transformIncludeCallback.mock.calls.map(call => call[0])
   ids.forEach((id) => {
     expect(path.isAbsolute(id)).toBe(true)
-    expect(transformCallback).toHaveBeenCalledWith(expect.anything(), id)
+    if (name === 'vite') {
+      expect(transformCallback).toHaveBeenCalledWith(expect.anything(), id, expect.anything())
+    }
+    else {
+      expect(transformCallback).toHaveBeenCalledWith(expect.anything(), id)
+    }
     const isVite = expect.getState().currentTestName?.includes('vite')
     expect(loadCallback).toHaveBeenCalledWith(
       id,

Original file line number	Diff line number	Diff line change
`@@ -9,34 +9,34 @@ export function getRollupPlugin<UserOptions = Record<string, never>, Nested exte`
`9`	`9`	`framework: 'rollup',`
`10`	`10`	`}`
`11`	`11`	`const rawPlugins = toArray(factory(userOptions!, meta))`
`12`		`- const plugins = rawPlugins.map(plugin => toRollupPlugin(plugin))`
	`12`	`+ const plugins = rawPlugins.map(plugin => toRollupPlugin(plugin, 'rollup'))`
`13`	`13`	`return plugins.length === 1 ? plugins[0] : plugins`
`14`	`14`	`}) as UnpluginInstance<UserOptions, Nested>['rollup']`
`15`	`15`	`}`
`16`	`16`
`17`		`-export function toRollupPlugin(plugin: UnpluginOptions, containRollupOptions = true): RollupPlugin {`
	`17`	`+export function toRollupPlugin(plugin: UnpluginOptions, key: 'rollup' \| 'rolldown' \| 'vite' \| 'unloader'): RollupPlugin {`
`18`	`18`	`if (plugin.transform && plugin.transformInclude) {`
`19`	`19`	`const _transform = plugin.transform`
`20`		`- plugin.transform = function (code, id) {`
	`20`	`+ plugin.transform = function (code, id, ...args) {`
`21`	`21`	`if (plugin.transformInclude && !plugin.transformInclude(id))`
`22`	`22`	`return null`
`23`	`23`
`24`		`- return _transform.call(this, code, id)`
	`24`	`+ return _transform.call(this, code, id, ...args)`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`if (plugin.load && plugin.loadInclude) {`
`29`	`29`	`const _load = plugin.load`
`30`		`- plugin.load = function (id) {`
	`30`	`+ plugin.load = function (id, ...args) {`
`31`	`31`	`if (plugin.loadInclude && !plugin.loadInclude(id))`
`32`	`32`	`return null`
`33`	`33`
`34`		`- return _load.call(this, id)`
	`34`	`+ return _load.call(this, id, ...args)`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`		`- if (plugin.rollup && containRollupOptions)`
`39`		`- Object.assign(plugin, plugin.rollup)`
	`38`	`+ if (plugin[key])`
	`39`	`+ Object.assign(plugin, plugin[key])`
`40`	`40`
`41`	`41`	`return plugin as RollupPlugin`
`42`	`42`	`}`