BridgeJS: Fix name collision for same-named nested structs#744
Merged
krodak merged 1 commit intoMay 13, 2026
Merged
Conversation
adf1074 to
d0939f0
Compare
wfltaylor
reviewed
May 11, 2026
d0939f0 to
871815e
Compare
871815e to
8a0f54e
Compare
kateinoigakukun
approved these changes
May 13, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Overview
Follow-up to #735. When two different parent types both have a nested struct with the same short name (e.g.,
User.StatsandPlayer.Stats), the generated JavaScript produces duplicateconstdeclarations and overwrites the samestructHelpers.Statskey, causing a SyntaxError at parse time.1. JS struct helpers use
abiName(underscore-separated) for unique internal keys.structHelpers.User_StatsandstructHelpers.Player_Statsinstead of both beingstructHelpers.Stats. This covers helper factories, registration, and allstructHelpers.<name>.lower/lift()call sites in bothBridgeJSLink.swiftandJSGlueGen.swift.2. TypeScript declarations use TS namespaces for nested struct interfaces. Instead of
export interface User_Stats, the.d.tsnow emits:This matches the existing namespace pattern used for enums and keeps the public API hierarchical. The
NamespaceBuilderwas extended to handle structs alongside enums/classes. Struct-only namespace nodes are excluded from theExportstype to avoid duplicate keys.3.
tsTypefor.swiftStructreturns the dotted name directly (e.g.,User.Stats), which TypeScript resolves through the namespace. Non-nested structs are unaffected.4. E2e runtime test added.
NestedStructGroupA.MetadataandNestedStructGroupB.Metadata(two same-named structs under different namespace enums) are roundtripped through JS to verify no data corruption from helper key collision.