Split WebAssembly into single package.

Author: huacnlee

.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 # Generated by Cargo
 # will have compiled files and executables
 target/
@@ -10,4 +11,5 @@ Cargo.lock
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
-this-will.git-ignore.rs
+this-will.git-ignore.rs
+*.log

Cargo.toml

@@ -1,6 +1,7 @@
 [workspace]
 members = [
   "autocorrect",
+  "autocorrect-wasm",
   "autocorrect-derive",
   "autocorrect-cli",
 ]

Makefile

@@ -23,7 +23,8 @@ install:
 	curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
 	brew install binaryen
 wasm:
-	wasm-pack build --release --scope huacnlee -d $(WORKDIR)/pkg autocorrect
+	wasm-pack build --release --scope huacnlee -d $(WORKDIR)/pkg --out-name autocorrect autocorrect-wasm
+	sed -ie "s/autocorrect\-wasm/autocorrect/" $(WORKDIR)/pkg/package.json
 	wasm-opt -Os -o pkg/autocorrect_bg.wasm pkg/autocorrect_bg.wasm
 wasm\:publish:
 	make wasm

autocorrect-wasm/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+edition = "2021"
+name = "autocorrect-wasm"
+version = "1.6.0"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[dependencies]
+autocorrect = {path = "../autocorrect", version = "1.6.0"}
+serde = {version = "1.0.127", features = ["derive"]}
+serde_json = "1.0.66"
+wasm-bindgen = {version = "0.2.80", features = ["serde-serialize"]}
+wee_alloc = "0.4.5"
+
+[package.metadata.wasm-pack.profile.release]
+wasm-opt = false

autocorrect-wasm/src/ignorer.rs

