Offline, privacy-first grammar checker. Fast, open-source, Rust-powered
Created `wasm` backend
Elijah Potter08ca9688628b
diff --git a/Cargo.lock b/Cargo.lockindex 48fa88f8b..9dd617386 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -235,6 +235,16 @@ version = "0.6.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"+[[package]]+name = "console_error_panic_hook"+version = "0.1.7"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"+dependencies = [+ "cfg-if",+ "wasm-bindgen",+]+[[package]]name = "criterion"version = "0.5.1"@@ -367,8 +377,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"dependencies = ["cfg-if",+ "js-sys","libc","wasi",+ "wasm-bindgen",][[package]]@@ -881,18 +893,29 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"[[package]]name = "serde"-version = "1.0.194"+version = "1.0.195"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773"+checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02"dependencies = ["serde_derive",]+[[package]]+name = "serde-wasm-bindgen"+version = "0.6.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "b9b713f70513ae1f8d92665bbbbda5c295c2cf1da5542881ae5eefe20c9af132"+dependencies = [+ "js-sys",+ "serde",+ "wasm-bindgen",+]+[[package]]name = "serde_derive"-version = "1.0.194"+version = "1.0.195"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0"+checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"dependencies = ["proc-macro2","quote",@@ -1129,6 +1152,17 @@ dependencies = ["tracing-log",]+[[package]]+name = "tracing-wasm"+version = "0.2.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "4575c663a174420fa2d78f4108ff68f65bf2fbb7dd89f33749b6e826b3626e07"+dependencies = [+ "tracing",+ "tracing-subscriber",+ "wasm-bindgen",+]+[[package]]name = "try-lock"version = "0.2.4"@@ -1178,11 +1212,25 @@ version = "0.11.0+wasi-snapshot-preview1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"+[[package]]+name = "wasm"+version = "0.1.0"+dependencies = [+ "console_error_panic_hook",+ "getrandom",+ "lt-core",+ "serde",+ "serde-wasm-bindgen",+ "tracing",+ "tracing-wasm",+ "wasm-bindgen",+]+[[package]]name = "wasm-bindgen"-version = "0.2.87"+version = "0.2.90"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"+checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406"dependencies = ["cfg-if","wasm-bindgen-macro",@@ -1190,9 +1238,9 @@ dependencies = [[[package]]name = "wasm-bindgen-backend"-version = "0.2.87"+version = "0.2.90"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"+checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd"dependencies = ["bumpalo","log",@@ -1205,9 +1253,9 @@ dependencies = [[[package]]name = "wasm-bindgen-macro"-version = "0.2.87"+version = "0.2.90"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"+checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999"dependencies = ["quote","wasm-bindgen-macro-support",@@ -1215,9 +1263,9 @@ dependencies = [[[package]]name = "wasm-bindgen-macro-support"-version = "0.2.87"+version = "0.2.90"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"+checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"dependencies = ["proc-macro2","quote",@@ -1228,9 +1276,9 @@ dependencies = [[[package]]name = "wasm-bindgen-shared"-version = "0.2.87"+version = "0.2.90"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"+checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b"[[package]]name = "web-sys"diff --git a/Cargo.toml b/Cargo.tomlindex 7fa216b13..a371bbda5 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -1,3 +1,3 @@[workspace]-members = [ "lt-core", "lt-serve"]+members = [ "lt-core", "lt-serve", "wasm"]resolver = "2"diff --git a/wasm/Cargo.toml b/wasm/Cargo.tomlnew file mode 100644index 000000000..0d26d146e--- /dev/null+++ b/wasm/Cargo.toml@@ -0,0 +1,17 @@+[package]+name = "wasm"+version = "0.1.0"+edition = "2021"++[lib]+crate-type = ["cdylib", "rlib"]++[dependencies]+console_error_panic_hook = "0.1.7"+tracing = "0.1.40"+tracing-wasm = "0.2.1"+wasm-bindgen = "0.2.90"+lt-core = { path = "../lt-core" }+serde = "1.0.195"+serde-wasm-bindgen = "0.6.3"+getrandom = { version = "0.2.12", features = ["js"] }diff --git a/wasm/src/lib.rs b/wasm/src/lib.rsnew file mode 100644index 000000000..8520bca4b--- /dev/null+++ b/wasm/src/lib.rs@@ -0,0 +1,56 @@+use lt_core::{all_linters, Dictionary, Document, Span, Suggestion};+use serde::Serialize;+use wasm_bindgen::{prelude::wasm_bindgen, JsValue};++/// Create the serializer that preserves types across the JavaScript barrier+fn glue_serializer() -> serde_wasm_bindgen::Serializer {+ serde_wasm_bindgen::Serializer::new().serialize_missing_as_null(true)+}++/// Setup the WebAssembly module's logging.+///+/// Not strictly necessary for anything to function, but makes bug-hunting less painful.+#[wasm_bindgen(start)]+pub fn setup() {+ console_error_panic_hook::set_once();++ tracing_wasm::set_as_global_default();+}++#[wasm_bindgen]+pub fn lint(text: String) -> Vec<JsValue> {+ let dictionary = Dictionary::new();+ let document = Document::new(&text);++ let lints = all_linters(&document, dictionary);++ lints+ .into_iter()+ .map(|lint| lint.serialize(&glue_serializer()).unwrap())+ .collect()+}++#[wasm_bindgen]+pub fn parse(text: String) -> Vec<JsValue> {+ let document = Document::new(&text);++ document+ .fat_tokens()+ .map(|lint| lint.serialize(&glue_serializer()).unwrap())+ .collect()+}++#[wasm_bindgen]+pub fn apply_suggestion(+ text: String,+ span: JsValue,+ suggestion: JsValue,+) -> Result<String, String> {+ let span = serde_wasm_bindgen::from_value(span).map_err(|e| e.to_string())?;+ let suggestion = serde_wasm_bindgen::from_value(suggestion).map_err(|e| e.to_string())?;++ let mut document = Document::new(&text);+ document.apply_suggestion(&suggestion, span);++ Ok(document.get_full_string())+}diff --git a/web/package.json b/web/package.jsonindex c27c46d12..dedb7ecc8 100644--- a/web/package.json+++ b/web/package.json@@ -31,7 +31,10 @@"tailwindcss": "^3.3.3","tslib": "^2.4.1","typescript": "^5.0.0",- "vite": "^4.4.2"+ "vite": "^4.4.2",+ "vite-plugin-top-level-await": "^1.4.1",+ "vite-plugin-wasm": "^3.3.0",+ "wasm": "link:../wasm/pkg"},"type": "module","dependencies": {diff --git a/web/src/lib/analysis.ts b/web/src/lib/analysis.tsindex 325e22712..40cf907ad 100644--- a/web/src/lib/analysis.ts+++ b/web/src/lib/analysis.ts@@ -30,18 +30,24 @@ export type Punctuation =| 'CloseRound'| 'Hash';-export async function parseText(text: string): Promise<Token[]> {- const req = await fetch('/parse', {- method: 'POST',- body: JSON.stringify({ text }),- headers: {- 'CONTENT-TYPE': 'application/json'- }- });-- const res: ParseResponse = await req.json();-- return res.tokens;+export async function parseText(text: string, use_wasm = true): Promise<Token[]> {+ if (use_wasm) {+ const wasm = await import('wasm');++ const tokens = wasm.parse(text);+ return tokens;+ } else {+ const req = await fetch('/parse', {+ method: 'POST',+ body: JSON.stringify({ text }),+ headers: {+ 'CONTENT-TYPE': 'application/json'+ }+ });++ const res: ParseResponse = await req.json();+ return res.tokens;+ }}export function contentToString(content: string[]): string {@@ -72,33 +78,47 @@ export function spanContent(span: Span, source: string): string {return source.substring(span.start, span.end);}-export async function lintText(text: string): Promise<Lint[]> {- const req = await fetch(`/lint`, {- method: 'POST',- body: JSON.stringify({ text }),- headers: {- 'CONTENT-TYPE': 'application/json'- }- });-- const res: LintResponse = await req.json();-- return res.lints;+export async function lintText(text: string, use_wasm = true): Promise<Lint[]> {+ if (use_wasm) {+ const wasm = await import('wasm');++ const lints = wasm.lint(text);+ return lints;+ } else {+ const req = await fetch(`/lint`, {+ method: 'POST',+ body: JSON.stringify({ text }),+ headers: {+ 'CONTENT-TYPE': 'application/json'+ }+ });++ const res: LintResponse = await req.json();+ return res.lints;+ }}export async function applySuggestion(text: string,suggestion: Suggestion,- span: Span+ span: Span,+ use_wasm = true): Promise<string> {- const req = await fetch(`/apply`, {- method: 'POST',- body: JSON.stringify({ text, suggestion, span }),- headers: {- 'CONTENT-TYPE': 'application/json'- }- });-- const res = await req.json();- return res.text;+ if (use_wasm) {+ const wasm = await import('wasm');++ const applied = wasm.apply_suggestion(text, span, suggestion);+ return applied;+ } else {+ const req = await fetch(`/apply`, {+ method: 'POST',+ body: JSON.stringify({ text, suggestion, span }),+ headers: {+ 'CONTENT-TYPE': 'application/json'+ }+ });++ const res = await req.json();+ return res.text;+ }}diff --git a/web/vite.config.ts b/web/vite.config.tsindex c8038dbd8..62d040e5d 100644--- a/web/vite.config.ts+++ b/web/vite.config.ts@@ -1,3 +1,5 @@+import wasm from 'vite-plugin-wasm';+import topLevelAwait from 'vite-plugin-top-level-await';import { sveltekit } from '@sveltejs/kit/vite';import { defineConfig } from 'vite';@@ -10,5 +12,5 @@ export default defineConfig({'/apply': 'http://localhost:3001'}},- plugins: [sveltekit()]+ plugins: [sveltekit(), wasm(), topLevelAwait()]});diff --git a/web/yarn.lock b/web/yarn.lockindex a74c29a92..bc95ddb89 100644--- a/web/yarn.lock+++ b/web/yarn.lock@@ -281,6 +281,11 @@resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==+"@rollup/plugin-virtual@^3.0.2":+ version "3.0.2"+ resolved "https://registry.yarnpkg.com/@rollup/plugin-virtual/-/plugin-virtual-3.0.2.tgz#17e17eeecb4c9fa1c0a6e72c9e5f66382fddbb82"+ integrity sha512-10monEYsBp3scM4/ND4LNH5Rxvh3e/cVeL3jWTgZ2SrQ+BmUoQcopVQvnaMcOnykb1VkxUFuDAN+0FnpTFRy2A==+"@sveltejs/adapter-auto@^2.0.0":version "2.1.0"resolved "https://registry.yarnpkg.com/@sveltejs/adapter-auto/-/adapter-auto-2.1.0.tgz#cb36fd7081e3c4b1c9a9192b1a23c8c82dce8a1b"@@ -327,6 +332,85 @@svelte-hmr "^0.15.3"vitefu "^0.2.4"+"@swc/[email protected]":+ version "1.3.103"+ resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.103.tgz#5b278ea04d0caa8e067355e9eb21a89f559b7d76"+ integrity sha512-Dqqz48mvdm/3PHPPA6YeAEofkF9H5Krgqd/baPf0dXcarzng6U9Ilv2aCtDjq7dfI9jfkVCW5zuwq98PE2GEdw==++"@swc/[email protected]":+ version "1.3.103"+ resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.103.tgz#8fd95cc2525e83c5213077c62ba30e63b479d345"+ integrity sha512-mhUVSCEAyFLqtrDtwr9qPbe891J8cKxq53CD873/ZsUnyasHMPyWXzTvy9qjmbYyfDIArm6fGqjF5YsDKwGGNg==++"@swc/[email protected]":+ version "1.3.103"+ resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.103.tgz#d0a0385e7807d83152e1a789baeb774b6df30460"+ integrity sha512-rYLmwxr01ZHOI6AzooqwB0DOkMm0oU8Jznk6uutV1lHgcwyxsNiC1Css8yf77Xr/sYTvKvuTfBjThqa5H716pA==++"@swc/[email protected]":+ version "1.3.103"+ resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.103.tgz#6552ac0ad37656ae2a4aaf75e264f011787c2dd5"+ integrity sha512-w+5XFpUqxiAGUBiyRyYR28Ghddp5uVyo+dHAkCnY1u3V6RsZkY3vRwmoXT7/HxVGV7csodJ1P9Cp9VaRnNvTKA==++"@swc/[email protected]":+ version "1.3.103"+ resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.103.tgz#d77ad55e87cdf065254a4925fa9a49dfe2c2cc78"+ integrity sha512-lS5p8ewAIar7adX6t0OrkICTcw92PXrn3ZmYyG5hvfjUg4RPQFjMfFMDQSne32ZJhGXHBf0LVm1R8wHwkcpwgA==++"@swc/[email protected]":+ version "1.3.103"+ resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.103.tgz#76bc3225d05e468c11a5bed9cf8d384c1d2fa539"+ integrity sha512-Lf2cHDoEPNB6TwexHBEZCsAO2C7beb0YljhtQS+QfjWLLVqCiwt5LRCPuKN2Bav7el9KZXOI5baXedUeFj0oFg==++"@swc/[email protected]":+ version "1.3.103"+ resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.103.tgz#7223c1deddadbd3fec17a72c04c89ac265ccea18"+ integrity sha512-HR1Y9iiLEO3F49P47vjbHczBza9RbdXWRWC8NpcOcGJ4Wnw0c2DLWAh416fGH3VYCF/19EuglLEXhvSj0NXGuA==++"@swc/[email protected]":+ version "1.3.103"+ resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.103.tgz#697f9d82023aa0c518a41f119dfbf476c395a9eb"+ integrity sha512-3/GfROD1GPyf2hi6R0l4iZ5nrrKG8IU29hYhZCb7r0ZqhL/58kktVPlkib8X/EAJI8xbhM/NMl76h8ElrnyH5w==++"@swc/[email protected]":+ version "1.3.103"+ resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.103.tgz#87f766c7014df5f426ed146328a2a260b70533aa"+ integrity sha512-9ejEFjfgPi0ibNmtuiRbYq9p4RRV6oH1DN9XjkYM8zh2qHlpZHKQZ3n4eHS0VtJO4rEGZxL8ebcnTNs62wqJig==++"@swc/[email protected]":+ version "1.3.103"+ resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.103.tgz#469ec476c7e8b47076d51e464726ab655af651e9"+ integrity sha512-/1RvaOmZolXurWAUdnELYynVlFUiT0hj3PyTPoo+YK6+KV7er4EqUalRsoUf3zzGepQuhKFZFDpQn6Xi9kJX1A==++"@swc/core@^1.3.100":+ version "1.3.103"+ resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.103.tgz#45347f21316962c65a6f0d269b5dec04c6e315ca"+ integrity sha512-PYtt8KzRXIFDwxeD7BA9ylmXNQ4hRVcmDVuAmL3yvL9rgx7Tn3qn6T37wiMVZnP1OjqGyhuHRPNycd+ssr+byw==+ dependencies:+ "@swc/counter" "^0.1.1"+ "@swc/types" "^0.1.5"+ optionalDependencies:+ "@swc/core-darwin-arm64" "1.3.103"+ "@swc/core-darwin-x64" "1.3.103"+ "@swc/core-linux-arm-gnueabihf" "1.3.103"+ "@swc/core-linux-arm64-gnu" "1.3.103"+ "@swc/core-linux-arm64-musl" "1.3.103"+ "@swc/core-linux-x64-gnu" "1.3.103"+ "@swc/core-linux-x64-musl" "1.3.103"+ "@swc/core-win32-arm64-msvc" "1.3.103"+ "@swc/core-win32-ia32-msvc" "1.3.103"+ "@swc/core-win32-x64-msvc" "1.3.103"++"@swc/counter@^0.1.1":+ version "0.1.2"+ resolved "https://registry.yarnpkg.com/@swc/counter/-/counter-0.1.2.tgz#bf06d0770e47c6f1102270b744e17b934586985e"+ integrity sha512-9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw==++"@swc/types@^0.1.5":+ version "0.1.5"+ resolved "https://registry.yarnpkg.com/@swc/types/-/types-0.1.5.tgz#043b731d4f56a79b4897a3de1af35e75d56bc63a"+ integrity sha512-myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw==+"@types/cookie@^0.5.1":version "0.5.3"resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.5.3.tgz#3f98076ede5e467783507284d3c19215327fff8f"@@ -2246,6 +2330,25 @@ util-deprecate@^1.0.2:resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==+uuid@^9.0.1:+ version "9.0.1"+ resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"+ integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==++vite-plugin-top-level-await@^1.4.1:+ version "1.4.1"+ resolved "https://registry.yarnpkg.com/vite-plugin-top-level-await/-/vite-plugin-top-level-await-1.4.1.tgz#607dfe084157550fa33df18062b99ceea774cd9c"+ integrity sha512-hogbZ6yT7+AqBaV6lK9JRNvJDn4/IJvHLu6ET06arNfo0t2IsyCaon7el9Xa8OumH+ESuq//SDf8xscZFE0rWw==+ dependencies:+ "@rollup/plugin-virtual" "^3.0.2"+ "@swc/core" "^1.3.100"+ uuid "^9.0.1"++vite-plugin-wasm@^3.3.0:+ version "3.3.0"+ resolved "https://registry.yarnpkg.com/vite-plugin-wasm/-/vite-plugin-wasm-3.3.0.tgz#2908ef2529bf8f33f4e549c8c6fda26ad273ca15"+ integrity sha512-tVhz6w+W9MVsOCHzxo6SSMSswCeIw4HTrXEi6qL3IRzATl83jl09JVO1djBqPSwfjgnpVHNLYcaMbaDX5WB/pg==+vite@^4.4.2:version "4.5.0"resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.0.tgz#ec406295b4167ac3bc23e26f9c8ff559287cff26"@@ -2262,6 +2365,10 @@ vitefu@^0.2.4:resolved "https://registry.yarnpkg.com/vitefu/-/vitefu-0.2.5.tgz#c1b93c377fbdd3e5ddd69840ea3aa70b40d90969"integrity sha512-SgHtMLoqaeeGnd2evZ849ZbACbnwQCIwRH57t18FxcXoZop0uQu0uzlIhJBlF/eWVzuce0sHeqPcDo+evVcg8Q==+"wasm@link:../wasm/pkg":+ version "0.0.0"+ uid ""+which@^2.0.1:version "2.0.2"resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"