Gave up on WebAssembly, now using a Rust server

NicholasLYang · Nov 27, 2022 · f4c4b2e · f4c4b2e
1 parent 3f0b022
commit f4c4b2e
Show file tree

Hide file tree

Showing 24 changed files with 2,750 additions and 334 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,6 +7,12 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0.66"
+axum = "0.6.0"
+serde = { version = "1.0.147", features = ["derive"] }
+tokio = { version = "1.22.0", features = ["full"]}
+tower-http = { version = "0.3.4", features = ["cors"] }
+tracing = "0.1.37"
+tracing-subscriber = "0.3.16"
 tree-sitter = "0.20.9"
 
 [build-dependencies]

diff --git a/NOTES.md b/NOTES.md
@@ -38,3 +38,11 @@ struct LetDeclaration {
 
 This might require some rules on tree-sitter grammars such as `choice` must always be top level 
 (although anonymous structs is a reasonable solution)
+
+# Tree-Sitter WebAssembly
+
+Currently, tree-sitter compiles to WebAssembly via a custom build script. I'd like to change that, so it can be compiled 
+via the Rust build.rs script. That way it can be used with the rest of a Rust codebase that is compiled to WebAssembly.
+
+The current idea is to fix up the build.rs script. However, a longer term idea is to just compile tree-sitter grammars 
+to Rust instead of C.
diff --git a/build.rs b/build.rs
@@ -9,5 +9,5 @@ fn main() {
     cc::Build::new()
         .include(&dir)
         .file(dir.join("parser.c"))
-        .compile("tree-sitter-vicuna");
+        .compile("tree-sitter-vicuna")
 }
diff --git a/index.html b/index.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+<head>
+  <title>Vicuna</title>
+  <script type="text/javascript" src="/target/wasm32-unknown-emscripten/debug/vicuna.js">
+    </script>
+</head>
+<body>
+<p>This is an example paragraph. Anything in the <strong>body</strong> tag will appear on the page, just like this <strong>p</strong> tag and its contents.</p>
+</body>
+</html>
diff --git a/playground/.gitignore b/playground/.gitignore
@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/playground/index.html b/playground/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite + React + TS</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.tsx"></script>
+  </body>
+</html>