fix: normalize original sourcemap sources (#765)

rolldown · Apr 6, 2024 · 679a9ac · 679a9ac
1 parent f69b004
commit 679a9ac
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 22 deletions.
diff --git a/packages/rolldown/src/plugin/bindingify-build-hooks.ts b/packages/rolldown/src/plugin/bindingify-build-hooks.ts
@@ -3,7 +3,9 @@ import type { BindingPluginOptions } from '../binding'
 
 import type { Plugin } from './index'
 import { RolldownNormalizedInputOptions } from '../options/input-options'
-import { isEmptySourcemapFiled, transformSourcemap } from '../utils'
+import { isEmptySourcemapFiled } from '../utils'
+import path from 'path'
+import { SourceMapInputObject } from '../types/sourcemap'
 
 export function bindingifyBuildStart(
   options: RolldownNormalizedInputOptions,
@@ -82,20 +84,23 @@ export function bindingifyTransform(
       return { code: ret }
     }
 
+    if (!ret.map) {
+      return { code: ret.code }
+    }
+
     // 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]
-      }
+    let map = typeof ret.map === 'object' ? ret.map : JSON.parse(ret.map)
+    if (isEmptySourcemapFiled(map.sourcesContent)) {
+      map.sourcesContent = [code]
+    }
+    if (isEmptySourcemapFiled(map.sources)) {
+      map.sources = [id]
     }
 
     return {
       code: ret.code,
-      map: transformSourcemap(ret.map),
+      map: JSON.stringify(map),
     }
   }
 }
@@ -119,9 +124,27 @@ export function bindingifyLoad(
       return { code: ret }
     }
 
+    if (!ret.map) {
+      return { code: ret.code }
+    }
+
+    let map =
+      typeof ret.map === 'object'
+        ? ret.map
+        : (JSON.parse(ret.map) as SourceMapInputObject)
+    if (!isEmptySourcemapFiled(map.sources)) {
+      // normalize original sourcemap sources
+      // Port form https://github.com/rollup/rollup/blob/master/src/utils/collapseSourcemaps.ts#L180-L188.
+      const directory = path.dirname(id) || '.'
+      const sourceRoot = map.sourceRoot || '.'
+      map.sources = map.sources!.map((source) =>
+        path.resolve(directory, sourceRoot, source!),
+      )
+    }
+
     return {
       code: ret.code,
-      map: transformSourcemap(ret.map),
+      map: JSON.stringify(map),
     }
   }
 }

diff --git a/packages/rolldown/src/types/sourcemap.ts b/packages/rolldown/src/types/sourcemap.ts
@@ -4,6 +4,7 @@ export interface SourceMapInputObject {
   names?: string[]
   sources?: (string | null)[]
   sourcesContent?: (string | null)[]
+  sourceRoot?: string
   version: number
 }
 

diff --git a/packages/rolldown/src/utils/transform-sourcemap.ts b/packages/rolldown/src/utils/transform-sourcemap.ts
@@ -1,12 +1,5 @@
 import { SourceMapInput } from '../types/sourcemap'
 
-export function transformSourcemap(value?: SourceMapInput): string | undefined {
-  if (typeof value === 'object') {
-    return JSON.stringify(value)
-  }
-  return value
-}
-
 export function isEmptySourcemapFiled(
   array: undefined | (string | null)[],
 ): boolean {

diff --git a/packages/rollup-tests/src/failed-tests.json b/packages/rollup-tests/src/failed-tests.json
@@ -717,7 +717,6 @@
   "rollup@sourcemaps@ignore-list-false: accepts false for `sourcemapIgnoreList` to disable the default ignore-listing of node_modules@generates es",
   "rollup@sourcemaps@ignore-list-source-files: populates ignore list@generates es",
   "rollup@sourcemaps@ignore-list-sourcemap-path: correctly passes source map path@generates es",
-  "rollup@sourcemaps@loaders: preserves sourcemap chains when transforming@generates es",
   "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",

diff --git a/packages/rollup-tests/src/status.json b/packages/rollup-tests/src/status.json
@@ -1,6 +1,6 @@
 {
   "failed": 0,
-  "skipFailed": 677,
+  "skipFailed": 676,
   "skipped": 0,
-  "passed": 242
+  "passed": 243
 }
diff --git a/packages/rollup-tests/src/status.md b/packages/rollup-tests/src/status.md
@@ -1,6 +1,6 @@
 |  | number |
 |----| ---- |
 | failed | 0|
-| skipFailed | 677|
+| skipFailed | 676|
 | skipped | 0|
-| passed | 242|
+| passed | 243|