Skip to content

Commit

Permalink
feat(napi/transform): align output SourceMap with Rollup's `Existin…
Browse files Browse the repository at this point in the history
…gRawSourceMap` (#5657)

closes #5578
  • Loading branch information
Boshen committed Sep 9, 2024
1 parent c8bc6f0 commit e698418
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 37 deletions.
4 changes: 3 additions & 1 deletion napi/transform/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,12 @@ export interface ReactRefreshBindingOptions {
export interface SourceMap {
file?: string
mappings?: string
names?: Array<string>
sourceRoot?: string
sources?: Array<string | undefined | null>
sourcesContent?: Array<string | undefined | null>
names?: Array<string>
version: number
x_google_ignoreList?: Array<number>
}

/**
Expand Down
29 changes: 3 additions & 26 deletions napi/transform/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,13 @@
mod context;
mod options;

use napi_derive::napi;

#[napi(object)]
pub struct SourceMap {
pub file: Option<String>,
pub mappings: Option<String>,
pub source_root: Option<String>,
pub sources: Option<Vec<Option<String>>>,
pub sources_content: Option<Vec<Option<String>>>,
pub names: Option<Vec<String>>,
}

pub use crate::options::*;

mod sourcemap;
pub use crate::sourcemap::*;

mod isolated_declaration;
pub use isolated_declaration::*;

mod transformer;
pub use transformer::*;

impl From<oxc_sourcemap::SourceMap> for SourceMap {
fn from(source_map: oxc_sourcemap::SourceMap) -> Self {
let json = source_map.to_json();
Self {
file: json.file,
mappings: json.mappings,
source_root: json.source_root,
sources: json.sources,
sources_content: json.sources_content,
names: json.names,
}
}
}
46 changes: 46 additions & 0 deletions napi/transform/src/sourcemap.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
use napi_derive::napi;

// Aligned with Rollup's sourcemap input.
//
// <https://github.com/rollup/rollup/blob/766dbf90d69268971feaafa1f53f88a0755e8023/src/rollup/types.d.ts#L80-L89>
//
// ```
// export interface ExistingRawSourceMap {
// file?: string;
// mappings: string;
// names: string[];
// sourceRoot?: string;
// sources: string[];
// sourcesContent?: string[];
// version: number;
// x_google_ignoreList?: number[];
// }
// ```
#[napi(object)]
pub struct SourceMap {
pub file: Option<String>,
pub mappings: Option<String>,
pub names: Option<Vec<String>>,
pub source_root: Option<String>,
pub sources: Option<Vec<Option<String>>>,
pub sources_content: Option<Vec<Option<String>>>,
pub version: u8,
#[napi(js_name = "x_google_ignoreList")]
pub x_google_ignorelist: Option<Vec<u32>>,
}

impl From<oxc_sourcemap::SourceMap> for SourceMap {
fn from(source_map: oxc_sourcemap::SourceMap) -> Self {
let json = source_map.to_json();
Self {
file: json.file,
mappings: json.mappings,
names: json.names,
source_root: json.source_root,
sources: json.sources,
sources_content: json.sources_content,
version: 3,
x_google_ignorelist: None,
}
}
}
32 changes: 22 additions & 10 deletions napi/transform/test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,6 @@ import oxc from './index.js';

console.log(`Testing on ${process.platform}-${process.arch}`);

test(oxc.isolatedDeclaration('test.ts', 'class A {}', { sourcemap: true }), {
code: 'declare class A {}\n',
map: {
mappings: 'AAAA,cAAM,EAAE,CAAE',
names: [],
sources: ['test.ts'],
sourcesContent: ['class A {}'],
},
});

function test(ret, expected) {
console.log(ret.code);
console.log(ret.map);
Expand All @@ -23,3 +13,25 @@ function test(ret, expected) {
assert.deepEqual(ret.map, expected.map);
assert(ret.errors.length == 0);
}

test(oxc.isolatedDeclaration('test.ts', 'class A {}', { sourcemap: true }), {
code: 'declare class A {}\n',
map: {
mappings: 'AAAA,cAAM,EAAE,CAAE',
names: [],
sources: ['test.ts'],
sourcesContent: ['class A {}'],
version: 3,
},
});

test(oxc.transform('test.ts', 'class A<T> {}', { sourcemap: true }), {
code: 'class A {}\n',
map: {
mappings: 'AAAA,MAAM,EAAK,CAAE',
names: [],
sources: ['test.ts'],
sourcesContent: ['class A<T> {}'],
version: 3,
},
});

0 comments on commit e698418

Please sign in to comment.