support wasm in javascript library

Author: nitsky

.prettierrc.json

@@ -1,3 +1,8 @@
 {
-  "useTabs": true
+	"arrowParens": "avoid",
+	"bracketSpacing": true,
+	"jsxBracketSameLine": false,
+	"semi": false,
+	"trailingComma": "all",
+	"useTabs": true
 }

Cargo.lock

@@ -2,13 +2,13 @@
 resolver = "2"
 members = [
 	"crates/*",
-	"crates/www/pages/**/server",
-	"crates/www/pages/**/client",
 	"languages/c",
 	"languages/elixir",
-	"languages/node",
+	"languages/javascript/node",
+	"languages/javascript/wasm",
 	"languages/python",
 	"languages/rust",
+	"languages/rust/examples/*",
 ]
 
 [profile.dev.build-override]

Cargo.toml

@@ -7,7 +7,7 @@
 Tangram is an automated machine learning framework designed for programmers.
 
 - Run `tangram train` to train a model from a CSV file on the command line.
-- Make predictions with libraries for [Elixir](https://hex.pm/packages/tangram), [Go](https://pkg.go.dev/github.com/tangramxyz/tangram-go), [Node.js](https://www.npmjs.com/package/@tangramxyz/tangram-node), [Python](https://pypi.org/project/tangram), [Ruby](https://rubygems.org/gems/tangram), and [Rust](lib.rs/tangram).
+- Make predictions with libraries for [Elixir](https://hex.pm/packages/tangram), [Go](https://pkg.go.dev/github.com/tangramxyz/tangram-go), [JavaScript](https://www.npmjs.com/package/@tangramxyz/tangram), [Python](https://pypi.org/project/tangram), [Ruby](https://rubygems.org/gems/tangram), and [Rust](lib.rs/tangram).
 - Run `tangram app` to learn more about your models and monitor them in production.
 
 ### Install
@@ -30,21 +30,21 @@ The CLI automatically transforms your data into features, trains a number of mod
 
 ### Predict
 
-Make predictions with libraries for [Elixir](https://hex.pm/packages/tangram), [Go](https://pkg.go.dev/github.com/tangramxyz/tangram-go), [Node.js](https://www.npmjs.com/package/@tangramxyz/tangram-node), [Python](https://pypi.org/project/tangram), [Ruby](https://rubygems.org/gems/tangram), and [Rust](https://lib.rs/tangram).
+Make predictions with libraries for [Elixir](https://hex.pm/packages/tangram), [Go](https://pkg.go.dev/github.com/tangramxyz/tangram-go), [JavaScript](https://www.npmjs.com/package/@tangramxyz/tangram), [Python](https://pypi.org/project/tangram), [Ruby](https://rubygems.org/gems/tangram), and [Rust](https://lib.rs/tangram).
 
 ```javascript
-let tangram = require("@tangramxyz/tangram-node");
+let tangram = require("@tangramxyz/tangram")
 
-let model = new tangram.Model("./heart_disease.tangram");
+let model = new tangram.Model("./heart_disease.tangram")
 
 let input = {
 	age: 63,
 	gender: "male",
 	// ...
-};
+}
 
-let output = model.predictSync(input);
-console.log(output);
+let output = model.predict(input)
+console.log(output)
 ```
 
 ```javascript
@@ -70,7 +70,7 @@ model.logPrediction({
 	input,
 	options,
 	output,
-});
+})
 ```
 
 Later on, if you find out the true value for a prediction, call `logTrueValue`.
@@ -80,7 +80,7 @@ Later on, if you find out the true value for a prediction, call `logTrueValue`.
 model.logTrueValue({
 	identifier: "6c955d4f-be61-4ca7-bba9-8fe32d03f801",
 	trueValue: "Positive",
-});
+})
 ```
 
 Now you can:

README.md

@@ -31,7 +31,10 @@ pub async fn post(request: &mut http::Request<hyper::Body>) -> Result<http::Resp
 	let context = request.extensions().get::<Arc<Context>>().unwrap().clone();
 	let bytes = match hyper::body::to_bytes(request.body_mut()).await {
 		Ok(bytes) => bytes,
-		Err(_) => return Ok(bad_request()),
+		Err(e) => {
+			error!(%e);
+			return Ok(bad_request());
+		}
 	};
 	let monitor_events: MonitorEventSet = match serde_json::from_slice(&bytes) {
 		Ok(monitor_events) => monitor_events,
@@ -59,7 +62,8 @@ pub async fn post(request: &mut http::Request<hyper::Body>) -> Result<http::Resp
 					monitor_event,
 				)
 				.await;
-				if handle_prediction_result.is_err() {
+				if let Err(e) = handle_prediction_result {
+					error!(%e);
 					return Ok(bad_request());
 				}
 			}

crates/app/pages/track/server/post.rs

@@ -119,13 +119,15 @@ fn alpine(
 			arch = match arch {
 				Arch::X8664 => "x86_64",
 				Arch::AArch64 => "aarch64",
+				Arch::Wasm32 => unreachable!(),
 			},
 		);
 		std::fs::write(&apkbuild_path, &apkbuild).unwrap();
 		let tangram_cli_dst_path = repo_path.join("tangram");
 		let target = match arch {
 			Arch::X8664 => Target::X8664UnknownLinuxGnu,
 			Arch::AArch64 => Target::AArch64UnknownLinuxGnu,
+			Arch::Wasm32 => unreachable!(),
 		};
 		let tangram_cli_path = dist_path
 			.join(target.as_str())
@@ -204,7 +206,11 @@ fn deb(
 		let _ = components.next().unwrap();
 		let version = components.next().unwrap().to_owned();
 		let arch = components.next().unwrap().to_owned();
-		debs.push(Deb { arch, version, path });
+		debs.push(Deb {
+			arch,
+			version,
+			path,
+		});
 	}
 	let distributions = &["debian", "ubuntu"];
 	let debian_versions = vec!["sid", "bullseye", "buster", "stretch"];

crates/build/build_pkgs.rs

@@ -55,6 +55,23 @@ pub fn run(args: Args) {
 		Target::X8664PcWindowsGnu => {
 			build_gnu(target, Some(vec!["g++-mingw-w64-x86-64".to_owned()]));
 		}
+		Target::Wasm32UnknownUnknown => {
+			build_wasm(target);
+		}
+	}
+
+	if matches!(target, Target::Wasm32UnknownUnknown) {
+		let cargo_artifact_path = tangram_path
+			.join("target")
+			.join(target.as_str())
+			.join("release");
+		let tangram_wasm_artifact_path = cargo_artifact_path.join("tangram_wasm.wasm");
+		std::fs::copy(
+			tangram_wasm_artifact_path,
+			dist_target_path.join("tangram_wasm.wasm"),
+		)
+		.unwrap();
+		return;
 	}
 
 	eprintln!("generating tangram.h");
@@ -105,6 +122,7 @@ pub fn run(args: Args) {
 				cargo_artifact_path_dynamic.join(target_file_names.tangram_node_src_file_name),
 			)
 		}
+		Target::Wasm32UnknownUnknown => unreachable!(),
 	};
 	std::fs::copy(
 		tangram_cli_artifact_path,
@@ -142,6 +160,7 @@ pub fn run(args: Args) {
 		Target::AArch64AppleDarwin => build_python_macos(),
 		Target::X8664PcWindowsMsvc => build_python_windows(),
 		Target::X8664PcWindowsGnu => {}
+		Target::Wasm32UnknownUnknown => unreachable!(),
 	}
 
 	// Move the python wheels to the dist target path.
@@ -165,6 +184,7 @@ pub fn run(args: Args) {
 		Target::X8664UnknownLinuxMusl
 		| Target::AArch64UnknownLinuxMusl
 		| Target::X8664PcWindowsGnu => {}
+		Target::Wasm32UnknownUnknown => unreachable!(),
 	}
 }
 
@@ -197,6 +217,7 @@ fn build_gnu(target: Target, apt_packages: Option<Vec<String>>) {
 	let docker_platform = match arch {
 		Arch::X8664 => "linux/amd64",
 		Arch::AArch64 => "linux/arm64",
+		Arch::Wasm32 => unreachable!(),
 	};
 	let apt_packages = apt_packages
 		.map(|apt_packages| apt_packages.join(" "))
@@ -259,6 +280,7 @@ fn build_musl(target: Target) {
 	let docker_platform = match arch {
 		Arch::X8664 => "linux/amd64",
 		Arch::AArch64 => "linux/arm64",
+		Arch::Wasm32 => unreachable!(),
 	};
 	let script = format!(
 		r#"
@@ -323,6 +345,7 @@ fn build_python_manylinux(arch: Arch) {
 	let docker_platform = match arch {
 		Arch::X8664 => "linux/amd64",
 		Arch::AArch64 => "linux/arm64",
+		Arch::Wasm32 => unreachable!(),
 	};
 	let script = r#"
 		set -ex
@@ -431,3 +454,17 @@ fn build_python_windows() {
 	.run()
 	.unwrap();
 }
+
+fn build_wasm(target: Target) {
+	cmd!(
+		which("cargo").unwrap(),
+		"build",
+		"--release",
+		"--target",
+		target.as_str(),
+		"--package",
+		"tangram_wasm",
+	)
+	.run()
+	.unwrap();
+}

crates/build/compile.rs

@@ -83,8 +83,8 @@ pub fn run(_args: Args) {
 		.unwrap();
 	}
 
-	eprintln!("node");
-	let node_dist_path = tangram_path.join("languages/node/native");
+	eprintln!("javascript");
+	let node_dist_path = tangram_path.join("languages/javascript/node/dist");
 	if std::fs::metadata(&node_dist_path)
 		.map(|m| m.is_dir())
 		.unwrap_or(false)
@@ -111,6 +111,20 @@ pub fn run(_args: Args) {
 		)
 		.unwrap();
 	}
+	let wasm_dist_path = tangram_path.join("languages/javascript/wasm/dist");
+	if std::fs::metadata(&wasm_dist_path)
+		.map(|m| m.is_dir())
+		.unwrap_or(false)
+	{
+		std::fs::remove_dir_all(&wasm_dist_path).unwrap();
+	}
+	install(
+		&dist_path
+			.join("wasm32-unknown-unknown")
+			.join("tangram_wasm.wasm"),
+		&wasm_dist_path.join("tangram_wasm.wasm"),
+	)
+	.unwrap();
 
 	eprintln!("python");
 	let python_dist_path = tangram_path.join("languages/python/dist");