From 403563f8dba0a644b7b32438ef9364d9ed7fd72a Mon Sep 17 00:00:00 2001 From: Kinflou Date: Tue, 13 Oct 2026 20:14:42 +0800 Subject: [PATCH] chore: point at the kernel-based generators Both generators now resolve cross-schema references through the shared kernel in `comline-codegen` (comline-rust#40, comline-typescript#34, on top of generation#48). Output is unchanged - this is the pin bump that carries it into the CLI. All three revs move together, as the comment above them says they must: `comline-codegen` goes to the kernel merge, and both generator crates pin that exact rev, so Cargo unifies them into one `comline-codegen`. Leaving the first behind would have given the tree two copies of `GenRequest` - incompatible types with the same name. Verified with `cargo tree`, not assumed. Checked end to end on a two-target project rather than only through the suite: - a glob `use std::http::*` resolves for **both** targets - `crate::std::http::Request` and `import type { Request } from "./std/http.js"`. That one matters: comline-typescript#34 deleted the TypeScript generator's own glob expansion on the grounds that core already emits the leaves, and this is that claim holding on a real project instead of a hand-built fixture. - `lib` mode for both, where `external_std` defaults on: std referenced (`comline_std::http::Request`, `@comline/std/http`) rather than inlined, with the dependency declared in `Cargo.toml` and `package.json`. --- Cargo.lock | 6 +++--- Cargo.toml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1442cdf..f200182 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -397,7 +397,7 @@ dependencies = [ [[package]] name = "comline-codegen" version = "0.1.0" -source = "git+https://github.com/ComlineProject/generation?rev=69a3e37ae788a91c5f72dd047d6196aa4c95fdef#69a3e37ae788a91c5f72dd047d6196aa4c95fdef" +source = "git+https://github.com/ComlineProject/generation?rev=e627ed36ea0ca4f8942cf29f59b741030ba74e2b#e627ed36ea0ca4f8942cf29f59b741030ba74e2b" dependencies = [ "comline-core", "eyre", @@ -406,7 +406,7 @@ dependencies = [ [[package]] name = "comline-codegen-rust" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-rust?rev=f48b6c7c3bccb6b2d1b9d54c10aa803a90cc091a#f48b6c7c3bccb6b2d1b9d54c10aa803a90cc091a" +source = "git+https://github.com/ComlineProject/comline-rust?rev=2d06526f730b22d8d2b5942a70047d6992a55a7e#2d06526f730b22d8d2b5942a70047d6992a55a7e" dependencies = [ "comline-codegen", "comline-core", @@ -416,7 +416,7 @@ dependencies = [ [[package]] name = "comline-codegen-typescript" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-typescript?rev=ce52a8a6c25aa0aa3286618f1fd33b155d6ba853#ce52a8a6c25aa0aa3286618f1fd33b155d6ba853" +source = "git+https://github.com/ComlineProject/comline-typescript?rev=646795ceece85c0b46952cf4973eaaf3c64ee49c#646795ceece85c0b46952cf4973eaaf3c64ee49c" dependencies = [ "comline-codegen", "comline-core", diff --git a/Cargo.toml b/Cargo.toml index 01dd2a4..7cb505e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,9 +35,9 @@ comline-core = { git = "https://github.com/ComlineProject/core", rev = "016e3860 # `comline-codegen`'s types, so the rev below must be byte-identical to the # one *they* pin - Cargo only unifies a git dependency across identical rev # strings, and two copies of `GenRequest` are two incompatible types. -comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "69a3e37ae788a91c5f72dd047d6196aa4c95fdef" } -comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "f48b6c7c3bccb6b2d1b9d54c10aa803a90cc091a", optional = true } -comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "ce52a8a6c25aa0aa3286618f1fd33b155d6ba853", optional = true } +comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "e627ed36ea0ca4f8942cf29f59b741030ba74e2b" } +comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "2d06526f730b22d8d2b5942a70047d6992a55a7e", optional = true } +comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "646795ceece85c0b46952cf4973eaaf3c64ee49c", optional = true } [features] # Which language generators are compiled in. Drop one to shed its whole