Skip to content

fix(typescript): allocate collision-safe binders for generic type parameters #4445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
addiplus wants to merge 3 commits into from
Closed

fix(typescript): allocate collision-safe binders for generic type parameters #4445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f4e716
fix(typescript): escape reserved words in generated declaration names
addiplus Aug 13, 2026
0fffdf3
fix(typescript): allocate collision-safe binders for generic type par…
addiplus Aug 15, 2026
6e4d0d4
test(typescript): cover method-scope binder allocation
addiplus Aug 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions baml_language/sdks/typescript/sdkgen_typescript_shared/src/emit/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ use crate::{
method::{MethodKind, OptionalArg, RequiredArg, TypeScriptMethodBinding},
type_alias::TypeScriptTypeAlias,
},
leaf::safe_decl_name,
routing::{LeafPath, route},
};

Expand Down Expand Up @@ -55,6 +56,12 @@ pub(crate) fn build_emitted(pool: &SymbolPool) -> Vec<(LeafPath, EmittedSymbol,
// identifier char, so a `$stream` companion class is emitted as
// e.g. `Resume$stream` (not stripped to `Resume`). Non-stream
// symbols are unaffected (their name carries no `$stream`).
//
// `bare` stays raw. The class / enum / type-alias arms below wrap it in
// `safe_decl_name` because those three names bind a module-scope
// identifier, where a reserved word is a parse error. Every wire-facing
// field on the emitted symbol (`source`, `baml_fqn`, enum member
// `value`) keeps the raw spelling.
let bare = key.name().as_str().to_string();

match symbol {
Expand Down Expand Up @@ -82,7 +89,7 @@ pub(crate) fn build_emitted(pool: &SymbolPool) -> Vec<(LeafPath, EmittedSymbol,
out.push((
leaf,
EmittedSymbol::Class(TypeScriptClass {
name: bare,
name: safe_decl_name(&bare),
source: key.clone(),
generic_params,
docstring: c.docstring.clone(),
Expand All @@ -107,7 +114,7 @@ pub(crate) fn build_emitted(pool: &SymbolPool) -> Vec<(LeafPath, EmittedSymbol,
out.push((
leaf,
EmittedSymbol::Enum(TypeScriptEnum {
name: bare,
name: safe_decl_name(&bare),
source: key.clone(),
variants,
docstring: e.docstring.clone(),
Expand All @@ -120,7 +127,7 @@ pub(crate) fn build_emitted(pool: &SymbolPool) -> Vec<(LeafPath, EmittedSymbol,
out.push((
leaf,
EmittedSymbol::TypeAlias(TypeScriptTypeAlias {
name: bare,
name: safe_decl_name(&bare),
source: key.clone(),
resolves_to: t.resolves_to.clone(),
recursive: t.recursive,
Expand Down
Loading