Skip to content

feat: Allow unknown module type #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 1, 2025
Merged

feat: Allow unknown module type #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4786b05
feat: Allow `unknown` module type
timfish Jun 28, 2025
2ffdb27
Test esm and cjs too
timfish Jun 30, 2025
fdc1c5c
Merge branch 'main' into timfish/feat/isModule-options
timfish Jun 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 28 additions & 3 deletions src/wasm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,32 @@ use std::path::PathBuf;
use swc::config::IsModule;
use wasm_bindgen::prelude::*;

#[cfg_attr(
feature = "serde",
derive(serde::Serialize, serde::Deserialize),
serde(rename_all = "lowercase")
)]
#[cfg_attr(
feature = "wasm",
derive(tsify::Tsify),
tsify(into_wasm_abi, from_wasm_abi)
)]
pub enum ModuleType {
ESM,
CJS,
Unknown,
}

impl From<ModuleType> for IsModule {
fn from(value: ModuleType) -> Self {
match value {
ModuleType::ESM => IsModule::Bool(true),
ModuleType::CJS => IsModule::Bool(false),
ModuleType::Unknown => IsModule::Unknown,
}
}
}

#[wasm_bindgen]
pub struct InstrumentationMatcher(Instrumentor);

Expand Down Expand Up @@ -33,10 +59,9 @@ pub struct Transformer(InstrumentationVisitor);
#[wasm_bindgen]
impl Transformer {
#[wasm_bindgen]
pub fn transform(&mut self, contents: &str, is_module: bool) -> Result<String, JsError> {
let is_module = IsModule::Bool(is_module);
pub fn transform(&mut self, contents: &str, is_module: ModuleType) -> Result<String, JsError> {
self.0
.transform(contents, is_module)
.transform(contents, is_module.into())
.map_err(|e| JsError::new(&e.to_string()))
}
}
Expand Down
6 changes: 3 additions & 3 deletions tests/wasm/tests.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ const matchedTransforms = instrumentor.getTransformer(
assert.ok(matchedTransforms);

const original = await fs.readFile(path.join(import.meta.dirname, './testdata/original.mjs'))
const output = matchedTransforms.transform(original.toString('utf8'), true);
const output = matchedTransforms.transform(original.toString('utf8'), 'esm');

const expected = await fs.readFile(path.join(import.meta.dirname, './testdata/expected.mjs'))
assert.strictEqual(output, expected.toString('utf8'));

const originalCjs = await fs.readFile(path.join(import.meta.dirname, './testdata/original-cjs.js'))
const outputCjs = matchedTransforms.transform(originalCjs.toString('utf8'), false);
const outputCjs = matchedTransforms.transform(originalCjs.toString('utf8'), 'cjs');


const expectedCjs = await fs.readFile(path.join(import.meta.dirname, './testdata/expected-cjs.js'))
Expand All @@ -44,5 +44,5 @@ assert.strictEqual(outputCjs, expectedCjs.toString('utf8'));
const noMatch = await fs.readFile(path.join(import.meta.dirname, './testdata/no-match.mjs'));

assert.throws(() => {
matchedTransforms.transform(noMatch.toString('utf8'), true);
matchedTransforms.transform(noMatch.toString('utf8'), 'unknown');
}, { message: "Failed to find injection points for: [\"constructor\", \"fetch\"]" });