Merge pull request #244 from data-pup/wasm-bindgen-coord

Coordinate wasm-bindgen versions.

Cargo.lock

@@ -703,6 +703,16 @@ dependencies = [
  "structopt 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempfile 3.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "which 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "which"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -828,6 +838,7 @@ dependencies = [
 "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum walkdir 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c66c0b9792f0a765345452775f3adbd28dde9d33f30d13e5dcc5ae17cf6f3780"
+"checksum which 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49c4f580e93079b70ac522e7bdebbe1568c8afa7d8d05ee534ee737ca37d2f51"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "773ef9dcc5f24b7d850d0ff101e542ff24c3b090a9768e03ff889fdef41f00fd"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"

Cargo.toml

@@ -23,6 +23,7 @@ slog-term = "2.4"
 slog-async = "2.3"
 structopt = "0.2"
 toml = "0.4"
+which = "2.0.0"
 
 [dev-dependencies]
 copy_dir = "0.1.2"

src/bindgen.rs

@@ -3,26 +3,53 @@
 use emoji;
 use error::Error;
 use progressbar::Step;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 use std::process::Command;
+use which::which;
 use PBAR;
 
 /// Install the `wasm-bindgen` CLI with `cargo install`.
-pub fn cargo_install_wasm_bindgen(step: &Step) -> Result<(), Error> {
+pub fn cargo_install_wasm_bindgen(
-    let msg = format!("{}Installing WASM-bindgen...", emoji::DOWN_ARROW);
+    path: &Path,
+    version: &str,
+    install_permitted: bool,
+    step: &Step,
+) -> Result<(), Error> {
+    // If the `wasm-bindgen` dependency is already met, print a message and return.
+    if wasm_bindgen_path(path)
+        .map(|bindgen_path| wasm_bindgen_version_check(&bindgen_path, version))
+        .unwrap_or(false)
+    {
+        let msg = format!("{}wasm-bindgen already installed...", emoji::DOWN_ARROW);
+        PBAR.step(step, &msg);
+        return Ok(());
+    }
+
+    // If the `wasm-bindgen` dependency was not met, and installs are not
+    // permitted, return a configuration error.
+    if !install_permitted {
+        let msg = format!("wasm-bindgen v{} is not installed!", version);
+        return Error::crate_config(&msg);
+    }
+
+    let msg = format!("{}Installing wasm-bindgen...", emoji::DOWN_ARROW);
     PBAR.step(step, &msg);
     let output = Command::new("cargo")
         .arg("install")
-        .arg("wasm-bindgen-cli")
         .arg("--force")
+        .arg("wasm-bindgen-cli")
+        .arg("--version")
+        .arg(version)
+        .arg("--root")
+        .arg(path)
         .output()?;
     if !output.status.success() {
+        let message = "Installing wasm-bindgen failed".to_string();
         let s = String::from_utf8_lossy(&output.stderr);
-        if s.contains("already exists") {
+        Err(Error::Cli {
-            PBAR.info("wasm-bindgen already installed");
+            message,
-            return Ok(());
+            stderr: s.to_string(),
-        }
+        })
-        Error::cli("Installing wasm-bindgen failed", s)
     } else {
         Ok(())
     }
@@ -42,6 +69,8 @@ pub fn wasm_bindgen_build(
     PBAR.step(step, &msg);
     let binary_name = name.replace("-", "_");
     let release_or_debug = if debug { "debug" } else { "release" };
+
+    if let Some(wasm_bindgen_path) = wasm_bindgen_path(path) {
         let wasm_path = format!(
             "target/wasm32-unknown-unknown/{}/{}.wasm",
             release_or_debug, binary_name
@@ -51,13 +80,12 @@ pub fn wasm_bindgen_build(
         } else {
             "--no-typescript"
         };
-
         let target_arg = match target {
             "nodejs" => "--nodejs",
             _ => "--browser",
         };
-
+        let bindgen_path = Path::new(&wasm_bindgen_path);
-    let output = Command::new("wasm-bindgen")
+        let output = Command::new(bindgen_path)
             .current_dir(path)
             .arg(&wasm_path)
             .arg("--out-dir")
@@ -71,4 +99,51 @@ pub fn wasm_bindgen_build(
         } else {
             Ok(())
         }
+    } else {
+        Error::crate_config("Could not find `wasm-bindgen`")
+    }
+}
+
+/// Check if the `wasm-bindgen` dependency is locally satisfied.
+fn wasm_bindgen_version_check(bindgen_path: &PathBuf, dep_version: &str) -> bool {
+    Command::new(bindgen_path)
+        .arg("--version")
+        .output()
+        .ok()
+        .filter(|output| output.status.success())
+        .map(|output| {
+            String::from_utf8_lossy(&output.stdout)
+                .trim()
+                .split_whitespace()
+                .nth(1)
+                .map(|v| v == dep_version)
+                .unwrap_or(false)
+        }).unwrap_or(false)
+}
+
+/// Return a `PathBuf` containing the path to either the local wasm-bindgen
+/// version, or the globally installed version if there is no local version.
+fn wasm_bindgen_path(crate_path: &Path) -> Option<PathBuf> {
+    // Return the path to the local `wasm-bindgen`, if it exists.
+    let local_bindgen_path = |crate_path: &Path| -> Option<PathBuf> {
+        let mut p = crate_path.to_path_buf();
+        p.push("bin");
+        p.push("wasm-bindgen");
+        if p.is_file() {
+            Some(p)
+        } else {
+            None
+        }
+    };
+
+    // Return the path to the global `wasm-bindgen`, if it exists.
+    let global_bindgen_path = || -> Option<PathBuf> {
+        if let Ok(p) = which("wasm-bindgen") {
+            Some(p)
+        } else {
+            None
+        }
+    };
+
+    local_bindgen_path(crate_path).or_else(global_bindgen_path)
 }

src/command/build.rs

@@ -19,6 +19,7 @@ pub(crate) struct Build {
     pub disable_dts: bool,
     pub target: String,
     pub debug: bool,
+    pub mode: BuildMode,
     // build_config: Option<BuildConfig>,
     pub crate_name: String,
 }
@@ -71,6 +72,10 @@ impl Build {
     pub fn try_from_opts(build_opts: BuildOptions) -> Result<Self, Error> {
         let crate_path = set_crate_path(build_opts.path);
         let crate_name = manifest::get_crate_name(&crate_path)?;
+        let mode = match build_opts.mode.as_str() {
+            "no-install" => BuildMode::Noinstall,
+            _ => BuildMode::Normal,
+        };
         // let build_config = manifest::xxx(&crate_path).xxx();
         Ok(Build {
             crate_path,
@@ -78,14 +83,15 @@ impl Build {
             disable_dts: build_opts.disable_dts,
             target: build_opts.target,
             debug: build_opts.debug,
+            mode,
             // build_config,
             crate_name,
         })
     }
 
     /// Execute this `Build` command.
-    pub fn run(&mut self, log: &Logger, mode: &BuildMode) -> Result<(), Error> {
+    pub fn run(&mut self, log: &Logger) -> Result<(), Error> {
-        let process_steps = Build::get_process_steps(mode);
+        let process_steps = Build::get_process_steps(&self.mode);
 
         let mut step_counter = Step::new(process_steps.len());
 
@@ -100,14 +106,14 @@ impl Build {
         info!(&log, "Done in {}.", &duration);
         info!(
             &log,
-            "Your WASM pkg is ready to publish at {:#?}.",
+            "Your wasm pkg is ready to publish at {:#?}.",
             &self.crate_path.join("pkg")
         );
 
         PBAR.message(&format!("{} Done in {}", emoji::SPARKLE, &duration));
 
         PBAR.message(&format!(
-            "{} Your WASM pkg is ready to publish at {:#?}.",
+            "{} Your wasm pkg is ready to publish at {:#?}.",
             emoji::PACKAGE,
             &self.crate_path.join("pkg")
         ));
@@ -213,8 +219,19 @@ impl Build {
     }
 
     fn step_install_wasm_bindgen(&mut self, step: &Step, log: &Logger) -> Result<(), Error> {
+        info!(&log, "Identifying wasm-bindgen dependency...");
+        let bindgen_version = manifest::get_wasm_bindgen_version(&self.crate_path)?;
         info!(&log, "Installing wasm-bindgen-cli...");
-        bindgen::cargo_install_wasm_bindgen(step)?;
+        let install_permitted = match self.mode {
+            BuildMode::Normal => true,
+            BuildMode::Noinstall => false,
+        };
+        bindgen::cargo_install_wasm_bindgen(
+            &self.crate_path,
+            &bindgen_version,
+            install_permitted,
+            step,
+        )?;
         info!(&log, "Installing wasm-bindgen-cli was successful.");
 
         info!(&log, "Getting the crate name from the manifest...");

src/command/mod.rs

@@ -6,7 +6,7 @@ mod pack;
 mod publish;
 pub mod utils;
 
-use self::build::{Build, BuildMode, BuildOptions};
+use self::build::{Build, BuildOptions};
 use self::login::login;
 use self::pack::pack;
 use self::publish::publish;
@@ -79,12 +79,7 @@ pub fn run_wasm_pack(command: Command, log: &Logger) -> result::Result<(), Error
     let status = match command {
         Command::Build(build_opts) => {
             info!(&log, "Running build command...");
-            let build_mode = match build_opts.mode.as_str() {
+            Build::try_from_opts(build_opts).and_then(|mut b| b.run(&log))
-                "no-install" => BuildMode::Noinstall,
-                "normal" => BuildMode::Normal,
-                _ => BuildMode::Normal,
-            };
-            Build::try_from_opts(build_opts).and_then(|mut b| b.run(&log, &build_mode))
         }
         Command::Pack { path } => {
             info!(&log, "Running pack command...");

src/lib.rs

@@ -19,6 +19,7 @@ extern crate slog;
 extern crate slog_async;
 extern crate slog_term;
 extern crate toml;
+extern crate which;
 
 pub mod bindgen;
 pub mod build;

src/manifest.rs

@@ -218,3 +218,28 @@ fn check_crate_type(path: &Path) -> Result<(), Error> {
       "crate-type must be cdylib to compile to wasm32-unknown-unknown. Add the following to your Cargo.toml file:\n\n[lib]\ncrate-type = [\"cdylib\"]"
     )
 }
+
+/// Get the version of `wasm-bindgen` specified as a dependency.
+pub fn get_wasm_bindgen_version(path: &Path) -> Result<String, Error> {
+    if let Some(deps) = read_cargo_toml(path)?.dependencies {
+        match deps.get("wasm_bindgen") {
+            Some(CargoDependency::Simple(version)) => Ok(version.clone()),
+            Some(CargoDependency::Detailed(_)) => {
+                let msg = format!(
+                    "\"{}\" dependency is missing its version number",
+                    style("wasm-bindgen").bold().dim()
+                );
+                Err(Error::CrateConfig { message: msg })
+            }
+            None => {
+                let message = format!(
+                    "Ensure that you have \"{}\" as a dependency in your Cargo.toml file:\n[dependencies]\nwasm-bindgen = \"0.2\"",
+                    style("wasm-bindgen").bold().dim());
+                Err(Error::CrateConfig { message })
+            }
+        }
+    } else {
+        let message = String::from("Could not find crate dependencies");
+        Err(Error::CrateConfig { message })
+    }
+}