fix: remapping sourcemap from transform hook (#755)

packages/rolldown/src/plugin/bindingify-build-hooks.ts

@@ -3,6 +3,7 @@ import type { BindingPluginOptions } from '../binding'
 
 import type { Plugin } from './index'
 import { RolldownNormalizedInputOptions } from '../options/input-options'
+import { isEmptySourcemapFiled, transformSourcemap } from '../utils'
 
 export function bindingifyBuildStart(
   options: RolldownNormalizedInputOptions,
@@ -77,12 +78,24 @@ export function bindingifyTransform(
       return
     }
 
-    const retCode = typeof ret === 'string' ? ret : ret.code
-    const retMap = typeof ret === 'string' ? undefined : ret.map
+    if (typeof ret === 'string') {
+      return { code: ret }
+    }
+
+    // TODO(underfin) move the logic to rust
+    // If sourcemap hasn't `sourcesContent` and `sources`, using original code to fill it.
+    if (ret.map && typeof ret.map === 'object') {
+      if (isEmptySourcemapFiled(ret.map.sourcesContent)) {
+        ret.map.sourcesContent = [code]
+      }
+      if (isEmptySourcemapFiled(ret.map.sources)) {
+        ret.map.sources = [id]
+      }
+    }
 
     return {
-      code: retCode,
-      map: retMap ?? undefined,
+      code: ret.code,
+      map: transformSourcemap(ret.map),
     }
   }
 }
@@ -102,12 +115,13 @@ export function bindingifyLoad(
       return
     }
 
-    const retCode = typeof ret === 'string' ? ret : ret.code
-    const retMap = typeof ret === 'string' ? undefined : ret.map
+    if (typeof ret === 'string') {
+      return { code: ret }
+    }
 
     return {
-      code: retCode,
-      map: retMap ?? undefined,
+      code: ret.code,
+      map: transformSourcemap(ret.map),
     }
   }
 }

packages/rolldown/src/plugin/index.ts

@@ -1,3 +1,4 @@
+import { SourceMap } from 'src/types/rolldown-output'
 import {
   BindingHookResolveIdExtraOptions,
   BindingPluginContext,
@@ -68,7 +69,7 @@ export interface Plugin {
       | string
       | {
           code: string
-          map?: string | null
+          map?: string | null | SourceMap
         }
     >
   >

packages/rolldown/src/types/rolldown-output.ts

@@ -18,11 +18,11 @@ function _assertRolldownOutputAsset() {
 }
 
 export interface SourceMap {
-  file: string
+  file?: string
   mappings: string
   names: string[]
   sources: string[]
-  sourcesContent: (string | null)[]
+  sourcesContent?: string[]
   version: number
   // toString(): string
   // toUrl(): string

packages/rolldown/src/utils/transform-sourcemap.ts

@@ -6,3 +6,13 @@ export function transformSourcemap(value?: SourceMapInput): string | undefined {
   }
   return value
 }
+
+export function isEmptySourcemapFiled(array: undefined | string[]): boolean {
+  if (!array) {
+    return true
+  }
+  if (array.length === 0 || array[0] === '') {
+    return true
+  }
+  return false
+}

packages/rollup-tests/src/failed-tests.json

@@ -732,6 +732,5 @@
   "rollup@sourcemaps@transform-full-source-paths: provides the full source map path when transforming source maps@generates es",
   "rollup@sourcemaps@transform-low-resolution: handles combining low-resolution and high-resolution source-maps when transforming@generates es",
   "rollup@sourcemaps@transform-source-paths: transform sourcemap paths (#2168)@generates es",
-  "rollup@sourcemaps@transforms: preserves sourcemap chains when transforming@generates es",
-  "rollup@sourcemaps@untransformed-modules: allows sourcemap chains with some untransformed modules (#404)@generates es"
+  "rollup@sourcemaps@transforms: preserves sourcemap chains when transforming@generates es"
 ]

packages/rollup-tests/src/status.json

@@ -1,6 +1,6 @@
 {
   "failed": 0,
-  "skipFailed": 680,
+  "skipFailed": 679,
   "skipped": 0,
-  "passed": 239
+  "passed": 240
 }

packages/rollup-tests/src/status.md

@@ -1,6 +1,6 @@
 |  | number |
 |----| ---- |
 | failed | 0|
-| skipFailed | 680|
+| skipFailed | 679|
 | skipped | 0|
-| passed | 239|
+| passed | 240|