@@ -0,0 +1,36 @@
+extern crate wasm_bindgen;
+use wasm_bindgen::prelude::*;
+
+#[wasm_bindgen(constructor)]
+pub struct Ignorer {
+    ignorer: autocorrect::ignorer::Ignorer,
+}
+
+#[wasm_bindgen]
+impl Ignorer {
+    #[wasm_bindgen(constructor)]
+    pub fn new(work_dir: &str) -> Ignorer {
+        let ignorer = autocorrect::ignorer::Ignorer::new(work_dir);
+
+        Ignorer { ignorer }
+    }
+
+    #[wasm_bindgen(js_name = "isIgnored")]
+    pub fn is_ignored(&self, path: &str) -> bool {
+        self.ignorer.is_ignored(path)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_is_ignored() {
+        let current_dir = std::env::current_dir().unwrap();
+        let work_dir = current_dir.parent().unwrap().to_str().unwrap();
+        let ignorer = Ignorer::new(work_dir);
+        assert!(ignorer.is_ignored("src/main.rs"));
+        assert!(ignorer.is_ignored("pkg/foo/bar"));
+    }
+}

autocorrect-wasm/src/lib.rs

@@ -0,0 +1,60 @@
+extern crate wasm_bindgen;
+use wasm_bindgen::prelude::*;
+
+extern crate wee_alloc;
+#[global_allocator]
+static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
+
+pub mod ignorer;
+
+/// Automatically add spaces between Chinese and English words.
+///
+/// This method only work for plain text.
+///
+/// # Example
+///
+/// ```
+/// extern crate autocorrect;
+///
+/// println!("{}", autocorrect::format("学习如何用 Rust 构建 Application"));
+/// // => "学习如何用 Rust 构建 Application"
+///
+/// println!("{}", autocorrect::format("于 3 月 10 日开始"));
+/// // => "于 3 月 10 日开始"
+///
+/// println!("{}", autocorrect::format("既に、世界中の数百という企業が Rust を採用し、高速で低リソースのクロスプラットフォームソリューションを実現しています。"));
+/// // => "既に、世界中の数百という企業が Rust を採用し、高速で低リソースのクロスプラットフォームソリューションを実現しています。"
+/// ```
+#[wasm_bindgen]
+pub fn format(text: &str) -> String {
+    autocorrect::format(text)
+}
+
+/// Format content with filetype, and return a json result.
+#[wasm_bindgen(js_name = "formatFor")]
+pub fn format_for(raw: &str, filename_or_ext: &str) -> wasm_bindgen::JsValue {
+    let result = autocorrect::format_for(raw, filename_or_ext);
+    wasm_bindgen::JsValue::from_serde(&result).unwrap()
+}
+
+/// Lint content with filetype, and return a json result.
+#[wasm_bindgen(js_name = "lintFor")]
+pub fn lint_for(raw: &str, filename_or_ext: &str) -> wasm_bindgen::JsValue {
+    let result = autocorrect::lint_for(raw, filename_or_ext);
+    wasm_bindgen::JsValue::from_serde(&result).unwrap()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    // autocorrect: false
+
+    #[test]
+    fn test_format() {
+        assert_eq!(
+            "学习如何用 Rust 构建 Application",
+            format("学习如何用Rust构建Application")
+        );
+    }
+}

autocorrect/Cargo.toml

@@ -11,7 +11,6 @@ repository = "https://github.com/huacnlee/autocorrect"
 version = "1.6.0"
 
 [lib]
-crate-type = ["cdylib", "rlib"]
 name = "autocorrect"
 path = "src/lib.rs"
 
@@ -25,8 +24,6 @@ pest_derive = "2.1.0"
 regex = "1"
 serde = {version = "1.0.127", features = ["derive"]}
 serde_json = "1.0.66"
-wasm-bindgen = {version = "0.2.75", features = ["serde-serialize"]}
-wee_alloc = "0.4.5"
 
 [dev-dependencies]
 pretty_assertions = "1.0.0"

autocorrect/src/ignorer.rs

@@ -1,18 +1,13 @@
 use std::path::Path;
-extern crate wasm_bindgen;
-use wasm_bindgen::prelude::*;
 
-#[wasm_bindgen(constructor)]
 pub struct Ignorer {
     ignorer: ignore::gitignore::Gitignore,
 }
 
 static AUTOCORRECTIGNORE: &str = ".autocorrectignore";
 static GITIGNORE: &str = ".gitignore";
 
-#[wasm_bindgen]
 impl Ignorer {
-    #[wasm_bindgen(constructor)]
     pub fn new(work_dir: &str) -> Ignorer {
         let mut builder = ignore::gitignore::GitignoreBuilder::new(work_dir);
         builder.add(Path::join(Path::new(work_dir), AUTOCORRECTIGNORE));
@@ -24,7 +19,6 @@ impl Ignorer {
         Ignorer { ignorer }
     }
 
-    #[wasm_bindgen(js_name = "isIgnored")]
     pub fn is_ignored(&self, path: &str) -> bool {
         self.ignorer
             .matched_path_or_any_parents(path, false)

autocorrect/src/lib.rs

@@ -90,13 +90,6 @@ mod strategery;
 use code::Results;
 pub use code::{format_for, get_file_extension, is_support_type, lint_for};
 
-extern crate wasm_bindgen;
-use wasm_bindgen::prelude::*;
-
-extern crate wee_alloc;
-#[global_allocator]
-static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
-
 use crate::strategery::Strategery;
 use regex::Regex;
 
@@ -153,7 +146,6 @@ lazy_static! {
 /// println!("{}", autocorrect::format("既に、世界中の数百という企業が Rust を採用し、高速で低リソースのクロスプラットフォームソリューションを実現しています。"));
 /// // => "既に、世界中の数百という企業が Rust を採用し、高速で低リソースのクロスプラットフォームソリューションを実現しています。"
 /// ```
-#[wasm_bindgen]
 pub fn format(text: &str) -> String {
     let mut out = String::from(text);
 
@@ -192,25 +184,10 @@ pub fn format(text: &str) -> String {
 /// "#;
 /// autocorrect::format_html(html);
 /// ```
-#[wasm_bindgen(js_name = "formatHTML")]
 pub fn format_html(html_str: &str) -> String {
     code::format_html(html_str).to_string()
 }
 
-/// Format content with filetype, and return a json result.
-#[wasm_bindgen(js_name = "formatFor")]
-pub fn format_for_json_out(raw: &str, filename_or_ext: &str) -> wasm_bindgen::JsValue {
-    let result = format_for(raw, filename_or_ext);
-    wasm_bindgen::JsValue::from_serde(&result).unwrap()
-}
-
-/// Lint content with filetype, and return a json result.
-#[wasm_bindgen(js_name = "lintFor")]
-pub fn lint_for_json_out(raw: &str, filename_or_ext: &str) -> wasm_bindgen::JsValue {
-    let result = lint_for(raw, filename_or_ext);
-    wasm_bindgen::JsValue::from_serde(&result).unwrap()
-}
-
 fn space_dash_with_hans(text: &str) -> String {
     let mut out = String::from(text);