nightly build plus wasm opt (#17)

* fix: add clap-cargo-extra and clean up
* feat: rebuild only when needed
* fix: display filename that errored
* feat: nightly optimizations
* feat: upgrade to use clap-cargo-extra and add transitive deps
* fix(CI): add toolchain file
* chore: update readme and ensure examples are not published

Co-authored-by: Willem Wyndham <[email protected]>
Co-authored-by: Willem Wyndham <[email protected]>

Cargo.toml

@@ -20,14 +20,13 @@ anyhow = "1.0.51"
 
 ## CLI
 clap = {version = "=3.1.8", features = ["derive", "cargo"]}
-# escargot = "0.5.7"
-clap-cargo = { version = "0.8.0", features = ['cargo_metadata'] }
-cargo_metadata = "0.14.2"
+clap-cargo-extra = "0.2.0"
 
 ## Utilities
-once_cell = "1.10.0"
 brotli = {version= "3.3.4", features = ["std"] }
 bat = "0.21.0"
+cargo_metadata = "0.15"
+filetime = "0.2.17"
 
 [dev-dependencies]
 assert_cmd = "2.0.4"
@@ -46,6 +45,5 @@ path = "src/lib.rs"
 name = "raen"
 path = "src/main.rs"
 
-[[bin]]
-name = "near-cli-build"
-path = "src/main.rs"
+# [patch.crates-io]
+# clap-cargo-extra = {path = "../clap-cargo-extra"}

README.md

@@ -153,6 +153,15 @@ use witgen::witgen;
 type Amount = Balance;
 ```
 
+## Changes
+
+Now including the following in your Cargo.toml will allow projects to include your wit types in their generated wit.
+
+```toml
+[package.metadata.witgen]
+export = true
+```
+
 # Contribute
 
 * Clone this repository

examples/counter/Cargo.toml

@@ -1,12 +1,11 @@
 [package]
 name = "rust-counter-tutorial"
 version = "0.1.0"
-authors = ["Near Inc <[email protected]>"]
-edition = "2018"
+edition = "2021"
+publish = false
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
-brotli = "3.3.4"
 near-sdk = { git = "https://github.com/ahalabs/near-sdk-rs", tag = "v4.0.0-4" }

examples/rust-status-message-advanced/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "status-message-advanced"
 version = "0.1.0"
-authors = ["Near Inc <[email protected]>"]
-edition = "2018"
+edition = "2021"
+publish = false
 
 [lib]
 crate-type = ["cdylib"]

examples/rust-status-message/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "status-message"
 version = "0.1.0"
-authors = ["Near Inc <[email protected]>"]
-edition = "2018"
+edition = "2021"
+publish = false
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
 near-sdk = { git = "https://github.com/ahalabs/near-sdk-rs", tag = "v4.0.0-4" }
-
+witgen-dep = { path = "../witgen-dep"}

examples/witgen-dep-dep/.cargo/config

@@ -0,0 +1,2 @@
+[build]
+rustflags = ["-C", "link-args=-s"]

examples/witgen-dep-dep/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "witgen-dep-dep"
+version = "0.1.0"
+edition = "2021"
+publish = false
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[dependencies]
+witgen = "0.15.0"
+
+[package.metadata.witgen]
+export = true

examples/witgen-dep-dep/src/lib.rs

@@ -0,0 +1,6 @@
+use witgen::witgen;
+
+#[witgen]
+pub struct InnerType {
+    pub text: String,
+}

examples/witgen-dep/.cargo/config

@@ -0,0 +1,2 @@
+[build]
+rustflags = ["-C", "link-args=-s"]

examples/witgen-dep/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "witgen-dep"
+version = "0.1.0"
+edition = "2021"
+publish = false
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[dependencies]
+witgen = "0.15.0"
+witgen-dep-dep = { path = "../witgen-dep-dep" }
+
+[package.metadata.witgen]
+export = true

examples/witgen-dep/src/lib.rs

@@ -0,0 +1,7 @@
+use witgen::witgen;
+use witgen_dep_dep::InnerType;
+
+#[witgen]
+pub struct TestDep {
+    pub inner: InnerType,
+}

rust-toolchain.toml

@@ -0,0 +1,4 @@
+[toolchain]
+channel = "stable"
+targets = ["wasm32-unknown-unknown"]
+components = ["rustc", "cargo", "rustfmt", "clippy", "rust-src"]

src/ext.rs

@@ -0,0 +1,37 @@
+use anyhow::{Context, Result};
+use cargo_metadata::Package;
+use filetime::FileTime;
+use std::{fs, path::Path};
+
+pub trait PackageExt {
+    fn witgen_dep(&self) -> bool;
+}
+
+impl PackageExt for Package {
+    fn witgen_dep(&self) -> bool {
+        self.metadata
+            .as_object()
+            .map_or(false, |metadata| metadata.contains_key("witgen"))
+    }
+}
+
+pub fn get_time(path: &Path) -> Result<FileTime> {
+    Ok(FileTime::from_last_modification_time(
+        &fs::metadata(path).context(format!("failed to access {}", path.to_string_lossy()))?,
+    ))
+}
+
+pub fn compress_file(p: &Path) -> Result<Vec<u8>> {
+    let buf = fs::read(p)
+        .map_err(anyhow::Error::from)
+        .with_context(|| format!("{}", p.to_string_lossy()))?
+        .into_boxed_slice();
+    let mut out = Vec::<u8>::new();
+    let params = brotli::enc::BrotliEncoderParams {
+        quality: 11,
+        ..Default::default()
+    };
+
+    brotli::BrotliCompress(&mut buf.as_ref(), &mut out, &params)?;
+    Ok(out)
+}

src/lib.rs

@@ -1 +1,2 @@
+pub mod ext;
 pub mod raen;

src/main.rs

@@ -5,6 +5,7 @@ use std::env;
 use anyhow::{Context, Result};
 use clap::{crate_version, FromArgMatches, IntoApp};
 
+mod ext;
 mod raen;
 use crate::raen::Raen;