Merge pull request #109 from kwonoj/feat-typescript-bindgen

feat(command): expose --no-typescript option to init command

Author: ashleygwilliams

src/bindgen.rs

@@ -28,7 +28,7 @@ pub fn cargo_install_wasm_bindgen() -> Result<(), Error> {
     }
 }
 
-pub fn wasm_bindgen_build(path: &str, name: &str) -> Result<(), Error> {
+pub fn wasm_bindgen_build(path: &str, name: &str, disable_dts: bool) -> Result<(), Error> {
     let step = format!(
         "{} {}Running WASM-bindgen...",
         style("[7/7]").bold().dim(),
@@ -37,11 +37,18 @@ pub fn wasm_bindgen_build(path: &str, name: &str) -> Result<(), Error> {
     let pb = PBAR.message(&step);
     let binary_name = name.replace("-", "_");
     let wasm_path = format!("target/wasm32-unknown-unknown/release/{}.wasm", binary_name);
+    let dts_arg = if disable_dts == false {
+        "--typescript"
+    } else {
+        "--no-typescript"
+    };
+
     let output = Command::new("wasm-bindgen")
         .current_dir(path)
         .arg(&wasm_path)
         .arg("--out-dir")
         .arg("./pkg")
+        .arg(dts_arg)
         .output()?;
     pb.finish();
     if !output.status.success() {

src/command.rs

@@ -22,6 +22,8 @@ pub enum Command {
         path: Option<String>,
         #[structopt(long = "scope", short = "s")]
         scope: Option<String>,
+        #[structopt(long = "no-typescript")]
+        disable_dts: bool,
     },
 
     #[structopt(name = "pack")]
@@ -61,7 +63,11 @@ pub fn run_wasm_pack(command: Command) -> result::Result<(), Error> {
     // Run the correct command based off input and store the result of it so that we can clear
     // the progress bar then return it
     let status = match command {
-        Command::Init { path, scope } => init(path, scope),
+        Command::Init {
+            path,
+            scope,
+            disable_dts,
+        } => init(path, scope, disable_dts),
         Command::Pack { path } => pack(path),
         Command::Publish { path } => publish(path),
         Command::Login {
@@ -104,19 +110,23 @@ pub fn create_pkg_dir(path: &str) -> result::Result<(), Error> {
     Ok(())
 }
 
-fn init(path: Option<String>, scope: Option<String>) -> result::Result<(), Error> {
+fn init(
+    path: Option<String>,
+    scope: Option<String>,
+    disable_dts: bool,
+) -> result::Result<(), Error> {
     let started = Instant::now();
 
     let crate_path = set_crate_path(path);
 
     build::rustup_add_wasm_target()?;
     build::cargo_build_wasm(&crate_path)?;
     create_pkg_dir(&crate_path)?;
-    manifest::write_package_json(&crate_path, scope)?;
+    manifest::write_package_json(&crate_path, scope, disable_dts)?;
     readme::copy_from_crate(&crate_path)?;
     bindgen::cargo_install_wasm_bindgen()?;
     let name = manifest::get_crate_name(&crate_path)?;
-    bindgen::wasm_bindgen_build(&crate_path, &name)?;
+    bindgen::wasm_bindgen_build(&crate_path, &name, disable_dts)?;
     PBAR.message(&format!(
         "{} Done in {}",
         emoji::SPARKLE,

src/manifest.rs

@@ -33,6 +33,7 @@ struct NpmPackage {
     repository: Option<Repository>,
     files: Vec<String>,
     main: String,
+    types: Option<String>,
 }
 
 #[derive(Serialize)]
@@ -52,10 +53,16 @@ fn read_cargo_toml(path: &str) -> Result<CargoManifest, Error> {
 }
 
 impl CargoManifest {
-    fn into_npm(mut self, scope: Option<String>) -> NpmPackage {
+    fn into_npm(mut self, scope: Option<String>, disable_dts: bool) -> NpmPackage {
         let filename = self.package.name.replace("-", "_");
         let wasm_file = format!("{}_bg.wasm", filename);
         let js_file = format!("{}.js", filename);
+        let dts_file = if disable_dts == true {
+            None
+        } else {
+            Some(format!("{}.d.ts", filename))
+        };
+
         if let Some(s) = scope {
             self.package.name = format!("@{}/{}", s, self.package.name);
         }
@@ -71,12 +78,17 @@ impl CargoManifest {
             }),
             files: vec![wasm_file],
             main: js_file,
+            types: dts_file,
         }
     }
 }
 
 /// Generate a package.json file inside in `./pkg`.
-pub fn write_package_json(path: &str, scope: Option<String>) -> Result<(), Error> {
+pub fn write_package_json(
+    path: &str,
+    scope: Option<String>,
+    disable_dts: bool,
+) -> Result<(), Error> {
     let step = format!(
         "{} {}Writing a package.json...",
         style("[4/7]").bold().dim(),
@@ -94,7 +106,7 @@ pub fn write_package_json(path: &str, scope: Option<String>) -> Result<(), Error
     let pkg_file_path = format!("{}/pkg/package.json", path);
     let mut pkg_file = File::create(pkg_file_path)?;
     let crate_data = read_cargo_toml(path)?;
-    let npm_data = crate_data.into_npm(scope);
+    let npm_data = crate_data.into_npm(scope, disable_dts);
 
     if npm_data.description.is_none() {
         PBAR.warn(&warn_fmt("description"));

tests/manifest/main.rs

@@ -29,7 +29,7 @@ fn it_gets_the_crate_name_provided_path() {
 fn it_creates_a_package_json_default_path() {
     let path = ".".to_string();
     wasm_pack::command::create_pkg_dir(&path).unwrap();
-    assert!(manifest::write_package_json(&path, None).is_ok());
+    assert!(manifest::write_package_json(&path, None, false).is_ok());
     let package_json_path = format!("{}/pkg/package.json", &path);
     assert!(fs::metadata(package_json_path).is_ok());
     assert!(utils::read_package_json(&path).is_ok());
@@ -42,13 +42,15 @@ fn it_creates_a_package_json_default_path() {
     );
     assert_eq!(pkg.files, ["wasm_pack_bg.wasm"]);
     assert_eq!(pkg.main, "wasm_pack.js");
+    let types = pkg.types.unwrap_or_default();
+    assert_eq!(types, "wasm_pack.d.ts");
 }
 
 #[test]
 fn it_creates_a_package_json_provided_path() {
     let path = "tests/fixtures/js-hello-world".to_string();
     wasm_pack::command::create_pkg_dir(&path).unwrap();
-    assert!(manifest::write_package_json(&path, None).is_ok());
+    assert!(manifest::write_package_json(&path, None, false).is_ok());
     let package_json_path = format!("{}/pkg/package.json", &path);
     assert!(fs::metadata(package_json_path).is_ok());
     assert!(utils::read_package_json(&path).is_ok());
@@ -60,7 +62,7 @@ fn it_creates_a_package_json_provided_path() {
 fn it_creates_a_package_json_provided_path_with_scope() {
     let path = "tests/fixtures/scopes".to_string();
     wasm_pack::command::create_pkg_dir(&path).unwrap();
-    assert!(manifest::write_package_json(&path, Some("test".to_string())).is_ok());
+    assert!(manifest::write_package_json(&path, Some("test".to_string()), false).is_ok());
     let package_json_path = format!("{}/pkg/package.json", &path);
     assert!(fs::metadata(package_json_path).is_ok());
     assert!(utils::read_package_json(&path).is_ok());

tests/manifest/utils.rs

@@ -13,6 +13,7 @@ pub struct NpmPackage {
     pub repository: Repository,
     pub files: Vec<String>,
     pub main: String,
+    pub types: Option<String>,
 }
 
 #[derive(Deserialize)]