From 576abec9b7a0a6d4c3a763169f90b3d1f4c5d9a2 Mon Sep 17 00:00:00 2001 From: Kinflou Date: Tue, 13 Oct 2026 02:47:58 +0800 Subject: [PATCH 1/2] chore: carry lang_version, and catch up on core `GenRequest` gained the target's language version (generation#46), named here by whichever generator the request is about to select rather than restated as a literal. Also brings in core#91's reserved schema names: a playground file called `main`, `lib` or `self` is now refused with an explanation instead of generating output that could not build. --- wasm/Cargo.toml | 10 +++++----- wasm/src/lib.rs | 7 +++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml index e9de33e..a8056dd 100644 --- a/wasm/Cargo.toml +++ b/wasm/Cargo.toml @@ -12,13 +12,13 @@ crate-type = ["cdylib", "rlib"] # The same crates the CLI and the language server compose — by git rev, so the # playground runs *that* code, not a re-implementation. Keep the `comline-core` # rev identical across all of them (one `comline-core` in the tree). -comline-core = { git = "https://github.com/ComlineProject/core", rev = "5c1f3474b462ed912f4f2f5a518b87a5f6576aaa" } -comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "52803df6436f49aec5f2266a94c89d4ced4b229c" } -comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "eb8396a337e0efe452cea32cdb0e6a50dd56f2d5" } -comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "d8a1df17b83752314a34d9c0b7817e4feb16820e" } +comline-core = { git = "https://github.com/ComlineProject/core", rev = "016e38603152444f9b51fddfd46b1e6b1d73f1d8" } +comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "69a3e37ae788a91c5f72dd047d6196aa4c95fdef" } +comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "c95ce654458c262f96fe9ba2e17459d7ff483c2c" } +comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "bfa088c7ca898aca0e8fa74e77d40e2fbb45a0a6" } # The LSP's analysis layer (diagnostics / hover / completion / semantic tokens), # without its `tower-lsp` server — builds for wasm32. -comline-language-server = { git = "https://github.com/ComlineProject/language-server", rev = "a4826411cc655928de3db9d1bb80304c2f834f1c", default-features = false } +comline-language-server = { git = "https://github.com/ComlineProject/language-server", rev = "1bc034cd94956ad6b0e4845ecb089f9cb29905af", default-features = false } lsp-types = "0.94" rust-sitter = "0.4.5" # parse-error types diff --git a/wasm/src/lib.rs b/wasm/src/lib.rs index 45f4935..b61f6ae 100644 --- a/wasm/src/lib.rs +++ b/wasm/src/lib.rs @@ -169,6 +169,13 @@ pub fn generate_project(files: JsValue, target: &str, mode: &str) -> JsValue { name: "playground".to_string(), version: "0.1.0".to_string(), }, + // Whichever generator `target` is about to select, named by the + // generator itself rather than restated here. + lang_version: match target { + "typescript" | "ts" => comline_codegen_typescript::LANG_VERSION, + _ => comline_codegen_rust::LANG_VERSION, + } + .to_string(), default_framing: None, }; From 093325a5098a98a9b3e171e8591387a402b25fbb Mon Sep 17 00:00:00 2001 From: Kinflou Date: Tue, 13 Oct 2026 02:53:46 +0800 Subject: [PATCH 2/2] chore: point at the merged revs --- wasm/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml index a8056dd..b8e2ced 100644 --- a/wasm/Cargo.toml +++ b/wasm/Cargo.toml @@ -14,11 +14,11 @@ crate-type = ["cdylib", "rlib"] # rev identical across all of them (one `comline-core` in the tree). comline-core = { git = "https://github.com/ComlineProject/core", rev = "016e38603152444f9b51fddfd46b1e6b1d73f1d8" } comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "69a3e37ae788a91c5f72dd047d6196aa4c95fdef" } -comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "c95ce654458c262f96fe9ba2e17459d7ff483c2c" } -comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "bfa088c7ca898aca0e8fa74e77d40e2fbb45a0a6" } +comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "5b1ba2b099cc295c6768935623f4c084f134e6b8" } +comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "c484b764b4341d8a8529eb52613e4ce2fb6c35d5" } # The LSP's analysis layer (diagnostics / hover / completion / semantic tokens), # without its `tower-lsp` server — builds for wasm32. -comline-language-server = { git = "https://github.com/ComlineProject/language-server", rev = "1bc034cd94956ad6b0e4845ecb089f9cb29905af", default-features = false } +comline-language-server = { git = "https://github.com/ComlineProject/language-server", rev = "547ea51213cea38d60a3b0476b3a658ef260a331", default-features = false } lsp-types = "0.94" rust-sitter = "0.4.5" # parse-error types