Skip to content

add esm support #45

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

Open
toadslop wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add esm support #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 28 additions & 10 deletions crates/gen-js/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ struct Exports {
pub struct Opts {
#[cfg_attr(feature = "structopt", structopt(long = "no-typescript"))]
pub no_typescript: bool,
#[cfg_attr(feature = "structopt", structopt(long))]
pub esm: bool,
}

impl Opts {
Expand Down Expand Up @@ -1122,7 +1124,12 @@ impl Generator for Js {
}

if !self.intrinsics.is_empty() {
self.src.js("const { ");
if self.opts.esm {
self.src.js("import { ");
} else {
self.src.js("const { ");
}

for (i, (intrinsic, name)) in mem::take(&mut self.intrinsics).into_iter().enumerate() {
if i > 0 {
self.src.js(", ");
Expand All @@ -1134,7 +1141,12 @@ impl Generator for Js {
}
self.all_intrinsics.insert(intrinsic);
}
self.src.js(" } = require('./intrinsics.js');\n");

if self.opts.esm {
self.src.js(" } from './intrinsics.js';\n");
} else {
self.src.js(" } = require('./intrinsics.js');\n");
}
}

self.src.js(&imports.js);
Expand All @@ -1146,10 +1158,7 @@ impl Generator for Js {
exported_items.extend(exports.exported_items);
exported_items.extend(imports.exported_items);

self.src.js(&format!(
"\nmodule.exports = {{ {} }};\n",
exported_items.join(", ")
));
self.print_exports(exported_items);

let src = mem::take(&mut self.src);
let name = iface.name.to_kebab_case();
Expand Down Expand Up @@ -2383,10 +2392,19 @@ impl Js {
self.print_intrinsic(i);
}

self.src.js(&format!(
"\nmodule.exports = {{ {} }};\n",
self.src.exported_items.join(", ")
));
self.print_exports(self.src.exported_items.clone());
}

fn print_exports(&mut self, exported_items: Vec<String>) {
if self.opts.esm {
self.src
.js(&format!("\nexport {{ {} }};\n", exported_items.join(", ")));
} else {
self.src.js(&format!(
"\nmodule.exports = {{ {} }};\n",
exported_items.join(", ")
));
}
}

fn print_intrinsic(&mut self, i: Intrinsic) {
Expand Down