Skip to content

Commit e464684

Browse files
committed
make pglt_wasm crate build
1 parent 4f6a06c commit e464684

File tree

6 files changed

+105
-37
lines changed

6 files changed

+105
-37
lines changed

Cargo.lock

Lines changed: 85 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ anyhow = "1.0.92"
1818
biome_deserialize = "0.6.0"
1919
biome_deserialize_macros = "0.6.0"
2020
biome_js_factory = "0.5.7"
21+
biome_js_formatter = "0.5.7"
2122
biome_js_syntax = "0.5.7"
2223
biome_rowan = "0.5.7"
2324
biome_string_case = "0.5.8"

crates/pglt_wasm/Cargo.toml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ name = "pglt_wasm"
1111
repository.workspace = true
1212
version = "0.0.0"
1313

14+
[lib]
15+
crate-type = ["cdylib", "rlib"]
16+
17+
[features]
18+
default = ["console_error_panic_hook"]
19+
1420
[dependencies]
1521
js-sys = "0.3.72"
1622
pglt_console = { workspace = true }
@@ -27,10 +33,11 @@ wasm-bindgen = { version = "0.2.95", features = ["serde-serialize"] }
2733
console_error_panic_hook = { version = "0.1.7", optional = true }
2834

2935
[build-dependencies]
30-
biome_js_factory = { workspace = true }
31-
biome_rowan = { workspace = true }
32-
pglt_workspace = { workspace = true, features = ["schema"] }
33-
quote = "1.0.14"
36+
biome_js_factory = { workspace = true }
37+
biome_js_formatter = { workspace = true }
38+
biome_rowan = { workspace = true }
39+
pglt_workspace = { workspace = true, features = ["schema"] }
40+
quote = "1.0.14"
3441

3542
[package.metadata.wasm-pack.profile.profiling]
3643
wasm-opt = false

crates/pglt_wasm/build.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use biome_js_factory::{
77
make,
88
syntax::{AnyJsDeclaration, AnyJsModuleItem, AnyJsStatement},
99
};
10+
use biome_js_formatter::{context::JsFormatOptions, format_node};
1011
use biome_rowan::AstNode;
1112
use pglt_workspace::workspace_types::{ModuleQueue, generate_type, methods};
1213

@@ -66,10 +67,9 @@ fn main() -> io::Result<()> {
6667

6768
// Wasm-bindgen will paste the generated TS code as-is into the final .d.ts file,
6869
// ensure it looks good by running it through the formatter
69-
let definitions = module.syntax().to_string();
70-
// let formatted = format_node(JsFormatOptions::new(JsFileSource::ts()), module.syntax()).unwrap();
71-
// let printed = formatted.print().unwrap();
72-
// let definitions = printed.into_code();
70+
let formatted = format_node(JsFormatOptions::new(JsFileSource::ts()), module.syntax()).unwrap();
71+
let printed = formatted.print().unwrap();
72+
let definitions = printed.into_code();
7373

7474
// Generate wasm-bindgen extern type imports for all the types defined in the TS code
7575
let types = queue.visited().iter().map(|name| {

crates/pglt_wasm/src/lib.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,10 @@ impl Workspace {
4040
) -> Result<ICompletionResult, Error> {
4141
let params: GetCompletionsParams =
4242
serde_wasm_bindgen::from_value(params.into()).map_err(into_error)?;
43-
serde_wasm_bindgen::from_value(
44-
self.inner
45-
.get_completions(params)
46-
.map_err(into_error)
47-
.into(),
48-
)
49-
.map_err(into_error)
43+
let result = self.inner.get_completions(params).map_err(into_error)?;
44+
to_value(&result)
45+
.map(ICompletionResult::from)
46+
.map_err(into_error)
5047
}
5148

5249
#[wasm_bindgen(js_name = updateSettings)]

crates/pglt_wasm/tests/web.rs

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)