feat: wasm attempt 2

Author: psteinroe

Cargo.lock

@@ -17,10 +17,13 @@ rust-version = "1.85.0"
 anyhow                   = "1.0.92"
 biome_deserialize        = "0.6.0"
 biome_deserialize_macros = "0.6.0"
+biome_js_factory         = "0.5.7"
+biome_js_syntax          = "0.5.7"
+biome_rowan              = "0.5.7"
 biome_string_case        = "0.5.8"
 bpaf                     = { version = "0.9.15", features = ["derive"] }
 crossbeam                = "0.8.4"
-enumflags2               = "0.7.10"
+enumflags2               = "0.7.11"
 ignore                   = "0.4.23"
 indexmap                 = { version = "2.6.0", features = ["serde"] }
 insta                    = "1.31.0"
@@ -39,7 +42,6 @@ sqlx                     = { version = "0.8.2", features = ["runtime-async-std",
 syn                      = "1.0.109"
 termcolor                = "1.4.1"
 tokio                    = { version = "1.40.0", features = ["full"] }
-toml                     = "0.8.19"
 tower-lsp                = "0.20.0"
 tracing                  = { version = "0.1.40", default-features = false, features = ["std"] }
 tracing-subscriber       = "0.3.18"

Cargo.toml

@@ -19,6 +19,7 @@ pglt_text_size.workspace = true
 
 pglt_schema_cache.workspace       = true
 pglt_treesitter_queries.workspace = true
+schemars                          = { workspace = true, optional = true }
 serde                             = { workspace = true, features = ["derive"] }
 serde_json                        = { workspace = true }
 tree-sitter.workspace             = true
@@ -33,3 +34,6 @@ pglt_test_utils.workspace = true
 
 [lib]
 doctest = false
+
+[features]
+schema = ["dep:schemars"]

crates/pglt_completions/Cargo.toml

@@ -19,6 +19,7 @@ pub struct CompletionParams<'a> {
 }
 
 #[derive(Debug, Default, Serialize, Deserialize)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 pub struct CompletionResult {
     pub(crate) items: Vec<CompletionItem>,
 }

crates/pglt_completions/src/complete.rs

