BridgeJS: Include namespace prefix in ABI names for namespace-nested classes and structs#683
Merged
krodak merged 1 commit intoswiftwasm:mainfrom Feb 27, 2026
Merged
Conversation
085ad29 to
c03f108
Compare
…classes and structs
c03f108 to
494ed16
Compare
kateinoigakukun
approved these changes
Feb 27, 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
ABI names for namespace-nested classes omit the namespace, causing symbol collisions when two namespace enums contain a class with the same bare name. For example,
@JS enum Utils { @JS class Converter {} }and@JS enum Formatting { @JS class Converter {} }both producebjs_Converter_init.This PR adds an
abiNamecomputed property toExportedClassandExportedStructthat joinsnamespace + namewith_, then updates all ABI name generation sites to use it.1. Skeleton model - Added
abiNametoExportedClassandExportedStructinBridgeJSSkeleton.swift. Returnsnamespace_namewhen namespaced, barenameotherwise.2. SwiftToSkeleton - Constructor, method, static method, and static property ABI names now use
abiNamefrom the looked-up class/struct instead of the bare name from the parser state.3. ExportSwift - Deinit, wrap, and
PropertyRenderingContext.classNamenow useabiName.4. BridgeJSLink - Deinit, wrap, property className, and struct helper Wasm intrinsic names (
swift_js_struct_lower_*/swift_js_struct_lift_*) now useabiName.Before:
After:
5. Collision test - Added
@JS enum Formatting { @JS class Converter }alongside@JS enum Utils { @JS class Converter }in theEnumNamespacetest input to validate distinct ABI names.Top-level (non-namespaced) classes and structs are unaffected -
abiNamefalls back toname.