@@ -1,13 +1,16 @@
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[serde(rename_all = "camelCase")]
 pub enum CompletionItemKind {
     Table,
     Function,
     Column,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 pub struct CompletionItem {
     pub label: String,
     pub(crate) score: i32,

crates/pglt_completions/src/item.rs

@@ -118,6 +118,7 @@ pub trait Diagnostic: Debug {
     Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, Default,
 )]
 #[serde(rename_all = "camelCase")]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 /// The severity to associate to a diagnostic.
 pub enum Severity {
     /// Reports a hint.
@@ -165,6 +166,7 @@ impl Display for Severity {
 /// and help with the implementation of `serde` and `schemars` for tags.
 #[derive(Debug, Copy, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[bitflags]
 #[repr(u8)]
 pub(super) enum DiagnosticTag {

crates/pglt_diagnostics/src/diagnostic.rs

@@ -91,6 +91,17 @@ impl<'de> serde::Deserialize<'de> for Backtrace {
     }
 }
 
+#[cfg(feature = "schema")]
+impl schemars::JsonSchema for Backtrace {
+    fn schema_name() -> String {
+        String::from("Backtrace")
+    }
+
+    fn json_schema(r#gen: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
+        <Vec<SerializedFrame>>::json_schema(r#gen)
+    }
+}
+
 /// Internal representation of a [Backtrace], can be either a native backtrace
 /// instance or a vector of serialized frames.
 #[derive(Clone, Debug)]
@@ -292,6 +303,11 @@ pub(super) fn print_backtrace(
 
 /// Serializable representation of a backtrace frame.
 #[derive(Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(
+    feature = "schema",
+    derive(schemars::JsonSchema),
+    schemars(rename = "BacktraceFrame")
+)]
 #[cfg_attr(test, derive(Eq, PartialEq))]
 struct SerializedFrame {
     ip: u64,
@@ -309,6 +325,11 @@ impl From<&'_ backtrace::BacktraceFrame> for SerializedFrame {
 
 /// Serializable representation of a backtrace frame symbol.
 #[derive(Clone, Debug, Serialize, Deserialize)]
+#[cfg_attr(
+    feature = "schema",
+    derive(schemars::JsonSchema),
+    schemars(rename = "BacktraceSymbol")
+)]
 #[cfg_attr(test, derive(Eq, PartialEq))]
 struct SerializedSymbol {
     name: Option<String>,

crates/pglt_diagnostics/src/display/backtrace.rs

@@ -39,6 +39,7 @@ impl Eq for Location<'_> {}
 
 /// Represents the resource a diagnostic is associated with.
 #[derive(Debug, Clone, Copy, Eq, PartialEq, Serialize, Deserialize)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[serde(rename_all = "camelCase")]
 pub enum Resource<P> {
     /// The diagnostic is related to the content of the command line arguments.

crates/pglt_diagnostics/src/location.rs

@@ -16,6 +16,7 @@ use crate::{
 /// Serializable representation for a [Diagnostic](super::Diagnostic).
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[cfg_attr(not(target_arch = "wasm32"), serde(rename_all = "camelCase"))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[cfg_attr(test, derive(Eq, PartialEq))]
 pub struct Diagnostic {
     category: Option<&'static Category>,
@@ -138,6 +139,7 @@ impl<D: super::Diagnostic + ?Sized> std::fmt::Display for PrintDescription<'_, D
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[cfg_attr(not(target_arch = "wasm32"), serde(rename_all = "camelCase"))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[cfg_attr(test, derive(Eq, PartialEq))]
 struct Location {
     path: Option<Resource<String>>,
@@ -160,6 +162,7 @@ impl From<super::Location<'_>> for Location {
 /// Implementation of [Visitor] collecting serializable [Advice] into a vector.
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[cfg_attr(test, derive(Eq, PartialEq))]
 struct Advices {
     advices: Vec<Advice>,
@@ -246,6 +249,7 @@ impl super::Advices for Advices {
 /// advice types.
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[cfg_attr(test, derive(Eq, PartialEq))]
 enum Advice {
     Log(LogCategory, MarkupBuf),
@@ -354,6 +358,17 @@ impl<'de> Deserialize<'de> for DiagnosticTags {
     }
 }
 
+#[cfg(feature = "schema")]
+impl schemars::JsonSchema for DiagnosticTags {
+    fn schema_name() -> String {
+        String::from("DiagnosticTags")
+    }
+
+    fn json_schema(r#gen: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
+        <Vec<DiagnosticTag>>::json_schema(r#gen)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use std::io;

crates/pglt_diagnostics/src/serde.rs

@@ -26,22 +26,23 @@ pub fn get_completions(
         pglt_lsp_converters::negotiated_encoding(client_capabilities),
     )?;
 
-    let completion_result = match session
-        .workspace
-        .get_completions(workspace::CompletionParams {
-            path,
-            position: offset,
-        }) {
-        Ok(result) => result,
-        Err(e) => match e {
-            WorkspaceError::DatabaseConnectionError(_) => {
-                return Ok(lsp_types::CompletionResponse::Array(vec![]));
-            }
-            _ => {
-                return Err(e.into());
-            }
-        },
-    };
+    let completion_result =
+        match session
+            .workspace
+            .get_completions(workspace::GetCompletionsParams {
+                path,
+                position: offset,
+            }) {
+            Ok(result) => result,
+            Err(e) => match e {
+                WorkspaceError::DatabaseConnectionError(_) => {
+                    return Ok(lsp_types::CompletionResponse::Array(vec![]));
+                }
+                _ => {
+                    return Err(e.into());
+                }
+            },
+        };
 
     let items: Vec<CompletionItem> = completion_result
         .into_iter()